Mercurial > emacs
comparison lisp/smerge-mode.el @ 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 | 108ba8d61036 |
children | 636fe93e755c |
comparison
equal
deleted
inserted
replaced
29206:6e9f065ce572 | 29207:6c4e371d4efd |
---|---|
2 | 2 |
3 ;; Copyright (C) 1999 Free Software Foundation, Inc. | 3 ;; Copyright (C) 1999 Free Software Foundation, Inc. |
4 | 4 |
5 ;; Author: Stefan Monnier <monnier@cs.yale.edu> | 5 ;; Author: Stefan Monnier <monnier@cs.yale.edu> |
6 ;; Keywords: merge diff3 cvs conflict | 6 ;; Keywords: merge diff3 cvs conflict |
7 ;; Revision: $Id: smerge-mode.el,v 1.1 1999/12/09 13:00:21 monnier Exp $ | 7 ;; Revision: $Id: smerge-mode.el,v 1.2 2000/03/22 00:54:55 monnier Exp $ |
8 | 8 |
9 ;; This file is part of GNU Emacs. | 9 ;; This file is part of GNU Emacs. |
10 | 10 |
11 ;; GNU Emacs is free software; you can redistribute it and/or modify | 11 ;; GNU Emacs is free software; you can redistribute it and/or modify |
12 ;; it under the terms of the GNU General Public License as published by | 12 ;; it under the terms of the GNU General Public License as published by |
62 (const "*cvs-diff*") | 62 (const "*cvs-diff*") |
63 (const "*smerge-diff*") | 63 (const "*smerge-diff*") |
64 string)) | 64 string)) |
65 | 65 |
66 (defcustom smerge-diff-switches | 66 (defcustom smerge-diff-switches |
67 (list* "-d" "-b" | 67 (append '("-d" "-b") |
68 (if (listp diff-switches) diff-switches (list diff-switches))) | 68 (if (listp diff-switches) diff-switches (list diff-switches))) |
69 "*A list of strings specifying switches to be be passed to diff. | 69 "*A list of strings specifying switches to be be passed to diff. |
70 Used in `smerge-diff-base-mine' and related functions." | 70 Used in `smerge-diff-base-mine' and related functions." |
71 :group 'smerge | 71 :group 'smerge |
72 :type '(repeat string)) | 72 :type '(repeat string)) |
73 | 73 |
442 | 442 |
443 (provide 'smerge-mode) | 443 (provide 'smerge-mode) |
444 | 444 |
445 ;;; Change Log: | 445 ;;; Change Log: |
446 ;; $Log: smerge-mode.el,v $ | 446 ;; $Log: smerge-mode.el,v $ |
447 ;; Revision 1.2 2000/03/22 00:54:55 monnier | |
448 ;; (smerge-auto-leave): New function and variable. | |
449 ;; (smerge-basic-map): Rename from smerge-basic-keymap. | |
450 ;; Change the bindings for smerge-diff-*. | |
451 ;; (smerge-*-map): Use easy-mmode-defmap. | |
452 ;; (smerge-(next|prev)): Use easy-mmode-define-navigation. | |
453 ;; (smerge-keep-*): Use smerge-auto-leave. | |
454 ;; | |
447 ;; Revision 1.1 1999/12/09 13:00:21 monnier | 455 ;; Revision 1.1 1999/12/09 13:00:21 monnier |
448 ;; New file. Provides a simple minor-mode for files containing | 456 ;; New file. Provides a simple minor-mode for files containing |
449 ;; diff3-style conflict markers, such as generated by RCS | 457 ;; diff3-style conflict markers, such as generated by RCS |
450 ;; | 458 ;; |
451 | 459 |