(describe-variable): Undo 2008-02-25 change.

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 2d1565bdf49afa217c7d1c13ef1b1bd983a3438a..b3e4e65883943aa15eee0a602992e132350c17b1 100644 (file)
--- 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