diff options
| author | Stefan Monnier | 2011-02-10 11:56:00 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2011-02-10 11:56:00 -0500 |
| commit | b016851cb127f91a7ffa5d8295e5f3d4fdd3222a (patch) | |
| tree | e1ccff1ff1bf49670b0cea40ebd566e1449290ee /lisp/erc | |
| parent | 1be1d1e98e5465659b9633a3f1961e6dcc0b022a (diff) | |
| download | emacs-b016851cb127f91a7ffa5d8295e5f3d4fdd3222a.tar.gz emacs-b016851cb127f91a7ffa5d8295e5f3d4fdd3222a.zip | |
Move keymap initialization into declaration.
* lisp/textmodes/enriched.el (enriched-mode-map):
* lisp/textmodes/bib-mode.el (bib-mode-map):
* lisp/term/lk201.el (lk201-function-map):
* lisp/tar-mode.el (tar-mode-map):
* lisp/replace.el (occur-mode-map):
* lisp/progmodes/idlwave.el (idlwave-rinfo-mouse-map, idlwave-rinfo-map):
* lisp/progmodes/idlw-help.el (idlwave-help-mode-map):
* lisp/progmodes/gdb-mi.el (gdb-memory-format-menu, gdb-memory-unit-menu):
* lisp/play/solitaire.el (solitaire-mode-map):
* lisp/play/snake.el (snake-mode-map, snake-null-map):
* lisp/play/pong.el (pong-mode-map):
* lisp/play/handwrite.el (menu-bar-handwrite-map):
* lisp/play/gametree.el (gametree-mode-map):
* lisp/net/rcirc.el (rcirc-mode-map, rcirc-browse-url-map
(rcirc-multiline-minor-mode-map, rcirc-track-minor-mode-map):
* lisp/net/newst-plainview.el (newsticker-menu, newsticker-mode-map)
(newsticker--url-keymap):
* lisp/net/net-utils.el (nslookup-mode-map, ftp-mode-map):
* lisp/menu-bar.el (menu-bar-file-menu, menu-bar-i-search-menu)
(menu-bar-search-menu, menu-bar-replace-menu, menu-bar-goto-menu)
(menu-bar-edit-menu, menu-bar-custom-menu)
(menu-bar-showhide-fringe-ind-menu, menu-bar-showhide-fringe-menu)
(menu-bar-showhide-scroll-bar-menu, menu-bar-showhide-menu)
(menu-bar-line-wrapping-menu, menu-bar-options-menu)
(menu-bar-games-menu, menu-bar-encryption-decryption-menu)
(menu-bar-tools-menu, menu-bar-describe-menu)
(menu-bar-search-documentation-menu, menu-bar-manuals-menu)
(menu-bar-help-menu):
* lisp/mail/rmailsum.el (rmail-summary-mode-map):
* lisp/kmacro.el (kmacro-step-edit-map):
* lisp/ibuffer.el (ibuffer-mode-groups-popup, ibuffer-mode-map)
(ibuffer-mode-operate-map):
* lisp/hi-lock.el (hi-lock-menu, hi-lock-map):
* lisp/emulation/vip.el (vip-mode-map):
* lisp/emacs-lisp/re-builder.el (reb-lisp-mode-map):
* lisp/bookmark.el (bookmark-bmenu-mode-map):
* lisp/help-mode.el (help-mode-map):
* lisp/erc/erc-list.el (erc-list-menu-mode-map):
* lisp/org/org-remember.el (org-remember-mode-map):
* lisp/org/org-src.el (org-src-mode-map): Move initialization into declaration.
Diffstat (limited to 'lisp/erc')
| -rw-r--r-- | lisp/erc/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/erc/erc-list.el | 17 |
2 files changed, 16 insertions, 6 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index b7cf79cc3cb..2996fee9bcb 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-02-10 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * erc-list.el (erc-list-menu-mode-map): Move initialization | ||
| 4 | into declaration. | ||
| 5 | |||
| 1 | 2011-02-07 Julien Danjou <julien@danjou.info> | 6 | 2011-02-07 Julien Danjou <julien@danjou.info> |
| 2 | 7 | ||
| 3 | * erc-track.el (erc-window-configuration-change): New function. | 8 | * erc-track.el (erc-window-configuration-change): New function. |
diff --git a/lisp/erc/erc-list.el b/lisp/erc/erc-list.el index ae579dba3bd..b8eb5a4aa19 100644 --- a/lisp/erc/erc-list.el +++ b/lisp/erc/erc-list.el | |||
| @@ -117,6 +117,17 @@ | |||
| 117 | (sort-fields col (point-min) (point-max)) | 117 | (sort-fields col (point-min) (point-max)) |
| 118 | (sort-numeric-fields col (point-min) (point-max)))))) | 118 | (sort-numeric-fields col (point-min) (point-max)))))) |
| 119 | 119 | ||
| 120 | (defvar erc-list-menu-mode-map | ||
| 121 | (let ((map (make-keymap))) | ||
| 122 | (set-keymap-parent map special-mode-map) | ||
| 123 | (define-key map "k" 'erc-list-kill) | ||
| 124 | (define-key map "j" 'erc-list-join) | ||
| 125 | (define-key map "g" 'erc-list-revert) | ||
| 126 | (define-key map "n" 'next-line) | ||
| 127 | (define-key map "p" 'previous-line) | ||
| 128 | map) | ||
| 129 | "Local keymap for `erc-list-mode' buffers.") | ||
| 130 | |||
| 120 | (defvar erc-list-menu-sort-button-map | 131 | (defvar erc-list-menu-sort-button-map |
| 121 | (let ((map (make-sparse-keymap))) | 132 | (let ((map (make-sparse-keymap))) |
| 122 | (define-key map [header-line mouse-1] 'erc-list-menu-sort-by-column) | 133 | (define-key map [header-line mouse-1] 'erc-list-menu-sort-by-column) |
| @@ -146,12 +157,6 @@ | |||
| 146 | 157 | ||
| 147 | (put 'erc-list-menu-mode 'mode-class 'special) | 158 | (put 'erc-list-menu-mode 'mode-class 'special) |
| 148 | 159 | ||
| 149 | (define-key erc-list-menu-mode-map "k" 'erc-list-kill) | ||
| 150 | (define-key erc-list-menu-mode-map "j" 'erc-list-join) | ||
| 151 | (define-key erc-list-menu-mode-map "g" 'erc-list-revert) | ||
| 152 | (define-key erc-list-menu-mode-map "n" 'next-line) | ||
| 153 | (define-key erc-list-menu-mode-map "p" 'previous-line) | ||
| 154 | |||
| 155 | ;; Handle a "322" response. This response tells us about a single | 160 | ;; Handle a "322" response. This response tells us about a single |
| 156 | ;; channel. | 161 | ;; channel. |
| 157 | (defun erc-list-handle-322 (proc parsed) | 162 | (defun erc-list-handle-322 (proc parsed) |