summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2008-12-03 21:57:10 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2008-12-03 21:57:10 +0000
commitbb05c7818f50bdb51d43cca746b0e24884f8f500 (patch)
treea4f2e3a4fc66da67dd19e0f1a5516f74d64861ff /lisp
parentbda29daceac8d7438bb2690be5885845160e3e13 (diff)
downloademacs-bb05c7818f50bdb51d43cca746b0e24884f8f500.tar.gz
(apropos-print-doc): Fix thinko that caused long labels to
be used in compact layout and vice-versa.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/apropos.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c567f7e5a8d..5b6f5e6b794 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-03 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * apropos.el (apropos-print-doc): Fix thinko that caused long labels to
+ be used in compact layout and vice-versa.
+
2008-12-03 Juanma Barranquero <lekktu@gmail.com>
* w32-fns.el (w32-list-locales): Use `with-output-to-temp-buffer',
diff --git a/lisp/apropos.el b/lisp/apropos.el
index eb6dc8236c4..31830e51223 100644
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -1082,8 +1082,8 @@ If non-nil TEXT is a string that will be printed as a heading."
'face 'default 'apropos-symbol (car apropos-item))
(insert-text-button
(if apropos-compact-layout
- (button-type-get type 'apropos-label)
- (format "<%s>" (button-type-get type 'apropos-short-label)))
+ (format "<%s>" (button-type-get type 'apropos-short-label))
+ (button-type-get type 'apropos-label))
'type type
;; Can't use the default button face, since user may have changed the
;; variable! Just say `no' to variables containing faces!