Mercurial > emacs
changeset 23787:2bb8777a3ba7
(help-xref-button): Do nothing if text already has the help-xref property.
(describe-variable): Revert previous change to hyperlink to source.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Mon, 30 Nov 1998 23:55:42 +0000 |
| parents | 673204d56938 |
| children | 764497f1c6a0 |
| files | lisp/help.el |
| diffstat | 1 files changed, 16 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/help.el Mon Nov 30 23:44:10 1998 +0000 +++ b/lisp/help.el Mon Nov 30 23:55:42 1998 +0000 @@ -751,14 +751,12 @@ ;; anything expects the current format.) (let ((file-name (describe-function-find-file variable))) (when file-name - ;; Don't quote this, or it can get re-interpreted later - ;; by `help-make-xrefs'. - (princ "\n\nDefined in ") + (princ "\n\nDefined in `") (princ file-name) - (princ ".") + (princ "'.") (with-current-buffer "*Help*" (save-excursion - (re-search-backward "Defined in \\([^.]+\\)." nil t) + (re-search-backward "`\\([^`']+\\)'" nil t) (help-xref-button 1 (lambda (arg) (let ((location (find-variable-noselect arg))) @@ -1029,17 +1027,19 @@ regexp. FUNCTION is a function to invoke when the button is activated, applied to DATA. DATA may be a single value or a list. See `help-make-xrefs'." - (add-text-properties (match-beginning match-number) - (match-end match-number) - (list 'mouse-face 'highlight - 'help-xref (cons function - (if (listp data) - data - (list data))))) - (if help-highlight-p - (put-text-property (match-beginning match-number) - (match-end match-number) - 'face help-highlight-face))) + ;; Don't mung properties we've added specially in some instances. + (unless (get-text-property (match-beginning match-number) 'help-xref) + (add-text-properties (match-beginning match-number) + (match-end match-number) + (list 'mouse-face 'highlight + 'help-xref (cons function + (if (listp data) + data + (list data))))) + (if help-highlight-p + (put-text-property (match-beginning match-number) + (match-end match-number) + 'face help-highlight-face)))) ;; Additional functions for (re-)creating types of help buffers.