diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2004-04-30 21:10:05 +0000 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2004-04-30 21:10:05 +0000 |
| commit | 01cc91b8a4e3552581226a1d2166624c176a5ca6 (patch) | |
| tree | 27a3d0996f60feba4620bcf658f78f9cafbbf068 /lisp/smerge-mode.el | |
| parent | a21d2f7437d9508433c8eb4d4758e4e9a368515a (diff) | |
| download | emacs-01cc91b8a4e3552581226a1d2166624c176a5ca6.tar.gz | |
(smerge-diff-switches): Fix typo in docstring.
Diffstat (limited to 'lisp/smerge-mode.el')
| -rw-r--r-- | lisp/smerge-mode.el | 6 |
1 files changed, 3 insertions, 3 deletions
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 |