changeset 93573:553dfbccecfa

(describe-variable): Undo 2008-02-25 change.
author Chong Yidong <cyd@stupidchicken.com>
date Thu, 03 Apr 2008 04:01:32 +0000
parents 6c6edc54b63a
children 72ed60a2d901
files lisp/help-fns.el
diffstat 1 files changed, 5 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/help-fns.el	Thu Apr 03 04:01:18 2008 +0000
+++ b/lisp/help-fns.el	Thu Apr 03 04:01:32 2008 +0000
@@ -679,38 +679,17 @@
 	      (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