summaryrefslogtreecommitdiff
path: root/lisp/textmodes
diff options
context:
space:
mode:
authorJuri Linkov <juri@linkov.net>2019-10-20 01:06:38 +0300
committerJuri Linkov <juri@linkov.net>2019-10-20 01:06:38 +0300
commit58d23f5f19b5b766fd70addcb36414a739a00e4a (patch)
tree57c6147638032e07fd852bcf8d1da7125bb7dd59 /lisp/textmodes
parent7e238e7d50872d43a137c1350cb3b293aea176c2 (diff)
downloademacs-58d23f5f19b5b766fd70addcb36414a739a00e4a.tar.gz
emacs-58d23f5f19b5b766fd70addcb36414a739a00e4a.tar.bz2
emacs-58d23f5f19b5b766fd70addcb36414a739a00e4a.zip
Use 'C-x t' for tab-prefix-map instead of 'C-x 6' still used by 2C-mode-map.
* doc/emacs/commands.texi (Keys): Add 'C-x t'. * doc/emacs/frames.texi (Tab Bars): Replace 'C-x 6' with 'C-x t'. * doc/lispref/keymaps.texi (Prefix Keys): Add 'C-x t' (tab-prefix-map). * doc/lispref/maps.texi (Standard Keymaps): Add tab-prefix-map, tab-bar-map. * lisp/dired.el: Rebind 'C-x 6 d' to 'C-x t d'. Use tab-prefix-map. * lisp/subr.el (ctl-x-6-map, ctl-x-6-prefix, ctl-x-t-prefix): Remove. (tab-prefix-map): New keymap bound to 'C-x t'. * lisp/tab-bar.el: Use tab-prefix-map instead of ctl-x-6-map. * lisp/textmodes/two-column.el: Restore autoload global setting of "\C-x6" to 2C-command. * lisp/ldefs-boot.el: Update to add setting "\C-x6" to 2C-command. * doc/emacs/commands.texi (Keys): * doc/emacs/text.texi (Two-Column): * doc/lispref/keymaps.texi (Prefix Keys): * doc/lispref/maps.texi (Standard Keymaps): Restore 'C-x 6' bound to '2C-mode-map'.
Diffstat (limited to 'lisp/textmodes')
-rw-r--r--lisp/textmodes/two-column.el4
1 files changed, 1 insertions, 3 deletions
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)