aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-11-14 00:18:12 -0800
committerGlenn Morris2012-11-14 00:18:12 -0800
commite4e9830bd9b59f5988e2e6d0774af0707f4d9182 (patch)
tree54ec82ea43a3318f67e57699aead07cae34569aa
parent5c934f8b268e07b41487dd73133381e6ed324a59 (diff)
downloademacs-e4e9830bd9b59f5988e2e6d0774af0707f4d9182.tar.gz
emacs-e4e9830bd9b59f5988e2e6d0774af0707f4d9182.zip
* doc/lispref/keymaps.texi (Searching Keymaps, Tool Bar): Untabify examples
so they align better in info.
-rw-r--r--doc/lispref/ChangeLog5
-rw-r--r--doc/lispref/keymaps.texi16
2 files changed, 13 insertions, 8 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index eabfc6e9c78..5bdcf86406c 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
12012-11-14 Glenn Morris <rgm@gnu.org>
2
3 * keymaps.texi (Searching Keymaps, Tool Bar): Untabify examples,
4 so they align better in info.
5
12012-11-12 Glenn Morris <rgm@gnu.org> 62012-11-12 Glenn Morris <rgm@gnu.org>
2 7
3 * variables.texi (Adding Generalized Variables): 8 * variables.texi (Adding Generalized Variables):
diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index f658f7e66fb..7605f2337e1 100644
--- a/doc/lispref/keymaps.texi
+++ b/doc/lispref/keymaps.texi
@@ -753,12 +753,12 @@ them:
753 (overriding-local-map 753 (overriding-local-map
754 (@var{find-in} overriding-local-map)) 754 (@var{find-in} overriding-local-map))
755 ((or (@var{find-in} (get-char-property (point) 'keymap)) 755 ((or (@var{find-in} (get-char-property (point) 'keymap))
756 (@var{find-in-any} emulation-mode-map-alists) 756 (@var{find-in-any} emulation-mode-map-alists)
757 (@var{find-in-any} minor-mode-overriding-map-alist) 757 (@var{find-in-any} minor-mode-overriding-map-alist)
758 (@var{find-in-any} minor-mode-map-alist) 758 (@var{find-in-any} minor-mode-map-alist)
759 (if (get-text-property (point) 'local-map) 759 (if (get-text-property (point) 'local-map)
760 (@var{find-in} (get-char-property (point) 'local-map)) 760 (@var{find-in} (get-char-property (point) 'local-map))
761 (@var{find-in} (current-local-map)))))) 761 (@var{find-in} (current-local-map))))))
762 (@var{find-in} (current-global-map))) 762 (@var{find-in} (current-global-map)))
763@end lisp 763@end lisp
764 764
@@ -2629,8 +2629,8 @@ By default, the global map binds @code{[tool-bar]} as follows:
2629 2629
2630@example 2630@example
2631(global-set-key [tool-bar] 2631(global-set-key [tool-bar]
2632 `(menu-item ,(purecopy "tool bar") ignore 2632 `(menu-item ,(purecopy "tool bar") ignore
2633 :filter tool-bar-make-keymap)) 2633 :filter tool-bar-make-keymap))
2634@end example 2634@end example
2635 2635
2636@noindent 2636@noindent