# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1228341430 0
# Node ID da8a0a35765c78f55ad95aaaa404258db22c5612
# Parent  caf4353286ff231c6752e6a87a49f0f459829dd1
(apropos-print-doc): Fix thinko that caused long labels to
be used in compact layout and vice-versa.

diff -r caf4353286ff -r da8a0a35765c lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Dec 03 16:36:59 2008 +0000
+++ b/lisp/ChangeLog	Wed Dec 03 21:57:10 2008 +0000
@@ -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 -r caf4353286ff -r da8a0a35765c lisp/apropos.el
--- a/lisp/apropos.el	Wed Dec 03 16:36:59 2008 +0000
+++ b/lisp/apropos.el	Wed Dec 03 21:57:10 2008 +0000
@@ -1082,8 +1082,8 @@
 	 '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!