diff options
| author | Juri Linkov | 2008-06-30 19:40:47 +0000 |
|---|---|---|
| committer | Juri Linkov | 2008-06-30 19:40:47 +0000 |
| commit | 8daffab7371b7e8273dc5e2c5df45f5a6a1bdd1b (patch) | |
| tree | f62d176020afb868dace379c3115d03bafdc7d8b | |
| parent | e1dc2a695eb5651d78d9b71a3187683484b0e4e6 (diff) | |
| download | emacs-8daffab7371b7e8273dc5e2c5df45f5a6a1bdd1b.tar.gz emacs-8daffab7371b7e8273dc5e2c5df45f5a6a1bdd1b.zip | |
Bind global keys to ctl-x-r-map in autoload cookies.
| -rw-r--r-- | lisp/ChangeLog | 44 | ||||
| -rw-r--r-- | lisp/rect.el | 8 | ||||
| -rw-r--r-- | lisp/register.el | 16 |
3 files changed, 68 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2297d1c35b5..4136083f193 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,47 @@ | |||
| 1 | 2008-06-30 Juri Linkov <juri@jurta.org> | ||
| 2 | |||
| 3 | * faces.el (face-name-history): New variable. | ||
| 4 | (make-face, make-empty-face): Replace interactive spec "S" | ||
| 5 | with `read-from-minibuffer' where `read' arg is t and | ||
| 6 | `hist' arg is `face-name-history'. | ||
| 7 | (read-face-name): Set `hist' arg of `completing-read-multiple' | ||
| 8 | to `face-name-history'. | ||
| 9 | (list-faces-display): Use `read-regexp' instead of `read-string' | ||
| 10 | to read regexp. | ||
| 11 | |||
| 12 | * hi-lock.el (hi-lock-regexp-history): Make it an obsolete alias | ||
| 13 | to `regexp-history'. | ||
| 14 | (hi-lock-face-history): Rename to `hi-lock-face-defaults' and | ||
| 15 | make it an obsolete alias to it. | ||
| 16 | (hi-lock-face-defaults): New variable renamed from | ||
| 17 | `hi-lock-face-history'. | ||
| 18 | (hi-lock-line-face-buffer, hi-lock-face-buffer) | ||
| 19 | (hi-lock-face-phrase-buffer): Use `read-regexp' instead of | ||
| 20 | `read-from-minibuffer'. Doc fix. | ||
| 21 | (hi-lock-read-face-name): Replace `hi-lock-face-history' with | ||
| 22 | `hi-lock-face-defaults'. Remove `mapcar (lambda (f) (cons f f))'. | ||
| 23 | Set `hist' arg of `completing-read' to `face-name-history'. | ||
| 24 | Put a list of default faces to `default' arg instead of `hist' arg. | ||
| 25 | |||
| 26 | * bindings.el (abbrev-map, narrow-map): New variables. | ||
| 27 | Bind `C-x a' to `abbrev-map' and `C-x n' to `narrow-map'. | ||
| 28 | Rebind related commands to these new maps. | ||
| 29 | (ctl-x-r-map): New variable for rectangle, register and bookmark | ||
| 30 | keys. Move rectangle keybindings to rect.el and register | ||
| 31 | keybindings to register.el. | ||
| 32 | (next-buffer, previous-buffer): Remove C-x prefix and move | ||
| 33 | keybindings to ctl-x-map. | ||
| 34 | |||
| 35 | * bookmark.el: Rebind three global `C-x r' keys "b", "m", "l" | ||
| 36 | to the new map `ctl-x-r-map' in autoload cookies. | ||
| 37 | |||
| 38 | * expand.el: Rebind two global `C-x a' keys "n", "p" | ||
| 39 | to the new map `abbrev-map' in autoload cookies. | ||
| 40 | |||
| 41 | * rect.el: Bind global keys to ctl-x-r-map in autoload cookies. | ||
| 42 | |||
| 43 | * register.el: Bind global keys to ctl-x-r-map in autoload cookies. | ||
| 44 | |||
| 1 | 2008-06-30 Miles Bader <miles@gnu.org> | 45 | 2008-06-30 Miles Bader <miles@gnu.org> |
| 2 | 46 | ||
| 3 | * net/rcirc.el (rcirc-markup-attributes): Don't skip a character | 47 | * 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 @@ | |||
| 31 | ;; intrusive and fill lines with whitespaces only when needed. A few functions | 31 | ;; intrusive and fill lines with whitespaces only when needed. A few functions |
| 32 | ;; are untouched though, as noted above their definition. | 32 | ;; are untouched though, as noted above their definition. |
| 33 | 33 | ||
| 34 | ;;; Global key bindings | ||
| 35 | |||
| 36 | ;;;###autoload (define-key ctl-x-r-map "c" 'clear-rectangle) | ||
| 37 | ;;;###autoload (define-key ctl-x-r-map "k" 'kill-rectangle) | ||
| 38 | ;;;###autoload (define-key ctl-x-r-map "d" 'delete-rectangle) | ||
| 39 | ;;;###autoload (define-key ctl-x-r-map "y" 'yank-rectangle) | ||
| 40 | ;;;###autoload (define-key ctl-x-r-map "o" 'open-rectangle) | ||
| 41 | ;;;###autoload (define-key ctl-x-r-map "t" 'string-rectangle) | ||
| 34 | 42 | ||
| 35 | ;;; Code: | 43 | ;;; Code: |
| 36 | 44 | ||
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 @@ | |||
| 28 | ;; pieces of buffer state to named variables. The entry points are | 28 | ;; pieces of buffer state to named variables. The entry points are |
| 29 | ;; documented in the Emacs user's manual. | 29 | ;; documented in the Emacs user's manual. |
| 30 | 30 | ||
| 31 | ;;; Global key bindings | ||
| 32 | |||
| 33 | ;;;###autoload (define-key ctl-x-r-map "\C-@" 'point-to-register) | ||
| 34 | ;;;###autoload (define-key ctl-x-r-map [?\C-\ ] 'point-to-register) | ||
| 35 | ;;;###autoload (define-key ctl-x-r-map " " 'point-to-register) | ||
| 36 | ;;;###autoload (define-key ctl-x-r-map "j" 'jump-to-register) | ||
| 37 | ;;;###autoload (define-key ctl-x-r-map "s" 'copy-to-register) | ||
| 38 | ;;;###autoload (define-key ctl-x-r-map "x" 'copy-to-register) | ||
| 39 | ;;;###autoload (define-key ctl-x-r-map "i" 'insert-register) | ||
| 40 | ;;;###autoload (define-key ctl-x-r-map "g" 'insert-register) | ||
| 41 | ;;;###autoload (define-key ctl-x-r-map "r" 'copy-rectangle-to-register) | ||
| 42 | ;;;###autoload (define-key ctl-x-r-map "n" 'number-to-register) | ||
| 43 | ;;;###autoload (define-key ctl-x-r-map "+" 'increment-register) | ||
| 44 | ;;;###autoload (define-key ctl-x-r-map "w" 'window-configuration-to-register) | ||
| 45 | ;;;###autoload (define-key ctl-x-r-map "f" 'frame-configuration-to-register) | ||
| 46 | |||
| 31 | ;;; Code: | 47 | ;;; Code: |
| 32 | 48 | ||
| 33 | (defvar register-alist nil | 49 | (defvar register-alist nil |