Mercurial > emacs
diff lispref/keymaps.texi @ 90389:146cd8369025
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-60
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 259-273)
- Update from CVS
- lisp/replace.el (occur-engine): Bind `inhibit-field-text-motion' to t
- Merge from gnus--rel--5.10
- Rename "field-at-point" to "field-at-pos"
- (comint-insert-input): Remove redundant calls to setq and goto-char
* gnus--rel--5.10 (patch 99-100)
- Merge from emacs--devo--0
- Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Wed, 10 May 2006 20:42:41 +0000 |
| parents | 5754737d1e04 a9473232a709 |
| children | a8190f7e546e |
line wrap: on
line diff
--- a/lispref/keymaps.texi Tue May 02 08:50:29 2006 +0000 +++ b/lispref/keymaps.texi Wed May 10 20:42:41 2006 +0000 @@ -561,7 +561,7 @@ (@var{find-in-any} emulation-mode-map-alists) (@var{find-in-any} minor-mode-overriding-map-alist) (@var{find-in-any} minor-mode-map-alist) - (if (get-text-property (point) 'local-map)) + (if (get-text-property (point) 'local-map) (@var{find-in} (get-text-property (point) 'local-map)) (@var{find-in} (current-local-map)))))) (@var{find-in} (current-global-map))) @@ -670,14 +670,15 @@ (@var{find-in-any} emulation-mode-map-alists) (@var{find-in-any} minor-mode-overriding-map-alist) (@var{find-in-any} minor-mode-map-alist) - (@var{find-in} (get-text-property (point) 'local-map)) - (@var{find-in} (current-local-map))))) + (if (get-text-property (point) 'local-map) + (@var{find-in} (get-text-property (point) 'local-map)) + (@var{find-in} (current-local-map)))))) (@var{find-in} (current-global-map))) @end lisp @noindent The @var{find-in} and @var{find-in-any} are pseudo functions that -searches in one keymap respectively an alist of keymaps. +search in one keymap and in an alist of keymaps, respectively. @enumerate @item