From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 22 Dec 2000 22:59:17 +0000 (+0000)
Subject: (smerge-basic-map): Use `=' rather than `d'.
X-Git-Tag: emacs-pretest-21.0.95~301
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0e86b6b04b7700833e139303e311ae7a8c4088a3;p=emacs.git

(smerge-basic-map): Use `=' rather than `d'.
Use minibuffer menu prompt for the `=' prefix.
(smerge-command-prefix): Change default to C-^.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dfb64e4f158..dc123d24185 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2000-12-22  Stefan Monnier  <monnier@cs.yale.edu>
 
+	* smerge-mode.el (smerge-basic-map): Use `=' rather than `d'.
+	Use minibuffer menu prompt for the `=' prefix.
+	(smerge-command-prefix): Change default to C-^.
+
 	* skeleton.el (skeleton-internal-1): Make sure the first line of
 	the region is also re-indented.
 	(skeleton-end-newline): New var.
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index 9805286ac29..5b182b28e8a 100644
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -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 @@ Used in `smerge-diff-base-mine' and related functions."
 (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 @@ Used in `smerge-diff-base-mine' and related functions."
     ("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 @@ Used in `smerge-diff-base-mine' and related functions."
      (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 @@ The point is moved to the end of the conflict."
 
 ;;; 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.