Mercurial > emacs
changeset 34840:509ed3724af0
(smerge-basic-map): Use `=' rather than `d'.
Use minibuffer menu prompt for the `=' prefix.
(smerge-command-prefix): Change default to C-^.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 22 Dec 2000 22:58:57 +0000 |
| parents | c7998d5ede4b |
| children | 43f31a211e9b |
| files | lisp/smerge-mode.el |
| diffstat | 1 files changed, 13 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/smerge-mode.el Fri Dec 22 22:56:36 2000 +0000 +++ b/lisp/smerge-mode.el Fri Dec 22 22:58:57 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.6 2000/10/05 06:05:51 miles Exp $ +;; Revision: $Id: smerge-mode.el,v 1.7 2000/10/06 16:07:31 monnier Exp $ ;; This file is part of GNU Emacs. @@ -113,7 +113,7 @@ (defvar smerge-markers-face 'smerge-markers-face) (easy-mmode-defmap smerge-basic-map - '(("n" . smerge-next) + `(("n" . smerge-next) ("p" . smerge-prev) ("a" . smerge-keep-all) ("b" . smerge-keep-base) @@ -121,15 +121,16 @@ ("m" . smerge-keep-mine) ("E" . smerge-ediff) ("\C-m" . smerge-keep-current) - ("d<" . smerge-diff-base-mine) - ("d>" . smerge-diff-base-other) - ("d=" . smerge-diff-mine-other)) + ("=" . ,(make-sparse-keymap "Diff")) + ("=<" "base-mine" . smerge-diff-base-mine) + ("=>" "base-other" . smerge-diff-base-other) + ("==" "mine-other" . smerge-diff-mine-other)) "The base keymap for `smerge-mode'.") -(defcustom smerge-command-prefix "\e" +(defcustom smerge-command-prefix "\C-c^" "Prefix for `smerge-mode' commands." :group 'smerge - :type '(choice (string "\e") (string "C-x^") (string "") string)) + :type '(choice (string "\e") (string "\C-c^") (string "") string)) (easy-mmode-defmap smerge-mode-map `((,smerge-command-prefix . ,smerge-basic-map)) @@ -162,6 +163,7 @@ (1 smerge-mine-face prepend) (2 smerge-base-face prepend t) (3 smerge-other-face prepend t) + ;; FIXME: `keep' doesn't work right with syntactic fontification. (0 smerge-markers-face keep) (4 nil t t) (5 nil t t))) @@ -477,6 +479,10 @@ ;;; Change Log: ;; $Log: smerge-mode.el,v $ +;; Revision 1.7 2000/10/06 16:07:31 monnier +;; (smerge-diff): Setup the buffer's default-directory +;; and add filename to the names so that diff-mode can jump to source. +;; ;; Revision 1.6 2000/10/05 06:05:51 miles ;; (smerge-mine-face, smerge-other-face, smerge-base-face, smerge-markers-face): ;; Add dark-background variants.