andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use ctl-x-map in place of C-x (bug#10566)

Browse source 
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.
This commit is contained in:
Glenn Morris 2012-01-25 21:32:56 -05:00
parent 69b0acb956
commit e43273eff0
4 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

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

12
lisp/dired-x.el
View file

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

3
lisp/term.el
View file

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

2
lisp/vc/vc-hooks.el
View file

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