(describe-variable): Put `defvaralias' info before the documentation (patch from

John Paul Wallington <jpw@shootybangbang.com>). Remove useless "Documentation:"
string.

2 files changed, 12 insertions, 12 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e93b2cfd2a4..00e4a5e9d65 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2002-07-12  Juanma Barranquero  <lektu@terra.es>
 
+        * help-fns.el (describe-variable): Put `defvaralias' info before the
+        documentation (patch from John Paul Wallington
+        <jpw@shootybangbang.com>). Remove useless "Documentation:" string.
+
         * timer.el (timer-set-time-with-usecs): Fix documentation. Simplify
         extraction of time data.
 
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index d4daa2fa11c..b6c9ecd456f 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -426,8 +426,14 @@ it is displayed along with the global value."
                 (save-excursion
                   (forward-line -1)
                   (insert "Automatically becomes buffer-local when set in any fashion.\n"))))
-            (princ "Documentation:")
-            (terpri)
+            ;; Mention if it's an alias
+            (let ((alias (condition-case nil
+                             (indirect-variable variable)
+                           (error variable))))
+              (unless (eq alias variable)
+                (princ (format "This variable is an alias for `%s'." alias))
+                (terpri)
+                (terpri)))
             (let ((obsolete (get variable 'byte-obsolete-variable)))
               (when obsolete
                 (princ "This variable is obsolete")
@@ -438,16 +444,6 @@ it is displayed along with the global value."
                 (terpri)))
             (let ((doc (documentation-property variable 'variable-documentation)))
               (princ (or doc "Not documented as a variable.")))
-            
-            ;; Mention if the variable is an alias.
-            (let ((alias (condition-case nil
-                             (indirect-variable variable)
-                           (error variable))))
-              (unless (eq alias variable)
-                (terpri)
-                (terpri)
-                (princ (format "This variable is an alias for `%s'." alias))))
-            
             ;; Make a link to customize if this variable can be customized.
             ;; Note, it is not reliable to test only for a custom-type property
             ;; because those are only present after the var's definition