diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-01-25 21:32:56 -0500 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-01-25 21:32:56 -0500 |
| commit | e43273eff03ad9e6c7564057b35a5bf6810935f2 (patch) | |
| tree | 32429e5f421e17725e68b5ab0eef0ff8ccc0c875 | |
| parent | 69b0acb95690de72a80beedf114f8f0896ef1354 (diff) | |
| download | emacs-e43273eff03ad9e6c7564057b35a5bf6810935f2.tar.gz | |
Use ctl-x-map in place of C-x (bug#10566)
For an example of the problems NOT doing this might cause, see eg
http://lists.gnu.org/archive/html/bug-gnu-emacs/2006-07/msg00000.html
Eg after:
(global-set-key (kbd "C-u") ctl-x-map)
(global-set-key (kbd "C-x") 'universal-argument)
just loading dired-x.el or term.el would give an error.
* lisp/dired-x.el (dired-bind-jump): Use ctl-x-map and ctl-x-4-map.
* lisp/term.el (term-raw-escape-map): Use Control-X-prefix.
* lisp/vc/vc-hooks.el (vc-prefix-map): Use ctl-x-map.
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/dired-x.el | 12 | ||||
| -rw-r--r-- | lisp/term.el | 3 | ||||
| -rw-r--r-- | lisp/vc/vc-hooks.el | 2 |
4 files changed, 14 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 192b4913aa8..02884f7774f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2012-01-26 Glenn Morris <rgm@gnu.org> + + * dired-x.el (dired-bind-jump): Use ctl-x-map and ctl-x-4-map. + * term.el (term-raw-escape-map): Use Control-X-prefix. + * vc/vc-hooks.el (vc-prefix-map): Use ctl-x-map. (Bug#10566) + 2012-01-25 Martin Rudalics <rudalics@gmx.at> * window.el (window-state-get, window--state-get-1): Don't deal diff --git a/lisp/dired-x.el b/lisp/dired-x.el index f775fd952c0..9b54954695b 100644 --- a/lisp/dired-x.el +++ b/lisp/dired-x.el @@ -85,12 +85,12 @@ use \\[customize]." :set (lambda (sym val) (if (set sym val) (progn - (define-key global-map "\C-x\C-j" 'dired-jump) - (define-key global-map "\C-x4\C-j" 'dired-jump-other-window)) - (if (eq 'dired-jump (lookup-key global-map "\C-x\C-j")) - (define-key global-map "\C-x\C-j" nil)) - (if (eq 'dired-jump-other-window (lookup-key global-map "\C-x4\C-j")) - (define-key global-map "\C-x4\C-j" nil)))) + (define-key ctl-x-map "\C-j" 'dired-jump) + (define-key ctl-x-4-map "\C-j" 'dired-jump-other-window)) + (if (eq 'dired-jump (lookup-key ctl-x-map "\C-j")) + (define-key ctl-x-map "\C-j" nil)) + (if (eq 'dired-jump-other-window (lookup-key ctl-x-4-map "\C-j")) + (define-key ctl-x-4-map "\C-j" nil)))) :group 'dired-keys) (defcustom dired-bind-man t diff --git a/lisp/term.el b/lisp/term.el index 4050781fa8c..f44f34226f2 100644 --- a/lisp/term.el +++ b/lisp/term.el @@ -907,8 +907,7 @@ is buffer-local." (define-key map [remap self-insert-command] 'term-send-raw) (define-key map "\e" esc-map) (setq term-raw-map map) - (setq term-raw-escape-map - (copy-keymap (lookup-key (current-global-map) "\C-x"))) + (setq term-raw-escape-map (copy-keymap 'Control-X-prefix)) ;; Added nearly all the 'gray keys' -mm diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el index 5e60666f56a..b6f07ef1dc4 100644 --- a/lisp/vc/vc-hooks.el +++ b/lisp/vc/vc-hooks.el @@ -941,7 +941,7 @@ current, and kill the buffer that visits the link." (define-key map "~" 'vc-revision-other-window) map)) (fset 'vc-prefix-map vc-prefix-map) -(define-key global-map "\C-xv" 'vc-prefix-map) +(define-key ctl-x-map "v" 'vc-prefix-map) (defvar vc-menu-map (let ((map (make-sparse-keymap "Version Control"))) |