aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/replace.el (follow)
Commit message (Collapse)AuthorAgeFilesLines
* * lisp/replace.el (how-many): Fix rstart and !rend case.Oleh Krehel2013-10-121-3/+6
| | | | Fixes: debbugs:15589
* * lisp/replace.el (replace-string): Doc fix re start/end.Glenn Morris2013-09-051-4/+5
| | | | Fixes: debbugs:15275
* Revert introduction of isearch-filter-predicates.Stefan Monnier2013-08-051-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rely on add-function instead. * lisp/loadup.el: Preload nadvice. * lisp/isearch.el (isearch-filter-predicates): Rename it back to isearch-filter-predicate. (isearch-message-prefix): Use advice-function-mapc and advice properties to get the isearch-message-prefix. (isearch-search, isearch-lazy-highlight-search): Revert to funcall instead of run-hook-with-args-until-failure. (isearch-filter-visible): Not obsolete any more. * lisp/replace.el (perform-replace): Revert to funcall instead of run-hook-with-args-until-failure. * lisp/wdired.el (wdired-change-to-wdired-mode): Use add-function. * lisp/dired-aux.el (dired-isearch-filenames-mode): Rename from dired-isearch-filenames-toggle; make it into a proper minor mode. Use add/remove-function. (dired-isearch-filenames-setup, dired-isearch-filenames-end): Call the minor-mode rather than add/remove-hook. (dired-isearch-filter-filenames): Remove isearch-message-prefix property. * lisp/info.el (Info--search-loop): New function, extracted from Info-search. Funcall isearch-filter-predicate instead of run-hook-with-args-until-failure isearch-filter-predicates. (Info-search): Use it. (Info-mode): Use isearch-filter-predicate instead of isearch-filter-predicates. * src/lisp.mk (lisp): Add nadvice.elc. * lib-src/makefile.w32-in (lisp2): Add nadvice.elc. Fixes: debbugs:14714
* * lisp/isearch.el (isearch-query-replace): Add " symbol" and otherJuri Linkov2013-06-141-1/+4
| | | | | | | | | possible search modes from `isearch-message-prefix' to the prompt. (isearch-occur): Use `with-isearch-suspended' to not exit Isearch when reading a regexp to collect. * lisp/replace.el (perform-replace): Display "symbol " and other search modes from `isearch-message-prefix' in the *Help* buffer.
* Fix typos.Juanma Barranquero2013-06-111-4/+4
| | | | | | | | | * lisp/replace.el (query-replace, occur-read-regexp-defaults-function) (replace-search): * lisp/subr.el (declare-function, number-sequence, local-set-key) (substitute-key-definition, locate-user-emacs-file) (with-silent-modifications, split-string, eval-after-load): Fix typos, remove unneeded backslashes and reflow some docstrings.
* * lisp/replace.el (perform-replace): Avoid `isearch-range-invisible'Juri Linkov2013-05-311-0/+3
| | | | | | call when `query-flag' is nil and `search-invisible' is non-nil. Fixes: debbugs:11746
* * lisp/replace.el (occur-engine): Rename `globalcount' to `global-lines'Juri Linkov2013-05-301-31/+45
| | | | | | | | | | | | | | for total count of matching lines. Add `global-matches' for total count of matches. Rename `matches' to `lines' for count of matching lines. Add `matches' for count of matches. Rename `lines' to `curr-line' for line count. Rename `prev-lines' to `prev-line' for line number of prev match endpt. Increment `matches' for every match. Print the number of matching lines in the header. (occur-context-lines): Rename `lines' to `curr-line'. Rename `prev-lines' to `prev-line'. Fixes: debbugs:14017
* * lisp/replace.el (perform-replace): Add `skip-read-only-count',Juri Linkov2013-05-301-17/+62
| | | | | | | | | | `skip-filtered-count', `skip-invisible-count' let-bound to 0. Increment them for corresponding conditions and report the number of skipped occurrences in the final message. (query-replace, query-replace-regexp, query-replace-regexp-eval) (replace-string, replace-regexp): Doc fix. Fixes: debbugs:11746
* * lisp/replace.el (replace-search): New function with code moved outJuri Linkov2013-05-281-90/+96
| | | | | | | | from `perform-replace'. (replace-highlight, replace-dehighlight): Move function definitions up closer to `replace-search'. Fixes: debbugs:11746
* * lisp/replace.el (perform-replace): Ignore invisible matches.Juri Linkov2013-05-281-5/+15
| | | | | | | | | | In addition to checking `query-replace-skip-read-only', also filter out matches by calling `run-hook-with-args-until-failure' on `isearch-filter-predicates', and also check `search-invisible' for t or call `isearch-range-invisible'. (replace-dehighlight): Call `isearch-clean-overlays'. Fixes: debbugs:11746
* * lisp/replace.el (list-matching-lines-prefix-face): New defcustom.Juri Linkov2013-03-241-12/+32
| | | | | | | | | | | | | (occur-1): Pass `list-matching-lines-prefix-face' to the function `occur-engine' if `face-differs-from-default-p' returns t. (occur-engine): Add `,' inside backquote construct to evaluate `prefix-face'. Propertize the prefix with the `prefix-face' face. Pass `prefix-face' to the functions `occur-context-lines' and `occur-engine-add-prefix'. (occur-engine-add-prefix, occur-context-lines): Add optional arg `prefix-face' and propertize the prefix with `prefix-face'. Fixes: debbugs:14017
* Provide for customizing default regexp in occur commands (Bug#13892).Jambunathan K2013-03-101-1/+21
| | | | | | * lisp/replace.el (occur-read-regexp-defaults-function): New var. (occur-read-regexp-defaults): New defun. (occur-read-primary-args): Propagate above change.
* Provide for customizing default regexp in hi-lock commands (Bug#13892).Jambunathan K2013-03-081-9/+1
| | | | | | | | | | | * lisp/hi-lock.el (hi-lock-read-regexp-defaults-function): New var. (hi-lock-read-regexp-defaults): New defun. (hi-lock-line-face-buffer, hi-lock-face-buffer) (hi-lock-face-phrase-buffer): Propagate above change. Update docstring. * lisp/subr.el (find-tag-default-as-regexp): New defun. * lisp/replace.el (read-regexp): Propagate above change.
* * lisp/replace.el (read-regexp): Let-bind `default' to the firstJuri Linkov2013-02-251-26/+33
| | | | | | | | element of `defaults' if it's a list, otherwise it should be a string or nil. Let-bind `suggestions' to `defaults' if it's a list, otherwise make a list with the string value. Doc fix. Fixes: debbugs:13805
* Merge from emacs-24; up to 2012-12-22T02:59:08Z!cyd@gnu.orgGlenn Morris2013-02-221-0/+1
|\
| * * lisp/isearch.el (isearch-lazy-highlight-new-loop):Juri Linkov2013-02-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Set `isearch-lazy-highlight-start' and `isearch-lazy-highlight-end' to `isearch-other-end' if it is not nil. * lisp/replace.el (replace-highlight): Let-bind `isearch-other-end' to `match-beg'. * lisp/textmodes/ispell.el (ispell-highlight-spelling-error-overlay): Let-bind `isearch-other-end' to `start', `isearch-forward' to t and `isearch-error' to nil. Fixes: debbugs:13402
* | (read-regexp): Add regexp for symbol at point to the defaults (Bug#13687).Jambunathan K2013-02-161-9/+14
|/ | | | | | * lisp/replace.el (read-regexp): Tighten the regexp that matches tag. When tag is retrieved with `find-tag-default', use regexp that matches tag at point. Also update docstring.
* * lisp/replace.el (perform-replace): Move let-bindings of isearch-*Juri Linkov2013-02-021-46/+56
| | | | | | | | | | | | variables deeper to the loop that searches for the next match. Add bindings for `isearch-nonincremental' and `isearch-adjusted'. Use `isearch-search-fun-default' instead of `isearch-search-fun'. * lisp/isearch.el (isearch-search-fun-default): Check for null first element of isearch-cmds as a precaution when it's used with inactive isearch. Fixes: debbugs:13579
* Update copyright notices for 2013.Paul Eggert2013-01-011-2/+2
|
* * doc/emacs/search.texi (Query Replace): Document multi-buffer replacement ↵Juri Linkov2012-10-171-2/+6
| | | | | | | | | | | | keys. * doc/emacs/maintaining.texi (Tags Search): Change link "Replace" to "Query Replace". * lisp/replace.el (query-replace-help): Mention multi-buffer replacement keys in the Help message. Fixes: debbugs:12655
* * lisp/replace.el (query-replace-interactive): Declare obsolete.Juri Linkov2012-10-041-23/+30
| | | | | | | | | | | | (query-replace-read-from): Add the last incremental search string to the list of default values accessible via M-n. (map-query-replace-regexp): Use `read-regexp'. (query-replace, query-replace-regexp, query-replace-regexp-eval) (map-query-replace-regexp, replace-string, replace-regexp): Fix docstrings to replace mentions of `query-replace-interactive' with alternatives. Fixes: debbugs:12526
* Use declare forms, where possible, to mark obsolete functions.Chong Yidong2012-09-251-24/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/allout.el (allout-passphrase-hint-string): Likewise. (allout-init): Use a declare form to mark obsolete. * lisp/calendar/calendar.el (calendar-version): * lisp/calendar/icalendar.el (icalendar-extract-ical-from-buffer) (icalendar-convert-diary-to-ical): * lisp/cus-edit.el (custom-mode): * lisp/ansi-color.el (ansi-color-unfontify-region): * lisp/international/latin1-disp.el (latin1-char-displayable-p): * lisp/progmodes/cwarn.el (turn-on-cwarn-mode): * lisp/progmodes/which-func.el (which-func-update-1): Use define-obsolete-function-alias. * lisp/bookmark.el (bookmark-jump-noselect): Use a declare form to mark this function obsolete. * lisp/calendar/cal-x.el (calendar-two-frame-setup) (calendar-only-one-frame-setup, calendar-one-frame-setup): * lisp/calendar/calendar.el (american-calendar, european-calendar) (calendar-for-loop): * lisp/comint.el (comint-dynamic-simple-complete) (comint-dynamic-complete-as-filename, comint-unquote-filename): * lisp/desktop.el (desktop-load-default): * lisp/dired-x.el (dired-omit-here-always) (dired-hack-local-variables, dired-default-directory): * lisp/emacs-lisp/derived.el (derived-mode-class): * lisp/emacs-lisp/timer.el (timer-set-time-with-usecs): * lisp/emacs-lock.el (toggle-emacs-lock): * lisp/epa.el (epa-display-verify-result): * lisp/epg.el (epg-sign-keys, epg-start-sign-keys) (epg-passphrase-callback-function): * lisp/eshell/esh-util.el (eshell-for): * lisp/eshell/eshell.el (eshell-remove-from-window-buffer-names) (eshell-add-to-window-buffer-names): * lisp/files.el (locate-file-completion): * lisp/imenu.el (imenu-example--create-c-index) (imenu-example--create-lisp-index) (imenu-example--lisp-extract-index-name) (imenu-example--name-and-position): * lisp/international/mule-cmds.el (princ-list): * lisp/international/mule-diag.el (decode-codepage-char): * lisp/international/mule-util.el (detect-coding-with-priority): * lisp/iswitchb.el (iswitchb-read-buffer): * lisp/mail/mailalias.el (mail-complete): * lisp/mail/sendmail.el (mail-sent-via): * lisp/mouse.el (mouse-popup-menubar-stuff, mouse-popup-menubar) (mouse-major-mode-menu): * lisp/password-cache.el (password-read-and-add): * lisp/pcomplete.el (pcomplete-parse-comint-arguments): * lisp/progmodes/sh-script.el (sh-maybe-here-document): * lisp/replace.el (query-replace-regexp-eval): * lisp/savehist.el (savehist-load): * lisp/simple.el (choose-completion-delete-max-match): * lisp/term.el (term-dynamic-simple-complete): * lisp/vc/ediff-init.el (ediff-check-version): * lisp/vc/ediff-wind.el (ediff-choose-window-setup-function-automatically): * lisp/vc/vc.el (vc-diff-switches-list): * lisp/view.el (view-return-to-alist-update): Likewise. * lisp/iswitchb.el (iswitchb-read-buffer): Move code of iswitchb-define-mode-map here, and delete that obsolete function. * lisp/subr.el (eval-next-after-load, makehash, insert-string) (assoc-ignore-representation, assoc-ignore-case): Use declare to mark obsolete. (mode-line-inverse-video): Variable deleted. * lisp/emacs-lisp/byte-run.el (make-obsolete): Doc fix; emphasize that this applies to functions. * lisp/erc/erc.el (erc-send-command): Use define-obsolete-function-alias. * lisp/international/mule-util.el (string-to-sequence): Remove. * lisp/net/newst-backend.el (newsticker-cache-filename): * lisp/net/newst-treeview.el (newsticker-groups-filename): Fix incorrect obsolescence declaration. * lisp/net/snmp-mode.el (snmp-font-lock-keywords-3): Don't use obsolete font-lock-reference-face. * lisp/url/url-parse.el (url-recreate-url-attributes): * lisp/url/url-util.el (url-generate-unique-filename): Use declare to mark obsolete. * src/xdisp.c (mode_line_inverse_video): Delete obsolete variable.
* * lisp/replace.el (query-replace-read-from): Use `read-regexp' insteadJuri Linkov2012-09-211-17/+14
| | | | | | | | | | | | | | | | of `read-from-minibuffer' when `regexp-flag' is non-nil. (occur-read-primary-args): Use `read-regexp' instead of `read-string'. (multi-occur-in-matching-buffers): Use `read-regexp' instead of `read-from-minibuffer'. * lisp/isearch.el (isearch-occur): Use `read-regexp' instead of `read-string'. * lisp/dired.el (dired-read-regexp): Use `read-regexp' instead of `read-from-minibuffer'. * lisp/progmodes/grep.el (grep-read-regexp): Use `read-regexp' instead of `read-string'. Fixes: debbugs:7567
* * lisp/replace.el (read-regexp): Rename DEFAULT-VALUE arg to DEFAULTSJuri Linkov2012-09-211-21/+25
| | | | | | | and allow accepting a list of strings prepended to a list of standard default values. Doc fix. Fixes: debbugs:12321
* * lisp/replace.el (read-regexp): Add HISTORY arg.Juri Linkov2012-09-211-4/+7
| | | | Fixes: debbugs:7567
* * lisp/replace.el (read-regexp): Don't add ": " when PROMPT alreadyJuri Linkov2012-09-211-11/+13
| | | | | | ends with a colon and space. Fixes: debbugs:12321
* * lisp/replace.el (replace-regexp-lax-whitespace): New defcustom.Juri Linkov2012-09-101-8/+16
| | | | | | | | | | | | | | | (replace-lax-whitespace, query-replace-regexp) (query-replace-regexp-eval, replace-regexp): Doc fix. (perform-replace, replace-highlight): Let-bind isearch-lax-whitespace to replace-lax-whitespace and isearch-regexp-lax-whitespace to replace-regexp-lax-whitespace. * lisp/isearch.el (isearch-query-replace): Let-bind replace-lax-whitespace to isearch-lax-whitespace and replace-regexp-lax-whitespace to isearch-regexp-lax-whitespace. Fixes: debbugs:10885
* Allow scrolling in y-or-n-p.Chong Yidong2012-09-091-4/+18
| | | | | | | | | | | | | | | | | | | | | | | * lisp/replace.el (query-replace-map): Bind four new symbols for requesting window scrolling. * lisp/subr.el (y-or-n-p): Handle the window-scrolling bindings in query-replace-map. * lisp/custom.el (custom-theme-load-confirm): Use y-or-n-p. * lisp/window.el (scroll-other-window-down): Make the arg optional. * lisp/emacs-lisp/map-ynp.el (map-y-or-n-p): Don't bind scrolling keys since they are now in query-replace-map. * doc/lispref/minibuf.texi (Yes-or-No Queries): Document recentering and scrolling in y-or-n-p. Remove gratuitous example. * doc/lispref/searching.texi (Search and Replace): Document window scrolling entries in query-replace-map. Fixes: debbugs:8948
* * lisp/replace.el (replace-lax-whitespace): New defcustom.Juri Linkov2012-09-061-1/+36
| | | | | | | | | | | | | | | | | | | (query-replace, query-replace-regexp, query-replace-regexp-eval) (replace-string, replace-regexp): Mention it in docstrings. (perform-replace, replace-highlight): Let-bind isearch-lax-whitespace and isearch-regexp-lax-whitespace according to the values of replace-lax-whitespace and regexp-flag. Don't let-bind search-whitespace-regexp. * lisp/isearch.el (isearch-query-replace): Let-bind replace-lax-whitespace instead of let-binding replace-search-function and replace-re-search-function. (isearch-lazy-highlight-search): Let-bind isearch-lax-whitespace and isearch-regexp-lax-whitespace to lazy-highlight variables. (isearch-toggle-symbol): Set isearch-regexp to nil in isearch-word mode (like in isearch-toggle-word). Fixes: debbugs:10885
* Use `isearch-search-fun' in `perform-replace' (bug#10885, bug#10887).Juri Linkov2012-09-061-25/+18
| | | | | | | | | | | | | * lisp/replace.el (replace-search-function) (replace-re-search-function): Set default values to nil. (perform-replace): Let-bind isearch-related variables based on replace-related values, call `isearch-search-fun' and let-bind the result to `search-function'. Remove code that sets `search-function' and `search-string' separately for `delimited-flag'. (replace-highlight): Add new argument `delimited-flag' and rename other arguments to the names used in `perform-replace'. Let-bind `isearch-word' to the argument `delimited-flag'.
* Add inhibit-switch-frame parameter for display-buffer, and use it in occur-edit.Chong Yidong2012-08-061-1/+3
| | | | | | | | | | | | | | * replace.el (occur-after-change-function): Avoid losing focus by using the inhibit-switch-frame display action option. * window.el (window--maybe-raise-frame): New function. (window--display-buffer): Split off from here. (display-buffer-reuse-window, display-buffer-pop-up-frame) (display-buffer-pop-up-window, display-buffer-use-some-window): Obey an inhibit-switch-frame action alist entry. (display-buffer): Update doc. Fixes: debbugs:12139
* Fix typo in docstring. Bug #12122.Bastien Guerry2012-08-021-2/+2
|
* Get rid of all the manual purecopy calls in menu-bar definitions.Stefan Monnier2012-06-271-41/+40
| | | | | | | | | | | | * lisp/loadup.el (purify-flag): Pre-grow the hash-table to reduce the memory use. * lisp/bindings.el (bindings--define-key): New function. * lisp/vc/vc-hooks.el, lisp/replace.el, lisp/menu-bar.el: * lisp/international/mule-cmds.el, lisp/emacs-lisp/lisp-mode.el: * lisp/buff-menu.el, lisp/bookmark.el: * bindings.el: Use it to purecopy define-key bindings. * src/fns.c (maybe_resize_hash_table): Output message when growing the purify-hashtable.
* Doc and lispref updates related to searchingGlenn Morris2012-03-281-2/+2
| | | | | | | | | | | | | | * doc/lispref/searching.texi (Regexp Functions, Regexp Search): (Simple Match Data, Saving Match Data, Standard Regexps): Copyedits. (Regexp Functions): Mention regexp-opt is not guaranteed. Mention regexp-opt-charset. (Regexp Search): Recommend against looking-back. (Search and Replace): Use Texinfo recommended quote convention. Add more query-replace-map items. List multi-query-replace-map items. * lisp/replace.el (query-replace-map): Doc fix. * admin/FOR-RELEASE: Related markup.
* * lisp/replace.el (replace-highlight): Set isearch-word to nil unconditionally.Juri Linkov2012-03-111-3/+3
| | | | Fixes: debbugs:10887
* * lisp/replace.el (occur-menu-map): Add menu item for `occur-edit-mode'.Juri Linkov2012-02-231-0/+3
|
* Add 2012 to FSF copyright years for Emacs filesGlenn Morris2012-01-051-1/+1
|
* Spelling fixes.Paul Eggert2011-11-261-1/+1
|
* Spelling fixes.Paul Eggert2011-11-191-1/+1
|
* Fixes for Occur Edit mode.Leo Liu2011-09-191-3/+3
| | | | | * replace.el (occur-revert-arguments): Make it permanent-local. (occur-mode): Don't call font-lock-defontify.
* * lisp/replace.el (occur-mode-map): Rebind occur-edit-mode to "e".Chong Yidong2011-09-171-35/+52
| | | | | | | | | | | | (occur-edit-mode-map): Bind C-c C-c to occur-cease-edit and C-o to occur-mode-display-occurrence. (occur-edit-mode): Add usage message. (occur-cease-edit): New command. (occur-after-change-function): Use text properties to find the position of the prefix text. (occur-engine): Set stickiness of prefix text properties. Fixes: debbugs:8463
* * replace.el (occur-mode-goto-occurrence): Don't force using other window.Chong Yidong2011-09-141-1/+1
| | | | Fixes: debbugs:9499
* Fix various uses of display-buffer and pop-to-bufferChong Yidong2011-09-101-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to avoid using special-display-* and same-window-* variables. * lisp/buff-menu.el (Buffer-menu-switch-other-window): Use second arg of display-buffer. (Buffer-menu-2-window): Use switch-to-buffer-other-window. * lisp/replace.el (occur-mode-goto-occurrence) (occur-mode-display-occurrence) Use second arg of pop-to-buffer and display-buffer. * lisp/window.el (display-buffer-alist): Add *Python*. * lisp/mail/reporter.el (reporter-submit-bug-report): Use second arg of display-buffer. * lisp/mail/sendmail.el (sendmail-user-agent-compose): Don't bind the special-display and same-window variables. (mail-other-window): Use switch-to-buffer-other-window. (mail-other-frame): USe switch-to-buffer-other-frame. * lisp/progmodes/gdb-mi.el (gdb-frame-gdb-buffer): Use display-buffer-other-frame. (gdb-display-gdb-buffer): Use pop-to-buffer. * lisp/progmodes/gud.el (gud-goto-info): Use info-other-window. * lisp/progmodes/python.el: Don't set same-window-buffer-names. * lisp/textmodes/bibtex.el (bibtex-search-entry): Use switch-to-buffer.
* * replace.el (multi-occur): MentionLars Magne Ingebrigtsen2011-07-021-1/+2
| | | | | | `multi-occur-in-matching-buffers' in the doc string. Fixes: debbugs:7566
* New major mode: Occur Edit mode.Leo Liu2011-05-281-22/+86
| | | | | | | | * lisp/replace.el (occur-menu-map, occur-edit-mode-map): New vars. (occur-mode-map): Bind occur-edit-mode. Use occur-menu-map. (occur-edit-mode): New major mode (Bug#8463). (occur-after-change-function): New function. (occur-engine): Give Occur tags a read-only property.
* lisp/*.el: Lexical-binding cleanup.Juanma Barranquero2011-04-191-10/+22
|
* * lisp/replace.el (occur-mode-map): Some fixes for menu items.Glenn Morris2011-04-071-11/+14
|
* Merge from emacs-23; up to 2010-06-03T05:41:49Z!rgm@gnu.org.Glenn Morris2011-02-271-1/+1
|\
| * Fix spelling of "precede".Glenn Morris2011-02-221-1/+1
| |
* | Move keymap initialization into declaration.Stefan Monnier2011-02-101-48/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.