Mercurial > emacs
changeset 94846:1a6e4ea4e517
(smerge-command-prefix): Fix custom type.
| author | Reiner Steib <Reiner.Steib@gmx.de> |
|---|---|
| date | Sat, 10 May 2008 13:09:04 +0000 |
| parents | 1aa1de92b8a1 |
| children | 5e64dca662f0 |
| files | lisp/ChangeLog lisp/smerge-mode.el |
| diffstat | 2 files changed, 15 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat May 10 12:40:57 2008 +0000 +++ b/lisp/ChangeLog Sat May 10 13:09:04 2008 +0000 @@ -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):
--- a/lisp/smerge-mode.el Sat May 10 12:40:57 2008 +0000 +++ b/lisp/smerge-mode.el Sat May 10 13:09:04 2008 +0000 @@ -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 @@ (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 @@ 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)