diff options
author | Reiner Steib <[email protected]> | 2008-05-10 13:09:04 +0000 |
---|---|---|
committer | Reiner Steib <[email protected]> | 2008-05-10 13:09:04 +0000 |
commit | b3fccc2715c53adc5f80eb003abcd27f215f4564 (patch) | |
tree | 01d3756194db1e6747088aba4a35665f69a05deb /lisp/smerge-mode.el | |
parent | 2cd5294d11827e2146c24173b13338e8c9a284c2 (diff) |
(smerge-command-prefix): Fix custom type.
Diffstat (limited to 'lisp/smerge-mode.el')
-rw-r--r-- | lisp/smerge-mode.el | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index 3195a67e6c..fb13d2f3f7 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) |