Fix errors in 2011-05-29 change to Lisp manual.

* doc/lispref/keymaps.texi (Searching Keymaps):
* doc/lispref/display.texi (Overlay Properties): Fix errors in 2011-05-29
change.  Suggested by Johan Bockgård.

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index fd8a994..0178e91 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-14  Chong Yidong  <cyd@stupidchicken.com>
+
+       * keymaps.texi (Searching Keymaps):
+       * display.texi (Overlay Properties): Fix errors in 2011-05-29
+       change.  Suggested by Johan Bockgård.
+
 2011-05-29  Chong Yidong  <cyd@stupidchicken.com>
 
        * help.texi (Accessing Documentation):

diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 4a647ef..e8e9e38 100644 (file)
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -1443,9 +1443,9 @@ specify a particular attribute for certain text.  @xref{Face
 Attributes}.
 
 @item
-A cons cell, either of the form @code{(fg-color . @var{color-name})}
-or @code{(bg-color . @var{color-name})}.  These elements specify just
-the foreground color or just the background color.
+A cons cell, of the form @code{(foreground-color . @var{color-name})}
+or @code{(background-color . @var{color-name})}.  These elements
+specify just the foreground color or just the background color.
 
 @code{(foreground-color . @var{color-name})} has the same effect as
 @code{(:foreground @var{color-name})}; likewise for the background.

diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index b1f02d6..5befa91 100644 (file)
--- a/doc/lispref/keymaps.texi
+++ b/doc/lispref/keymaps.texi
@@ -725,13 +725,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