From 8daffab7371b7e8273dc5e2c5df45f5a6a1bdd1b Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Mon, 30 Jun 2008 19:40:47 +0000 Subject: [PATCH] Bind global keys to ctl-x-r-map in autoload cookies. --- lisp/ChangeLog | 44 ++++++++++++++++++++++++++++++++++++++++++++ lisp/rect.el | 8 ++++++++ lisp/register.el | 16 ++++++++++++++++ 3 files changed, 68 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2297d1c35b5..4136083f193 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,47 @@ +2008-06-30 Juri Linkov + + * faces.el (face-name-history): New variable. + (make-face, make-empty-face): Replace interactive spec "S" + with `read-from-minibuffer' where `read' arg is t and + `hist' arg is `face-name-history'. + (read-face-name): Set `hist' arg of `completing-read-multiple' + to `face-name-history'. + (list-faces-display): Use `read-regexp' instead of `read-string' + to read regexp. + + * hi-lock.el (hi-lock-regexp-history): Make it an obsolete alias + to `regexp-history'. + (hi-lock-face-history): Rename to `hi-lock-face-defaults' and + make it an obsolete alias to it. + (hi-lock-face-defaults): New variable renamed from + `hi-lock-face-history'. + (hi-lock-line-face-buffer, hi-lock-face-buffer) + (hi-lock-face-phrase-buffer): Use `read-regexp' instead of + `read-from-minibuffer'. Doc fix. + (hi-lock-read-face-name): Replace `hi-lock-face-history' with + `hi-lock-face-defaults'. Remove `mapcar (lambda (f) (cons f f))'. + Set `hist' arg of `completing-read' to `face-name-history'. + Put a list of default faces to `default' arg instead of `hist' arg. + + * bindings.el (abbrev-map, narrow-map): New variables. + Bind `C-x a' to `abbrev-map' and `C-x n' to `narrow-map'. + Rebind related commands to these new maps. + (ctl-x-r-map): New variable for rectangle, register and bookmark + keys. Move rectangle keybindings to rect.el and register + keybindings to register.el. + (next-buffer, previous-buffer): Remove C-x prefix and move + keybindings to ctl-x-map. + + * bookmark.el: Rebind three global `C-x r' keys "b", "m", "l" + to the new map `ctl-x-r-map' in autoload cookies. + + * expand.el: Rebind two global `C-x a' keys "n", "p" + to the new map `abbrev-map' in autoload cookies. + + * rect.el: Bind global keys to ctl-x-r-map in autoload cookies. + + * register.el: Bind global keys to ctl-x-r-map in autoload cookies. + 2008-06-30 Miles Bader * net/rcirc.el (rcirc-markup-attributes): Don't skip a character diff --git a/lisp/rect.el b/lisp/rect.el index 69bcd8985dc..594405716ee 100644 --- a/lisp/rect.el +++ b/lisp/rect.el @@ -31,6 +31,14 @@ ;; intrusive and fill lines with whitespaces only when needed. A few functions ;; are untouched though, as noted above their definition. +;;; Global key bindings + +;;;###autoload (define-key ctl-x-r-map "c" 'clear-rectangle) +;;;###autoload (define-key ctl-x-r-map "k" 'kill-rectangle) +;;;###autoload (define-key ctl-x-r-map "d" 'delete-rectangle) +;;;###autoload (define-key ctl-x-r-map "y" 'yank-rectangle) +;;;###autoload (define-key ctl-x-r-map "o" 'open-rectangle) +;;;###autoload (define-key ctl-x-r-map "t" 'string-rectangle) ;;; Code: diff --git a/lisp/register.el b/lisp/register.el index 881a7a02649..6a8156e329c 100644 --- a/lisp/register.el +++ b/lisp/register.el @@ -28,6 +28,22 @@ ;; pieces of buffer state to named variables. The entry points are ;; documented in the Emacs user's manual. +;;; Global key bindings + +;;;###autoload (define-key ctl-x-r-map "\C-@" 'point-to-register) +;;;###autoload (define-key ctl-x-r-map [?\C-\ ] 'point-to-register) +;;;###autoload (define-key ctl-x-r-map " " 'point-to-register) +;;;###autoload (define-key ctl-x-r-map "j" 'jump-to-register) +;;;###autoload (define-key ctl-x-r-map "s" 'copy-to-register) +;;;###autoload (define-key ctl-x-r-map "x" 'copy-to-register) +;;;###autoload (define-key ctl-x-r-map "i" 'insert-register) +;;;###autoload (define-key ctl-x-r-map "g" 'insert-register) +;;;###autoload (define-key ctl-x-r-map "r" 'copy-rectangle-to-register) +;;;###autoload (define-key ctl-x-r-map "n" 'number-to-register) +;;;###autoload (define-key ctl-x-r-map "+" 'increment-register) +;;;###autoload (define-key ctl-x-r-map "w" 'window-configuration-to-register) +;;;###autoload (define-key ctl-x-r-map "f" 'frame-configuration-to-register) + ;;; Code: (defvar register-alist nil -- 2.11.4.GIT