summaryrefslogtreecommitdiff
path: root/lisp/vc
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/vc')
-rw-r--r--lisp/vc/cvs-status.el4
-rw-r--r--lisp/vc/diff-mode.el58
-rw-r--r--lisp/vc/log-edit.el24
-rw-r--r--lisp/vc/log-view.el10
-rw-r--r--lisp/vc/pcvs.el35
-rw-r--r--lisp/vc/smerge-mode.el7
6 files changed, 71 insertions, 67 deletions
diff --git a/lisp/vc/cvs-status.el b/lisp/vc/cvs-status.el
index 86b62eb1ce6..7886cc1eae2 100644
--- a/lisp/vc/cvs-status.el
+++ b/lisp/vc/cvs-status.el
@@ -40,8 +40,8 @@
"p" #'previous-line
"N" #'cvs-status-next
"P" #'cvs-status-prev
- ["M-n"] #'cvs-status-next
- ["M-p"] #'cvs-status-prev
+ "M-n" #'cvs-status-next
+ "M-p" #'cvs-status-prev
"t" #'cvs-status-cvstrees
"T" #'cvs-status-trees
">" #'cvs-mode-checkout)
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index e68aa2257d2..87d30666da0 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -169,49 +169,49 @@ and hunk-based syntax highlighting otherwise as a fallback."
"N" #'diff-file-next
"p" #'diff-hunk-prev
"P" #'diff-file-prev
- ["TAB"] #'diff-hunk-next
- [backtab] #'diff-hunk-prev
+ "TAB" #'diff-hunk-next
+ "<backtab>" #'diff-hunk-prev
"k" #'diff-hunk-kill
"K" #'diff-file-kill
"}" #'diff-file-next ; From compilation-minor-mode.
"{" #'diff-file-prev
- ["RET"] #'diff-goto-source
- [mouse-2] #'diff-goto-source
+ "RET" #'diff-goto-source
+ "<mouse-2>" #'diff-goto-source
"W" #'widen
"o" #'diff-goto-source ; other-window
"A" #'diff-ediff-patch
"r" #'diff-restrict-view
"R" #'diff-reverse-direction
- [remap undo] #'diff-undo)
+ "<remap> <undo>" #'diff-undo)
(defvar-keymap diff-mode-map
:doc "Keymap for `diff-mode'. See also `diff-mode-shared-map'."
- ["ESC"] (let ((map (define-keymap :parent diff-mode-shared-map)))
- ;; We want to inherit most bindings from
- ;; `diff-mode-shared-map', but not all since they may hide
- ;; useful `M-<foo>' global bindings when editing.
- (dolist (key '("A" "r" "R" "g" "q" "W" "z"))
- (define-key map key nil))
- map)
+ "ESC" (let ((map (define-keymap :parent diff-mode-shared-map)))
+ ;; We want to inherit most bindings from
+ ;; `diff-mode-shared-map', but not all since they may hide
+ ;; useful `M-<foo>' global bindings when editing.
+ (dolist (key '("A" "r" "R" "g" "q" "W" "z"))
+ (keymap-set map key nil))
+ map)
;; From compilation-minor-mode.
- ["C-c C-c"] #'diff-goto-source
+ "C-c C-c" #'diff-goto-source
;; By analogy with the global C-x 4 a binding.
- ["C-x 4 A"] #'diff-add-change-log-entries-other-window
+ "C-x 4 A" #'diff-add-change-log-entries-other-window
;; Misc operations.
- ["C-c C-a"] #'diff-apply-hunk
- ["C-c C-e"] #'diff-ediff-patch
- ["C-c C-n"] #'diff-restrict-view
- ["C-c C-s"] #'diff-split-hunk
- ["C-c C-t"] #'diff-test-hunk
- ["C-c C-r"] #'diff-reverse-direction
- ["C-c C-u"] #'diff-context->unified
+ "C-c C-a" #'diff-apply-hunk
+ "C-c C-e" #'diff-ediff-patch
+ "C-c C-n" #'diff-restrict-view
+ "C-c C-s" #'diff-split-hunk
+ "C-c C-t" #'diff-test-hunk
+ "C-c C-r" #'diff-reverse-direction
+ "C-c C-u" #'diff-context->unified
;; `d' because it duplicates the context :-( --Stef
- ["C-c C-d"] #'diff-unified->context
- ["C-c C-w"] #'diff-ignore-whitespace-hunk
+ "C-c C-d" #'diff-unified->context
+ "C-c C-w" #'diff-ignore-whitespace-hunk
;; `l' because it "refreshes" the hunk like C-l refreshes the screen
- ["C-c C-l"] #'diff-refresh-hunk
- ["C-c C-b"] #'diff-refine-hunk ;No reason for `b' :-(
- ["C-c C-f"] #'next-error-follow-minor-mode)
+ "C-c C-l" #'diff-refresh-hunk
+ "C-c C-b" #'diff-refine-hunk ;No reason for `b' :-(
+ "C-c C-f" #'next-error-follow-minor-mode)
(easy-menu-define diff-mode-menu diff-mode-map
"Menu for `diff-mode'."
@@ -264,9 +264,11 @@ and hunk-based syntax highlighting otherwise as a fallback."
:help "Go to the next count'th file"]
))
-(defcustom diff-minor-mode-prefix "\C-c="
+(defcustom diff-minor-mode-prefix "C-c ="
"Prefix key for `diff-minor-mode' commands."
- :type '(choice (string "\e") (string "C-c=") string))
+ :type '(choice (string "ESC")
+ (string "C-c =") string)
+ :version "29.1")
(defvar-keymap diff-minor-mode-map
:doc "Keymap for `diff-minor-mode'. See also `diff-mode-shared-map'."
diff --git a/lisp/vc/log-edit.el b/lisp/vc/log-edit.el
index c8d089e4113..6e3f302263b 100644
--- a/lisp/vc/log-edit.el
+++ b/lisp/vc/log-edit.el
@@ -55,18 +55,18 @@
(define-obsolete-variable-alias 'vc-log-entry-mode 'log-edit-mode-map "28.1")
(defvar-keymap log-edit-mode-map
- (kbd "C-c C-c") #'log-edit-done
- (kbd "C-c C-a") #'log-edit-insert-changelog
- (kbd "C-c C-w") #'log-edit-generate-changelog-from-diff
- (kbd "C-c C-d") #'log-edit-show-diff
- (kbd "C-c C-f") #'log-edit-show-files
- (kbd "C-c C-k") #'log-edit-kill-buffer
- (kbd "C-a") #'log-edit-beginning-of-line
- (kbd "M-n") #'log-edit-next-comment
- (kbd "M-p") #'log-edit-previous-comment
- (kbd "M-r") #'log-edit-comment-search-backward
- (kbd "M-s") #'log-edit-comment-search-forward
- (kbd "C-c ?") #'log-edit-mode-help)
+ "C-c C-c" #'log-edit-done
+ "C-c C-a" #'log-edit-insert-changelog
+ "C-c C-w" #'log-edit-generate-changelog-from-diff
+ "C-c C-d" #'log-edit-show-diff
+ "C-c C-f" #'log-edit-show-files
+ "C-c C-k" #'log-edit-kill-buffer
+ "C-a" #'log-edit-beginning-of-line
+ "M-n" #'log-edit-next-comment
+ "M-p" #'log-edit-previous-comment
+ "M-r" #'log-edit-comment-search-backward
+ "M-s" #'log-edit-comment-search-forward
+ "C-c ?" #'log-edit-mode-help)
(easy-menu-define log-edit-menu log-edit-mode-map
"Menu used for `log-edit-mode'."
diff --git a/lisp/vc/log-view.el b/lisp/vc/log-view.el
index 2c78000e38b..d45c1696a2f 100644
--- a/lisp/vc/log-view.el
+++ b/lisp/vc/log-view.el
@@ -123,7 +123,7 @@
:prefix "log-view-")
(defvar-keymap log-view-mode-map
- (kbd "RET") #'log-view-toggle-entry-display
+ "RET" #'log-view-toggle-entry-display
"m" #'log-view-toggle-mark-entry
"e" #'log-view-modify-change-comment
"d" #'log-view-diff
@@ -133,12 +133,12 @@
"f" #'log-view-find-revision
"n" #'log-view-msg-next
"p" #'log-view-msg-prev
- (kbd "TAB") #'log-view-msg-next
- (kbd "<backtab>") #'log-view-msg-prev
+ "TAB" #'log-view-msg-next
+ "<backtab>" #'log-view-msg-prev
"N" #'log-view-file-next
"P" #'log-view-file-prev
- (kbd "M-n") #'log-view-file-next
- (kbd "M-p") #'log-view-file-prev)
+ "M-n" #'log-view-file-next
+ "M-p" #'log-view-file-prev)
(easy-menu-define log-view-mode-menu log-view-mode-map
"Log-View Display Menu."
diff --git a/lisp/vc/pcvs.el b/lisp/vc/pcvs.el
index 2daa42fbf8f..fa28d074a98 100644
--- a/lisp/vc/pcvs.el
+++ b/lisp/vc/pcvs.el
@@ -164,33 +164,33 @@
"z" #'kill-this-buffer
"F" #'cvs-mode-set-flags
"!" #'cvs-mode-force-command
- ["C-c C-c"] #'cvs-mode-kill-process
+ "C-c C-c" #'cvs-mode-kill-process
;; marking
"m" #'cvs-mode-mark
"M" #'cvs-mode-mark-all-files
"S" #'cvs-mode-mark-on-state
"u" #'cvs-mode-unmark
- ["DEL"] #'cvs-mode-unmark-up
+ "DEL" #'cvs-mode-unmark-up
"%" #'cvs-mode-mark-matching-files
"T" #'cvs-mode-toggle-marks
- ["M-DEL"] #'cvs-mode-unmark-all-files
+ "M-DEL" #'cvs-mode-unmark-all-files
;; navigation keys
- " " #'cvs-mode-next-line
+ "SPC" #'cvs-mode-next-line
"n" #'cvs-mode-next-line
"p" #'cvs-mode-previous-line
- "\t" #'cvs-mode-next-line
- [backtab] #'cvs-mode-previous-line
+ "TAB" #'cvs-mode-next-line
+ "<backtab>" #'cvs-mode-previous-line
;; M- keys are usually those that operate on modules
- ["M-c"] #'cvs-checkout
- ["M-e"] #'cvs-examine
+ "M-c" #'cvs-checkout
+ "M-e" #'cvs-examine
"g" #'cvs-mode-revert-buffer
- ["M-u"] #'cvs-update
- ["M-s"] #'cvs-status
+ "M-u" #'cvs-update
+ "M-s" #'cvs-status
;; diff commands
"=" #'cvs-mode-diff
"d" cvs-mode-diff-map
;; keys that operate on individual files
- ["C-k"] #'cvs-mode-acknowledge
+ "C-k" #'cvs-mode-acknowledge
"A" #'cvs-mode-add-change-log-entry-other-window
"C" #'cvs-mode-commit-setup
"O" #'cvs-mode-update
@@ -202,7 +202,7 @@
"c" #'cvs-mode-commit
"e" #'cvs-mode-examine
"f" #'cvs-mode-find-file
- ["RET"] #'cvs-mode-find-file
+ "RET" #'cvs-mode-find-file
"i" #'cvs-mode-ignore
"l" #'cvs-mode-log
"o" #'cvs-mode-find-file-other-window
@@ -214,12 +214,12 @@
;; cvstree bindings
"+" #'cvs-mode-tree
;; mouse bindings
- [mouse-2] #'cvs-mode-find-file
- [follow-link] (lambda (pos)
+ "<mouse-2>" #'cvs-mode-find-file
+ "<follow-link>" (lambda (pos)
(eq (get-char-property pos 'face) 'cvs-filename))
- [(down-mouse-3)] #'cvs-menu
+ "<down-mouse-3>" #'cvs-menu
;; dired-like bindings
- "\C-o" #'cvs-mode-display-file)
+ "C-o" #'cvs-mode-display-file)
(easy-menu-define cvs-menu cvs-mode-map "Menu used in `cvs-mode'."
'("CVS"
@@ -266,9 +266,10 @@
;;;; CVS-Minor mode
;;;;
-(defcustom cvs-minor-mode-prefix "\C-xc"
+(defcustom cvs-minor-mode-prefix "C-x c"
"Prefix key for the `cvs-mode' bindings in `cvs-minor-mode'."
:type 'string
+ :version "29.1"
:group 'pcl-cvs)
(defvar-keymap cvs-minor-mode-map
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index 2cc5ee739fd..ee6ddf15881 100644
--- a/lisp/vc/smerge-mode.el
+++ b/lisp/vc/smerge-mode.el
@@ -156,16 +156,17 @@ Used in `smerge-diff-base-upper' and related functions."
"E" #'smerge-ediff
"C" #'smerge-combine-with-next
"R" #'smerge-refine
- ["C-m"] #'smerge-keep-current
+ "C-m" #'smerge-keep-current
"=" (define-keymap :name "Diff"
"<" (cons "base-upper" #'smerge-diff-base-upper)
">" (cons "base-lower" #'smerge-diff-base-lower)
"=" (cons "upper-lower" #'smerge-diff-upper-lower)))
-(defcustom smerge-command-prefix "\C-c^"
+(defcustom smerge-command-prefix "C-c ^"
"Prefix for `smerge-mode' commands."
+ :version "29.1"
:type '(choice (const :tag "ESC" "\e")
- (const :tag "C-c ^" "\C-c^" )
+ (const :tag "C-c ^" "C-c ^")
(const :tag "none" "")
string))
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-14 10:00:37 +0000