(apropos-print-doc): Fix thinko that caused long labels to

be used in compact layout and vice-versa.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 674ee0959a05ca986c719701feaa69d6c9abf756..776db585041f19ee449e96371a00b88ef2268651 100644 (file)
--- 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 eb6dc8236c497a4c007a9d464589eb2fd0167d32..31830e512237abd81f8ada1bb4c75d4e2f069785 100644 (file)
--- 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!