From: Reiner Steib <Reiner.Steib@gmx.de>
Date: Sat, 10 May 2008 13:09:04 +0000 (+0000)
Subject: (smerge-command-prefix): Fix custom type.
X-Git-Tag: emacs-pretest-23.0.90~5644
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b3fccc2715c53adc5f80eb003abcd27f215f4564;p=emacs.git

(smerge-command-prefix): Fix custom type.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2b45d7b6e7e..b33a6e3f6a0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-10  Reiner Steib  <reiner.steib@gmx.de>
+
+	* smerge-mode.el (smerge-command-prefix): Fix custom type.
+
 2008-05-10  Eric S. Raymond  <esr@snark.thyrsus.com>
 
 	* vc-dispatcher.el (vc-dir-next-directory, vc-dir-prev-directory):
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index 3195a67e6cc..fb13d2f3f7f 100644
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -8,10 +8,10 @@
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software: you can redistribute it and/or modify
+;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +19,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -158,7 +160,10 @@ Used in `smerge-diff-base-mine' and related functions."
 (defcustom smerge-command-prefix "\C-c^"
   "Prefix for `smerge-mode' commands."
   :group 'smerge
-  :type '(choice (string "\e") (string "\C-c^") (string "") string))
+  :type '(choice (const :tag "ESC"   "\e")
+		 (const :tag "C-c ^" "\C-c^" )
+		 (const :tag "none"  "")
+		 string))
 
 (easy-mmode-defmap smerge-mode-map
   `((,smerge-command-prefix . ,smerge-basic-map))
@@ -1225,8 +1230,7 @@ with a \\[universal-argument] prefix, makes up a 3-way conflict."
 If no conflict maker is found, turn off `smerge-mode'."
   (smerge-mode 1)
   (condition-case nil
-      (unless (looking-at smerge-begin-re)
-        (smerge-next))
+      (smerge-next)
     (error (smerge-auto-leave))))
 
 (provide 'smerge-mode)