Commit b016851c authored by Stefan Monnier's avatar Stefan Monnier
Browse files

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.
parent 1be1d1e9
2011-02-10 Stefan Monnier <monnier@iro.umontreal.ca>
Move keymap initialization into declaration.
* textmodes/enriched.el (enriched-mode-map):
* textmodes/bib-mode.el (bib-mode-map):
* term/lk201.el (lk201-function-map):
* tar-mode.el (tar-mode-map):
* replace.el (occur-mode-map):
* progmodes/idlwave.el (idlwave-rinfo-mouse-map, idlwave-rinfo-map):
* progmodes/idlw-help.el (idlwave-help-mode-map):
* progmodes/gdb-mi.el (gdb-memory-format-menu, gdb-memory-unit-menu):
* play/solitaire.el (solitaire-mode-map):
* play/snake.el (snake-mode-map, snake-null-map):
* play/pong.el (pong-mode-map):
* play/handwrite.el (menu-bar-handwrite-map):
* play/gametree.el (gametree-mode-map):
* net/rcirc.el (rcirc-mode-map, rcirc-browse-url-map
(rcirc-multiline-minor-mode-map, rcirc-track-minor-mode-map):
* net/newst-plainview.el (newsticker-menu, newsticker-mode-map)
(newsticker--url-keymap):
* net/net-utils.el (nslookup-mode-map, ftp-mode-map):
* 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):
* mail/rmailsum.el (rmail-summary-mode-map):
* kmacro.el (kmacro-step-edit-map):
* ibuffer.el (ibuffer-mode-groups-popup, ibuffer-mode-map)
(ibuffer-mode-operate-map):
* hi-lock.el (hi-lock-menu, hi-lock-map):
* emulation/vip.el (vip-mode-map):
* emacs-lisp/re-builder.el (reb-lisp-mode-map):
* bookmark.el (bookmark-bmenu-mode-map):
* help-mode.el (help-mode-map): Move initialization into declaration.
2011-02-10 Deniz Dogan <deniz.a.m.dogan@gmail.com>
 
* net/rcirc.el: Add PRIVMSG and CTCP functions.
......@@ -70,8 +111,7 @@
 
2011-02-07 Michael Albinus <michael.albinus@gmx.de>
 
* net/dbus.el (dbus-list-activatable-names): Add optional argument
BUS.
* net/dbus.el (dbus-list-activatable-names): Add optional argument BUS.
 
2011-02-07 Deniz Dogan <deniz.a.m.dogan@gmail.com>
 
......@@ -79,21 +119,21 @@
 
2011-02-06 Jay Belanger <jay.p.belanger@gmail.com>
 
* calc/calc.el (calc-logunits-field-reference) Renamed from
* calc/calc.el (calc-logunits-field-reference): Rename from
`calc-default-field-reference-level'.
(calc-logunits-power-reference): Renamed from
(calc-logunits-power-reference): Rename from
`calc-default-power-reference-level'
 
* calc/calc-units.el (math-logunits-quant): Renamed from
* calc/calc-units.el (math-logunits-quant): Rename from
`math-logunits-level'
(math-logunits-plus): Renamed from math-logcombine.
(math-logunits-plus): Rename from math-logcombine.
(calcFunc-luplus, calcFunc-luminus calc-luplus, calc-luminus): Remove.
(calcFunc-lufieldadd, calcFunc-lupoweradd, calcFunc-lufieldsub)
(calcFunc-lufieldsub,calc-logunits-add calc-logunits-sub):
New functions.
(calcFunc-fieldquant): Renamed from `calcFunc-fieldlevel'.
(calcFunc-powerquant): Renamed from `calcFunc-powerlevel'.
(calc-logunits-quantity): Renamed from `calc-level'.
(calcFunc-fieldquant): Rename from `calcFunc-fieldlevel'.
(calcFunc-powerquant): Rename from `calcFunc-powerlevel'.
(calc-logunits-quantity): Rename from `calc-level'.
(calcFunc-dbfieldlevel, calcFunc-dbpowerlevel, calcFunc-npfieldlevel)
(calcFunc-nppowerlevel,calc-logunits-dblevel, calc-logunits-nplevel)
(math-logunits-mul, calcFunc-lufieldmul, calcFunc-lupowermul)
......@@ -101,7 +141,7 @@
(calcFunc-lupowerdiv,calc-logunits-divide,math-logunits-level):
New functions.
 
* calc/calc-help.el (calc-u-prefix-help): Removed "L" reference.
* calc/calc-help.el (calc-u-prefix-help): Remove "L" reference.
(calc-ul-prefix-help): Remove.
(calc-l-prefix-help): New function.
(calc-full-help): Add reference to `calc-l-prefix-help'.
......
......@@ -1473,6 +1473,43 @@ method buffers use to resolve name collisions."
(defvar bookmark-bmenu-hidden-bookmarks ())
(defvar bookmark-bmenu-mode-map
(let ((map (make-keymap)))
(set-keymap-parent map special-mode-map)
(define-key map "v" 'bookmark-bmenu-select)
(define-key map "w" 'bookmark-bmenu-locate)
(define-key map "2" 'bookmark-bmenu-2-window)
(define-key map "1" 'bookmark-bmenu-1-window)
(define-key map "j" 'bookmark-bmenu-this-window)
(define-key map "\C-c\C-c" 'bookmark-bmenu-this-window)
(define-key map "f" 'bookmark-bmenu-this-window)
(define-key map "\C-m" 'bookmark-bmenu-this-window)
(define-key map "o" 'bookmark-bmenu-other-window)
(define-key map "\C-o" 'bookmark-bmenu-switch-other-window)
(define-key map "s" 'bookmark-bmenu-save)
(define-key map "k" 'bookmark-bmenu-delete)
(define-key map "\C-d" 'bookmark-bmenu-delete-backwards)
(define-key map "x" 'bookmark-bmenu-execute-deletions)
(define-key map "d" 'bookmark-bmenu-delete)
(define-key map " " 'next-line)
(define-key map "n" 'next-line)
(define-key map "p" 'previous-line)
(define-key map "\177" 'bookmark-bmenu-backup-unmark)
(define-key map "u" 'bookmark-bmenu-unmark)
(define-key map "m" 'bookmark-bmenu-mark)
(define-key map "l" 'bookmark-bmenu-load)
(define-key map "r" 'bookmark-bmenu-rename)
(define-key map "R" 'bookmark-bmenu-relocate)
(define-key map "t" 'bookmark-bmenu-toggle-filenames)
(define-key map "a" 'bookmark-bmenu-show-annotation)
(define-key map "A" 'bookmark-bmenu-show-all-annotations)
(define-key map "e" 'bookmark-bmenu-edit-annotation)
;; The original binding of M-g hides the M-g prefix map.
;; If someone has a better idea than M-g s, I'm open to suggestions.
(define-key map [?\M-g ?s] 'bookmark-bmenu-search)
(define-key map [mouse-2] 'bookmark-bmenu-other-window-with-mouse)
map))
;; Bookmark Buffer Menu mode is suitable only for specially formatted
;; data.
(put 'bookmark-bmenu-mode 'mode-class 'special)
......@@ -1583,39 +1620,6 @@ Bookmark names preceded by a \"*\" have annotations.
(setq truncate-lines t)
(setq buffer-read-only t))
(define-key bookmark-bmenu-mode-map "q" 'quit-window)
(define-key bookmark-bmenu-mode-map "v" 'bookmark-bmenu-select)
(define-key bookmark-bmenu-mode-map "w" 'bookmark-bmenu-locate)
(define-key bookmark-bmenu-mode-map "2" 'bookmark-bmenu-2-window)
(define-key bookmark-bmenu-mode-map "1" 'bookmark-bmenu-1-window)
(define-key bookmark-bmenu-mode-map "j" 'bookmark-bmenu-this-window)
(define-key bookmark-bmenu-mode-map "\C-c\C-c" 'bookmark-bmenu-this-window)
(define-key bookmark-bmenu-mode-map "f" 'bookmark-bmenu-this-window)
(define-key bookmark-bmenu-mode-map "\C-m" 'bookmark-bmenu-this-window)
(define-key bookmark-bmenu-mode-map "o" 'bookmark-bmenu-other-window)
(define-key bookmark-bmenu-mode-map "\C-o" 'bookmark-bmenu-switch-other-window)
(define-key bookmark-bmenu-mode-map "s" 'bookmark-bmenu-save)
(define-key bookmark-bmenu-mode-map "k" 'bookmark-bmenu-delete)
(define-key bookmark-bmenu-mode-map "\C-d" 'bookmark-bmenu-delete-backwards)
(define-key bookmark-bmenu-mode-map "x" 'bookmark-bmenu-execute-deletions)
(define-key bookmark-bmenu-mode-map "d" 'bookmark-bmenu-delete)
(define-key bookmark-bmenu-mode-map " " 'next-line)
(define-key bookmark-bmenu-mode-map "n" 'next-line)
(define-key bookmark-bmenu-mode-map "p" 'previous-line)
(define-key bookmark-bmenu-mode-map "\177" 'bookmark-bmenu-backup-unmark)
(define-key bookmark-bmenu-mode-map "?" 'describe-mode)
(define-key bookmark-bmenu-mode-map "u" 'bookmark-bmenu-unmark)
(define-key bookmark-bmenu-mode-map "m" 'bookmark-bmenu-mark)
(define-key bookmark-bmenu-mode-map "l" 'bookmark-bmenu-load)
(define-key bookmark-bmenu-mode-map "r" 'bookmark-bmenu-rename)
(define-key bookmark-bmenu-mode-map "R" 'bookmark-bmenu-relocate)
(define-key bookmark-bmenu-mode-map "t" 'bookmark-bmenu-toggle-filenames)
(define-key bookmark-bmenu-mode-map "a" 'bookmark-bmenu-show-annotation)
(define-key bookmark-bmenu-mode-map "A" 'bookmark-bmenu-show-all-annotations)
(define-key bookmark-bmenu-mode-map "e" 'bookmark-bmenu-edit-annotation)
;; The original binding of M-g hides the M-g prefix map.
;; If someone has a better idea than M-g s, I'm open to suggestions.
(define-key bookmark-bmenu-mode-map [?\M-g ?s] 'bookmark-bmenu-search)(define-key bookmark-bmenu-mode-map [mouse-2] 'bookmark-bmenu-other-window-with-mouse)
(defun bookmark-bmenu-toggle-filenames (&optional show)
"Toggle whether filenames are shown in the bookmark list.
......
......@@ -275,6 +275,13 @@ Except for Lisp syntax this is the same as `reb-regexp'.")
(set (make-local-variable 'blink-matching-paren) nil)
(reb-mode-common))
(defvar reb-lisp-mode-map
(let ((map (make-sparse-keymap)))
;; Use the same "\C-c" keymap as `reb-mode' and use font-locking from
;; `emacs-lisp-mode'
(define-key map "\C-c" (lookup-key reb-mode-map "\C-c"))
map))
(define-derived-mode reb-lisp-mode
emacs-lisp-mode "RE Builder Lisp"
"Major mode for interactively building symbolic Regular Expressions."
......@@ -283,11 +290,6 @@ Except for Lisp syntax this is the same as `reb-regexp'.")
(require 'rx))) ; require rx anyway
(reb-mode-common))
;; Use the same "\C-c" keymap as `reb-mode' and use font-locking from
;; `emacs-lisp-mode'
(define-key reb-lisp-mode-map "\C-c"
(lookup-key reb-mode-map "\C-c"))
(defvar reb-subexp-mode-map
(let ((m (make-keymap)))
(suppress-keymap m)
......
......@@ -164,132 +164,133 @@ If nil then it is bound to `delete-backward-char'."
;; key bindings
(defvar vip-mode-map (make-keymap))
(define-key vip-mode-map "\C-a" 'beginning-of-line)
(define-key vip-mode-map "\C-b" 'vip-scroll-back)
(define-key vip-mode-map "\C-c" 'vip-ctl-c)
(define-key vip-mode-map "\C-d" 'vip-scroll-up)
(define-key vip-mode-map "\C-e" 'vip-scroll-up-one)
(define-key vip-mode-map "\C-f" 'vip-scroll)
(define-key vip-mode-map "\C-g" 'vip-keyboard-quit)
(define-key vip-mode-map "\C-h" 'help-command)
(define-key vip-mode-map "\C-m" 'vip-scroll-back)
(define-key vip-mode-map "\C-n" 'vip-other-window)
(define-key vip-mode-map "\C-o" 'vip-open-line-at-point)
(define-key vip-mode-map "\C-u" 'vip-scroll-down)
(define-key vip-mode-map "\C-x" 'vip-ctl-x)
(define-key vip-mode-map "\C-y" 'vip-scroll-down-one)
(define-key vip-mode-map "\C-z" 'vip-change-mode-to-emacs)
(define-key vip-mode-map "\e" 'vip-ESC)
(define-key vip-mode-map " " 'vip-scroll)
(define-key vip-mode-map "!" 'vip-command-argument)
(define-key vip-mode-map "\"" 'vip-command-argument)
(define-key vip-mode-map "#" 'vip-command-argument)
(define-key vip-mode-map "$" 'vip-goto-eol)
(define-key vip-mode-map "%" 'vip-paren-match)
(define-key vip-mode-map "&" 'vip-nil)
(define-key vip-mode-map "'" 'vip-goto-mark-and-skip-white)
(define-key vip-mode-map "(" 'vip-backward-sentence)
(define-key vip-mode-map ")" 'vip-forward-sentence)
(define-key vip-mode-map "*" 'call-last-kbd-macro)
(define-key vip-mode-map "+" 'vip-next-line-at-bol)
(define-key vip-mode-map "," 'vip-repeat-find-opposite)
(define-key vip-mode-map "-" 'vip-previous-line-at-bol)
(define-key vip-mode-map "." 'vip-repeat)
(define-key vip-mode-map "/" 'vip-search-forward)
(define-key vip-mode-map "0" 'vip-beginning-of-line)
(define-key vip-mode-map "1" 'vip-digit-argument)
(define-key vip-mode-map "2" 'vip-digit-argument)
(define-key vip-mode-map "3" 'vip-digit-argument)
(define-key vip-mode-map "4" 'vip-digit-argument)
(define-key vip-mode-map "5" 'vip-digit-argument)
(define-key vip-mode-map "6" 'vip-digit-argument)
(define-key vip-mode-map "7" 'vip-digit-argument)
(define-key vip-mode-map "8" 'vip-digit-argument)
(define-key vip-mode-map "9" 'vip-digit-argument)
(define-key vip-mode-map ":" 'vip-ex)
(define-key vip-mode-map ";" 'vip-repeat-find)
(define-key vip-mode-map "<" 'vip-command-argument)
(define-key vip-mode-map "=" 'vip-command-argument)
(define-key vip-mode-map ">" 'vip-command-argument)
(define-key vip-mode-map "?" 'vip-search-backward)
(define-key vip-mode-map "@" 'vip-nil)
(define-key vip-mode-map "A" 'vip-Append)
(define-key vip-mode-map "B" 'vip-backward-Word)
(define-key vip-mode-map "C" 'vip-ctl-c-equivalent)
(define-key vip-mode-map "D" 'vip-kill-line)
(define-key vip-mode-map "E" 'vip-end-of-Word)
(define-key vip-mode-map "F" 'vip-find-char-backward)
(define-key vip-mode-map "G" 'vip-goto-line)
(define-key vip-mode-map "H" 'vip-window-top)
(define-key vip-mode-map "I" 'vip-Insert)
(define-key vip-mode-map "J" 'vip-join-lines)
(define-key vip-mode-map "K" 'vip-kill-buffer)
(define-key vip-mode-map "L" 'vip-window-bottom)
(define-key vip-mode-map "M" 'vip-window-middle)
(define-key vip-mode-map "N" 'vip-search-Next)
(define-key vip-mode-map "O" 'vip-Open-line)
(define-key vip-mode-map "P" 'vip-Put-back)
(define-key vip-mode-map "Q" 'vip-query-replace)
(define-key vip-mode-map "R" 'vip-replace-string)
(define-key vip-mode-map "S" 'vip-switch-to-buffer-other-window)
(define-key vip-mode-map "T" 'vip-goto-char-backward)
(define-key vip-mode-map "U" 'vip-nil)
(define-key vip-mode-map "V" 'vip-find-file-other-window)
(define-key vip-mode-map "W" 'vip-forward-Word)
(define-key vip-mode-map "X" 'vip-ctl-x-equivalent)
(define-key vip-mode-map "Y" 'vip-yank-line)
(define-key vip-mode-map "ZZ" 'save-buffers-kill-emacs)
(define-key vip-mode-map "[" 'vip-nil)
(define-key vip-mode-map "\\" 'vip-escape-to-emacs)
(define-key vip-mode-map "]" 'vip-nil)
(define-key vip-mode-map "^" 'vip-bol-and-skip-white)
(define-key vip-mode-map "_" 'vip-nil)
(define-key vip-mode-map "`" 'vip-goto-mark)
(define-key vip-mode-map "a" 'vip-append)
(define-key vip-mode-map "b" 'vip-backward-word)
(define-key vip-mode-map "c" 'vip-command-argument)
(define-key vip-mode-map "d" 'vip-command-argument)
(define-key vip-mode-map "e" 'vip-end-of-word)
(define-key vip-mode-map "f" 'vip-find-char-forward)
(define-key vip-mode-map "g" 'vip-info-on-file)
(define-key vip-mode-map "h" 'vip-backward-char)
(define-key vip-mode-map "i" 'vip-insert)
(define-key vip-mode-map "j" 'vip-next-line)
(define-key vip-mode-map "k" 'vip-previous-line)
(define-key vip-mode-map "l" 'vip-forward-char)
(define-key vip-mode-map "m" 'vip-mark-point)
(define-key vip-mode-map "n" 'vip-search-next)
(define-key vip-mode-map "o" 'vip-open-line)
(define-key vip-mode-map "p" 'vip-put-back)
(define-key vip-mode-map "q" 'vip-nil)
(define-key vip-mode-map "r" 'vip-replace-char)
(define-key vip-mode-map "s" 'vip-switch-to-buffer)
(define-key vip-mode-map "t" 'vip-goto-char-forward)
(define-key vip-mode-map "u" 'vip-undo)
(define-key vip-mode-map "v" 'vip-find-file)
(define-key vip-mode-map "w" 'vip-forward-word)
(define-key vip-mode-map "x" 'vip-delete-char)
(define-key vip-mode-map "y" 'vip-command-argument)
(define-key vip-mode-map "zH" 'vip-line-to-top)
(define-key vip-mode-map "zM" 'vip-line-to-middle)
(define-key vip-mode-map "zL" 'vip-line-to-bottom)
(define-key vip-mode-map "z\C-m" 'vip-line-to-top)
(define-key vip-mode-map "z." 'vip-line-to-middle)
(define-key vip-mode-map "z-" 'vip-line-to-bottom)
(define-key vip-mode-map "{" 'vip-backward-paragraph)
(define-key vip-mode-map "|" 'vip-goto-col)
(define-key vip-mode-map "}" 'vip-forward-paragraph)
(define-key vip-mode-map "~" 'vip-nil)
(define-key vip-mode-map "\177" 'vip-delete-backward-char)
(defvar vip-mode-map
(let ((map (make-keymap)))
(define-key map "\C-a" 'beginning-of-line)
(define-key map "\C-b" 'vip-scroll-back)
(define-key map "\C-c" 'vip-ctl-c)
(define-key map "\C-d" 'vip-scroll-up)
(define-key map "\C-e" 'vip-scroll-up-one)
(define-key map "\C-f" 'vip-scroll)
(define-key map "\C-g" 'vip-keyboard-quit)
(define-key map "\C-h" 'help-command)
(define-key map "\C-m" 'vip-scroll-back)
(define-key map "\C-n" 'vip-other-window)
(define-key map "\C-o" 'vip-open-line-at-point)
(define-key map "\C-u" 'vip-scroll-down)
(define-key map "\C-x" 'vip-ctl-x)
(define-key map "\C-y" 'vip-scroll-down-one)
(define-key map "\C-z" 'vip-change-mode-to-emacs)
(define-key map "\e" 'vip-ESC)
(define-key map " " 'vip-scroll)
(define-key map "!" 'vip-command-argument)
(define-key map "\"" 'vip-command-argument)
(define-key map "#" 'vip-command-argument)
(define-key map "$" 'vip-goto-eol)
(define-key map "%" 'vip-paren-match)
(define-key map "&" 'vip-nil)
(define-key map "'" 'vip-goto-mark-and-skip-white)
(define-key map "(" 'vip-backward-sentence)
(define-key map ")" 'vip-forward-sentence)
(define-key map "*" 'call-last-kbd-macro)
(define-key map "+" 'vip-next-line-at-bol)
(define-key map "," 'vip-repeat-find-opposite)
(define-key map "-" 'vip-previous-line-at-bol)
(define-key map "." 'vip-repeat)
(define-key map "/" 'vip-search-forward)
(define-key map "0" 'vip-beginning-of-line)
(define-key map "1" 'vip-digit-argument)
(define-key map "2" 'vip-digit-argument)
(define-key map "3" 'vip-digit-argument)
(define-key map "4" 'vip-digit-argument)
(define-key map "5" 'vip-digit-argument)
(define-key map "6" 'vip-digit-argument)
(define-key map "7" 'vip-digit-argument)
(define-key map "8" 'vip-digit-argument)
(define-key map "9" 'vip-digit-argument)
(define-key map ":" 'vip-ex)
(define-key map ";" 'vip-repeat-find)
(define-key map "<" 'vip-command-argument)
(define-key map "=" 'vip-command-argument)
(define-key map ">" 'vip-command-argument)
(define-key map "?" 'vip-search-backward)
(define-key map "@" 'vip-nil)
(define-key map "A" 'vip-Append)
(define-key map "B" 'vip-backward-Word)
(define-key map "C" 'vip-ctl-c-equivalent)
(define-key map "D" 'vip-kill-line)
(define-key map "E" 'vip-end-of-Word)
(define-key map "F" 'vip-find-char-backward)
(define-key map "G" 'vip-goto-line)
(define-key map "H" 'vip-window-top)
(define-key map "I" 'vip-Insert)
(define-key map "J" 'vip-join-lines)
(define-key map "K" 'vip-kill-buffer)
(define-key map "L" 'vip-window-bottom)
(define-key map "M" 'vip-window-middle)
(define-key map "N" 'vip-search-Next)
(define-key map "O" 'vip-Open-line)
(define-key map "P" 'vip-Put-back)
(define-key map "Q" 'vip-query-replace)
(define-key map "R" 'vip-replace-string)
(define-key map "S" 'vip-switch-to-buffer-other-window)
(define-key map "T" 'vip-goto-char-backward)
(define-key map "U" 'vip-nil)
(define-key map "V" 'vip-find-file-other-window)
(define-key map "W" 'vip-forward-Word)
(define-key map "X" 'vip-ctl-x-equivalent)
(define-key map "Y" 'vip-yank-line)
(define-key map "ZZ" 'save-buffers-kill-emacs)
(define-key map "[" 'vip-nil)
(define-key map "\\" 'vip-escape-to-emacs)
(define-key map "]" 'vip-nil)
(define-key map "^" 'vip-bol-and-skip-white)
(define-key map "_" 'vip-nil)
(define-key map "`" 'vip-goto-mark)
(define-key map "a" 'vip-append)
(define-key map "b" 'vip-backward-word)
(define-key map "c" 'vip-command-argument)
(define-key map "d" 'vip-command-argument)
(define-key map "e" 'vip-end-of-word)
(define-key map "f" 'vip-find-char-forward)
(define-key map "g" 'vip-info-on-file)
(define-key map "h" 'vip-backward-char)
(define-key map "i" 'vip-insert)
(define-key map "j" 'vip-next-line)
(define-key map "k" 'vip-previous-line)
(define-key map "l" 'vip-forward-char)
(define-key map "m" 'vip-mark-point)
(define-key map "n" 'vip-search-next)
(define-key map "o" 'vip-open-line)
(define-key map "p" 'vip-put-back)
(define-key map "q" 'vip-nil)
(define-key map "r" 'vip-replace-char)
(define-key map "s" 'vip-switch-to-buffer)
(define-key map "t" 'vip-goto-char-forward)
(define-key map "u" 'vip-undo)
(define-key map "v" 'vip-find-file)
(define-key map "w" 'vip-forward-word)
(define-key map "x" 'vip-delete-char)
(define-key map "y" 'vip-command-argument)
(define-key map "zH" 'vip-line-to-top)
(define-key map "zM" 'vip-line-to-middle)
(define-key map "zL" 'vip-line-to-bottom)
(define-key map "z\C-m" 'vip-line-to-top)
(define-key map "z." 'vip-line-to-middle)
(define-key map "z-" 'vip-line-to-bottom)
(define-key map "{" 'vip-backward-paragraph)
(define-key map "|" 'vip-goto-col)
(define-key map "}" 'vip-forward-paragraph)
(define-key map "~" 'vip-nil)
(define-key map "\177" 'vip-delete-backward-char)
map))
(defun vip-version ()
(interactive)
......
2011-02-10 Stefan Monnier <monnier@iro.umontreal.ca>
* erc-list.el (erc-list-menu-mode-map): Move initialization
into declaration.
2011-02-07 Julien Danjou <julien@danjou.info>
* erc-track.el (erc-window-configuration-change): New function.
......
......@@ -117,6 +117,17 @@
(sort-fields col (point-min) (point-max))
(sort-numeric-fields col (point-min) (point-max))))))
(defvar erc-list-menu-mode-map
(let ((map (make-keymap)))
(set-keymap-parent map special-mode-map)
(define-key map "k" 'erc-list-kill)
(define-key map "j" 'erc-list-join)
(define-key map "g" 'erc-list-revert)
(define-key map "n" 'next-line)
(define-key map "p" 'previous-line)
map)
"Local keymap for `erc-list-mode' buffers.")
(defvar erc-list-menu-sort-button-map
(let ((map (make-sparse-keymap)))
(define-key map [header-line mouse-1] 'erc-list-menu-sort-by-column)
......@@ -146,12 +157,6 @@
(put 'erc-list-menu-mode 'mode-class 'special)
(define-key erc-list-menu-mode-map "k" 'erc-list-kill)
(define-key erc-list-menu-mode-map "j" 'erc-list-join)
(define-key erc-list-menu-mode-map "g" 'erc-list-revert)
(define-key erc-list-menu-mode-map "n" 'next-line)
(define-key erc-list-menu-mode-map "p" 'previous-line)
;; Handle a "322" response. This response tells us about a single
;; channel.
(defun erc-list-handle-322 (proc parsed)
......
......@@ -33,18 +33,19 @@
(require 'view)
(eval-when-compile (require 'easymenu))
(defvar help-mode-map (make-sparse-keymap)
(defvar help-mode-map
(let ((map (make-sparse-keymap)))
(set-keymap-parent map button-buffer-map)
(define-key map [mouse-2] 'help-follow-mouse)
(define-key map "\C-c\C-b" 'help-go-back)
(define-key map "\C-c\C-f" 'help-go-forward)
(define-key map "\C-c\C-c" 'help-follow-symbol)
;; Documentation only, since we use minor-mode-overriding-map-alist.
(define-key map "\r" 'help-follow)
map)
"Keymap for help mode.")
(set-keymap-parent help-mode-map button-buffer-map)
(define-key help-mode-map [mouse-2] 'help-follow-mouse)
(define-key help-mode-map "\C-c\C-b" 'help-go-back)
(define-key help-mode-map "\C-c\C-f" 'help-go-forward)
(define-key help-mode-map "\C-c\C-c" 'help-follow-symbol)
;; Documentation only, since we use minor-mode-overriding-map-alist.
(define-key help-mode-map "\r" 'help-follow)
(easy-menu-define help-mode-menu help-mode-map
"Menu for Help Mode."
'("Help-Mode"
......
......@@ -238,45 +238,47 @@ a library is being loaded.")
(make-variable-buffer-local 'hi-lock-file-patterns)
(put 'hi-lock-file-patterns 'permanent-local t)
(defvar hi-lock-menu (make-sparse-keymap "Hi Lock")
(defvar hi-lock-menu
(let ((map (make-sparse-keymap "Hi Lock")))
(define-key-after map [highlight-regexp]
'(menu-item "Highlight Regexp..." highlight-regexp
:help "Highlight text matching PATTERN (a regexp)."))
(define-key-after map [highlight-phrase]
'(menu-item "Highlight Phrase..." highlight-phrase
:help "Highlight text matching PATTERN (a regexp processed to match phrases)."))
(define-key-after map [highlight-lines-matching-regexp]
'(menu-item "Highlight Lines..." highlight-lines-matching-regexp
:help "Highlight lines containing match of PATTERN (a regexp)."))
(define-key-after map [unhighlight-regexp]
'(menu-item "Remove Highlighting..." unhighlight-regexp
:help "Remove previously entered highlighting pattern."
:enable hi-lock-interactive-patterns))
(define-key-after map [hi-lock-write-interactive-patterns]
'(menu-item "Patterns to Buffer" hi-lock-write-interactive-patterns
:help "Insert interactively added REGEXPs into buffer at point."
:enable hi-lock-interactive-patterns))
(define-key-after map [hi-lock-find-patterns]
'(menu-item "Patterns from Buffer" hi-lock-find-patterns
:help "Use patterns (if any) near top of buffer."))
map)
"Menu for hi-lock mode.")
(define-key-after hi-lock-menu [highlight-regexp]
'(menu-item "Highlight Regexp..." highlight-regexp
:help "Highlight text matching PATTERN (a regexp)."))
(define-key-after hi-lock-menu [highlight-phrase]
'(menu-item "Highlight Phrase..." highlight-phrase
:help "Highlight text matching PATTERN (a regexp processed to match phrases)."))
(define-key-after hi-lock-menu [highlight-lines-matching-regexp]
'(menu-item "Highlight Lines..." highlight-lines-matching-regexp
:help "Highlight lines containing match of PATTERN (a regexp)."))
(define-key-after hi-lock-menu [unhighlight-regexp]
'(menu-item "Remove Highlighting..." unhighlight-regexp
:help "Remove previously entered highlighting pattern."
:enable hi-lock-interactive-patterns))
(define-key-after hi-lock-menu [hi-lock-write-interactive-patterns]
'(menu-item "Patterns to Buffer" hi-lock-write-interactive-patterns
:help "Insert interactively added REGEXPs into buffer at point."
:enable hi-lock-interactive-patterns))
(define-key-after hi-lock-menu [hi-lock-find-patterns]
'(menu-item "Patterns from Buffer" hi-lock-find-patterns
:help "Use patterns (if any) near top of buffer."))
(defvar hi-lock-map (make-sparse-keymap "Hi Lock")
(defvar hi-lock-map
(let ((map (make-sparse-keymap "Hi Lock")))
(define-key map "\C-xwi" 'hi-lock-find-patterns)
(define-key map "\C-xwl" 'highlight-lines-matching-regexp)
(define-key map "\C-xwp" 'highlight-phrase)
(define-key map "\C-xwh" 'highlight-regexp)
(define-key map "\C-xwr" 'unhighlight-regexp)
(define-key map "\C-xwb" 'hi-lock-write-interactive-patterns)
map)
"Key map for hi-lock.")