diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/dired.el | 2 | ||||
| -rw-r--r-- | lisp/ldefs-boot.el | 1 | ||||
| -rw-r--r-- | lisp/subr.el | 9 | ||||
| -rw-r--r-- | lisp/tab-bar.el | 16 | ||||
| -rw-r--r-- | lisp/textmodes/two-column.el | 4 |
5 files changed, 14 insertions, 18 deletions
diff --git a/lisp/dired.el b/lisp/dired.el index 574de7ac3eb..3146511305d 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -848,7 +848,7 @@ If DIRNAME is already in a Dired buffer, that buffer is used without refresh." (interactive (dired-read-dir-and-switches "in other frame ")) (switch-to-buffer-other-frame (dired-noselect dirname switches))) -;;;###autoload (define-key ctl-x-6-map "d" 'dired-other-tab) +;;;###autoload (define-key tab-prefix-map "d" 'dired-other-tab) ;;;###autoload (defun dired-other-tab (dirname &optional switches) "\"Edit\" directory DIRNAME. Like `dired' but makes a new tab." diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index 5c20c0526d4..ea111f2d3f1 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el @@ -34138,6 +34138,7 @@ resumed later. ;;;;;; 0 0)) ;;; Generated autoloads from textmodes/two-column.el (autoload '2C-command "two-column" () t 'keymap) + (global-set-key "\C-x6" '2C-command) (global-set-key [f2] '2C-command) (autoload '2C-two-columns "two-column" "\ diff --git a/lisp/subr.el b/lisp/subr.el index f3371dd2d74..ada078aed9b 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1262,12 +1262,9 @@ The normal global definition of the character C-x indirects to this keymap.") (defalias 'ctl-x-5-prefix ctl-x-5-map) (define-key ctl-x-map "5" 'ctl-x-5-prefix) -(defvar ctl-x-6-map (make-sparse-keymap) - "Keymap for tab commands.") -(defalias 'ctl-x-6-prefix ctl-x-6-map) -(define-key ctl-x-map "6" 'ctl-x-6-prefix) -(defalias 'ctl-x-t-prefix ctl-x-6-map) -(define-key ctl-x-map "t" 'ctl-x-t-prefix) +(defvar tab-prefix-map (make-sparse-keymap) + "Keymap for tab-bar related commands.") +(define-key ctl-x-map "t" tab-prefix-map) ;;;; Event manipulation functions. diff --git a/lisp/tab-bar.el b/lisp/tab-bar.el index c376f598966..52d06872312 100644 --- a/lisp/tab-bar.el +++ b/lisp/tab-bar.el @@ -962,14 +962,14 @@ Like \\[find-file-other-frame] (which see), but creates a new tab." value) (switch-to-buffer-other-tab value)))) -(define-key ctl-x-6-map "2" 'tab-new) -(define-key ctl-x-6-map "1" 'tab-close-other) -(define-key ctl-x-6-map "0" 'tab-close) -(define-key ctl-x-6-map "o" 'tab-next) -(define-key ctl-x-6-map "b" 'switch-to-buffer-other-tab) -(define-key ctl-x-6-map "f" 'find-file-other-tab) -(define-key ctl-x-6-map "\C-f" 'find-file-other-tab) -(define-key ctl-x-6-map "r" 'tab-rename) +(define-key tab-prefix-map "2" 'tab-new) +(define-key tab-prefix-map "1" 'tab-close-other) +(define-key tab-prefix-map "0" 'tab-close) +(define-key tab-prefix-map "o" 'tab-next) +(define-key tab-prefix-map "b" 'switch-to-buffer-other-tab) +(define-key tab-prefix-map "f" 'find-file-other-tab) +(define-key tab-prefix-map "\C-f" 'find-file-other-tab) +(define-key tab-prefix-map "r" 'tab-rename) (provide 'tab-bar) diff --git a/lisp/textmodes/two-column.el b/lisp/textmodes/two-column.el index 5bc70d0bd5f..e1ebf1a02a0 100644 --- a/lisp/textmodes/two-column.el +++ b/lisp/textmodes/two-column.el @@ -184,9 +184,7 @@ minus this value." ;; This one is for historical reasons and simple keyboards, it is not ;; at all mnemonic. All usual sequences containing 2 were used, and ;; f2 could not be set up in a standard way under Emacs 18. -;; This prefix is bound only after loading this package -;; to not conflict with the C-x 6 prefix used by tab commands. -(global-set-key "\C-x6" '2C-command) +;;;###autoload (global-set-key "\C-x6" '2C-command) ;;;###autoload (global-set-key [f2] '2C-command) |