Mercurial > emacs

changeset 55258:04a44f089cc1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(smerge-diff-switches): Fix typo in docstring.
author Juanma Barranquero <lekktu@gmail.com>
date Fri, 30 Apr 2004 21:10:05 +0000
parents c4d464135bfc
children 5a03a9eab24e
files lisp/smerge-mode.el
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/smerge-mode.el	Fri Apr 30 21:06:00 2004 +0000
+++ b/lisp/smerge-mode.el	Fri Apr 30 21:10:05 2004 +0000
@@ -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 @@
 	      ;; 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 @@
 	    (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