From: Juanma Barranquero Date: Fri, 30 Apr 2004 21:12:42 +0000 (+0000) Subject: (smerge-diff-switches): Fix typo in docstring. X-Git-Tag: ttn-vms-21-2-B4~6498 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3b0af402818a5f522dbae99e11735c5a3882081a;p=emacs.git (smerge-diff-switches): Fix typo in docstring. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7a7d90921f5..c9a884fca61 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2004-04-30 Juanma Barranquero + + * smerge-mode.el (smerge-diff-switches): Fix typo in docstring. + 2004-04-30 Mario Lang * diff.el (diff-switches): Fix typo in docstring. diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index 8194a7d8e21..35903dcf749 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el @@ -65,7 +65,7 @@ (defcustom smerge-diff-switches (append '("-d" "-b") (if (listp diff-switches) diff-switches (list diff-switches))) - "*A list of strings specifying switches to be be passed to diff. + "*A list of strings specifying switches to be passed to diff. Used in `smerge-diff-base-mine' and related functions." :group 'smerge :type '(repeat string)) @@ -324,7 +324,7 @@ according to `smerge-match-conflict'.") ;; Out of range (popup-menu smerge-mode-menu) ;; Install overlay. - (setq o (make-overlay (match-beginning i) (match-end i))) + (setq o (make-overlay (match-beginning i) (match-end i))) (unwind-protect (progn (overlay-put o 'face 'highlight) @@ -512,7 +512,7 @@ An error is raised if not inside a conflict." (unwind-protect (add-text-properties start end smerge-text-properties) (restore-buffer-modified-p m))) - + (store-match-data (list start end mine-start mine-end base-start base-end