mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-26 07:33:47 +00:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Reiner Steib 2008-05-10 13:09:04 +00:00
parent 2cd5294d11
commit b3fccc2715
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/ChangeLog
View File

@ -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):

18
lisp/smerge-mode.el
View File

@ -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)