Mercurial > emacs
changeset 29207:6c4e371d4efd
(smerge-diff-switches): Don't use list* in defcustom.
| author | Dave Love <fx@gnu.org> |
|---|---|
| date | Thu, 25 May 2000 18:08:26 +0000 |
| parents | 6e9f065ce572 |
| children | 15df28a6f99f |
| files | lisp/smerge-mode.el |
| diffstat | 1 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/smerge-mode.el Thu May 25 17:21:32 2000 +0000 +++ b/lisp/smerge-mode.el Thu May 25 18:08:26 2000 +0000 @@ -4,7 +4,7 @@ ;; Author: Stefan Monnier <monnier@cs.yale.edu> ;; Keywords: merge diff3 cvs conflict -;; Revision: $Id: smerge-mode.el,v 1.1 1999/12/09 13:00:21 monnier Exp $ +;; Revision: $Id: smerge-mode.el,v 1.2 2000/03/22 00:54:55 monnier Exp $ ;; This file is part of GNU Emacs. @@ -64,8 +64,8 @@ string)) (defcustom smerge-diff-switches - (list* "-d" "-b" - (if (listp diff-switches) diff-switches (list 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. Used in `smerge-diff-base-mine' and related functions." :group 'smerge @@ -444,6 +444,14 @@ ;;; Change Log: ;; $Log: smerge-mode.el,v $ +;; Revision 1.2 2000/03/22 00:54:55 monnier +;; (smerge-auto-leave): New function and variable. +;; (smerge-basic-map): Rename from smerge-basic-keymap. +;; Change the bindings for smerge-diff-*. +;; (smerge-*-map): Use easy-mmode-defmap. +;; (smerge-(next|prev)): Use easy-mmode-define-navigation. +;; (smerge-keep-*): Use smerge-auto-leave. +;; ;; Revision 1.1 1999/12/09 13:00:21 monnier ;; New file. Provides a simple minor-mode for files containing ;; diff3-style conflict markers, such as generated by RCS