Commit a7b77977 authored by Dave Love's avatar Dave Love
Browse files

(smerge-diff-switches): Don't use list* in defcustom.

parent 7997f1ca
......@@ -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 @@ The point is moved to the end of the conflict."
;;; 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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment