diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2008-04-03 04:01:32 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2008-04-03 04:01:32 +0000 |
| commit | 526792a3187851577f904d10db4f4bf404e344aa (patch) | |
| tree | 98d1bfdd64fbe93c53093569ef65e20a386cde6e /lisp/help-fns.el | |
| parent | 902c9b1a16e836a8ffce17c4ada04423f2815bc0 (diff) | |
| download | emacs-526792a3187851577f904d10db4f4bf404e344aa.tar.gz | |
(describe-variable): Undo 2008-02-25 change.
Diffstat (limited to 'lisp/help-fns.el')
| -rw-r--r-- | lisp/help-fns.el | 31 |
1 files changed, 5 insertions, 26 deletions
diff --git a/lisp/help-fns.el b/lisp/help-fns.el index 2d1565bdf49..b3e4e658839 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el @@ -679,38 +679,17 @@ it is displayed along with the global value." (with-current-buffer standard-output (insert (or doc "Not documented as a variable.")))) - (let ((customize-label "customize") - (initialization-file "initialization file")) - ;; All variables can be set; some can be customized - (when (and (symbolp variable) (not (custom-variable-p variable))) + ;; Make a link to customize if this variable can be customized. + (when (custom-variable-p variable) + (let ((customize-label "customize")) (terpri) (terpri) - (princ (concat "You can set this variable in your " - initialization-file ".")) - (with-current-buffer standard-output - (save-excursion - (re-search-backward - (concat "\\(" initialization-file "\\)") nil t) - (help-xref-button 1 'help-info-variable variable - "(emacs)Init File")))) - ;; Make a link to customize if this variable can be customized. - (when (custom-variable-p variable) - (terpri) - (terpri) - (princ (concat "You can " customize-label " this variable")) - (princ (concat " or set it in your " initialization-file ".")) + (princ (concat "You can " customize-label " this variable.")) (with-current-buffer standard-output (save-excursion (re-search-backward (concat "\\(" customize-label "\\)") nil t) - (help-xref-button 1 'help-customize-variable variable)) - (save-excursion - (re-search-backward - (concat "\\(" initialization-file "\\)") nil t) - (help-xref-button 1 'help-info-variable variable - "(emacs)Init File") - ) - )) + (help-xref-button 1 'help-customize-variable variable)))) ;; Note variable's version or package version (let ((output (describe-variable-custom-version-info variable))) (when output |