[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100597: Fix errors in 2011-05-29
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100597: Fix errors in 2011-05-29 change to Lisp manual. |
Date: |
Tue, 14 Jun 2011 11:13:26 -0400 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 100597
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Tue 2011-06-14 11:13:26 -0400
message:
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.
modified:
doc/lispref/ChangeLog
doc/lispref/display.texi
doc/lispref/keymaps.texi
=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog 2011-05-29 17:18:46 +0000
+++ b/doc/lispref/ChangeLog 2011-06-14 15:13:26 +0000
@@ -1,3 +1,9 @@
+2011-06-14 Chong Yidong <address@hidden>
+
+ * 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 <address@hidden>
* help.texi (Accessing Documentation):
=== modified file 'doc/lispref/display.texi'
--- a/doc/lispref/display.texi 2011-05-29 17:18:46 +0000
+++ b/doc/lispref/display.texi 2011-06-14 15:13:26 +0000
@@ -1443,9 +1443,9 @@
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.
=== modified file 'doc/lispref/keymaps.texi'
--- a/doc/lispref/keymaps.texi 2011-05-29 17:18:46 +0000
+++ b/doc/lispref/keymaps.texi 2011-06-14 15:13:26 +0000
@@ -725,13 +725,13 @@
(@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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/emacs-23 r100597: Fix errors in 2011-05-29 change to Lisp manual.,
Chong Yidong <=