diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2008-07-31 22:15:18 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2008-07-31 22:15:18 +0000 |
| commit | 60f4c0c8bab711e474a63f763d227248b35c2df4 (patch) | |
| tree | 5bfdb82bdf0a62ed55798c03807755dedf76a4a9 /lisp/apropos.el | |
| parent | 45c041650b1b3f0e21fc343a9e71dbf05aa5c4d5 (diff) | |
| download | emacs-60f4c0c8bab711e474a63f763d227248b35c2df4.tar.gz emacs-60f4c0c8bab711e474a63f763d227248b35c2df4.tar.bz2 emacs-60f4c0c8bab711e474a63f763d227248b35c2df4.zip | |
(apropos-symbol): Don't set button skip by default.
(apropos-print): Set button skip iff searching for multiple types.
(apropos-print-doc): Insert blank label button when searching for
a single type.
Diffstat (limited to 'lisp/apropos.el')
| -rw-r--r-- | lisp/apropos.el | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/lisp/apropos.el b/lisp/apropos.el index a56cd4218e3..0f00d2d3617 100644 --- a/lisp/apropos.el +++ b/lisp/apropos.el @@ -179,8 +179,7 @@ term, and the rest of the words are alternative terms.") 'face apropos-symbol-face 'help-echo "mouse-2, RET: Display more help on this symbol" 'follow-link t - 'action #'apropos-symbol-button-display-help - 'skip t) + 'action #'apropos-symbol-button-display-help) (defun apropos-symbol-button-display-help (button) "Display further help for the `apropos-symbol' button BUTTON." @@ -980,6 +979,7 @@ If non-nil TEXT is a string that will be printed as a heading." (cons nil (cdr apropos-item))))) (insert-text-button (symbol-name symbol) 'type 'apropos-symbol + 'skip apropos-multi-type ;; Can't use default, since user may have ;; changed the variable! ;; Just say `no' to variables containing faces! @@ -1068,9 +1068,14 @@ If non-nil TEXT is a string that will be printed as a heading." (if apropos-compact-layout (insert (propertize "\t" 'display '(space :align-to 32)) " ") (insert " ")) - ;; If the query is only for a single type, there's - ;; no point writing it over and over again. - (when apropos-multi-type + (if (null apropos-multi-type) + ;; If the query is only for a single type, there's no point + ;; writing it over and over again. Insert a blank button, and + ;; put the 'apropos-label property there (needed by + ;; apropos-symbol-button-display-help). + (insert-text-button + " " 'type type 'skip t + 'face 'default 'apropos-symbol (car apropos-item)) (insert-text-button (if apropos-compact-layout (button-type-get type 'apropos-label) @@ -1081,7 +1086,7 @@ If non-nil TEXT is a string that will be printed as a heading." 'face apropos-label-face 'apropos-symbol (car apropos-item)) (insert (if apropos-compact-layout " " ": "))) - (insert (if do-keys (substitute-command-keys i) i)) + (insert (if do-keys (substitute-command-keys i) i)) (or (bolp) (terpri)))) (defun apropos-follow () |