Merge from emacs-23; up to 2010-06-15T03:34:12Z!rgm@gnu.org.

[gnu-emacs] / doc / lispref / keymaps.texi

diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index d55cb29977155580e53ca590c9037c3f48ea3d2f..cf1db5b7fce7a4a783087a58fdf8df7fe21da199 100644 (file)
--- a/doc/lispref/keymaps.texi
+++ b/doc/lispref/keymaps.texi
@@ -723,13 +723,13 @@ them:
       (@var{find-in} overriding-terminal-local-map))
      (overriding-local-map
       (@var{find-in} overriding-local-map))
-     (or (@var{find-in} (get-char-property (point) 'keymap))
-        (@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)
-            (@var{find-in} (get-char-property (point) 'local-map))
-          (@var{find-in} (current-local-map)))))
+     ((or (@var{find-in} (get-char-property (point) 'keymap))
+         (@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)
+             (@var{find-in} (get-char-property (point) 'local-map))
+           (@var{find-in} (current-local-map))))))
     (@var{find-in} (current-global-map)))
 @end lisp