* emacs-lisp/bytecomp.el (byte-compile-output-file-form): Handle defvaralias.

* make-docfile.c (scan_lisp_file): Also look for `defvaralias'.

4 files changed, 12 insertions, 2 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index d16500a76cb..b72d928dc6c 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-04  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * make-docfile.c (scan_lisp_file): Also look for `defvaralias'.
+
 2009-10-15  Juanma Barranquero  <lekktu@gmail.com>
 
         * .gitignore: Add echolisp.tmp.
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index ad366bb2e06..3583f363f93 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -1007,7 +1007,9 @@ scan_lisp_file (filename, mode)
             }
         }
 
-      else if (! strcmp (buffer, "custom-declare-variable"))
+      else if (! strcmp (buffer, "custom-declare-variable")
+               || ! strcmp (buffer, "defvaralias")
+               )
         {
           char c1 = 0, c2 = 0;
           type = 'V';
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 194fdfdd915..a5e762d0210 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-03  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * emacs-lisp/bytecomp.el (byte-compile-output-file-form): Handle defvaralias.
+
 2009-11-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * descr-text.el: Require help-mode rather than help-fns (bug#4861).
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 3f330703d51..e527d07029a 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -2077,7 +2077,7 @@ and will be removed soon.  See (elisp)Backquote in the manual."))
   ;; defalias calls are output directly by byte-compile-file-form-defmumble;
   ;; it does not pay to first build the defalias in defmumble and then parse
   ;; it here.
-  (if (and (memq (car-safe form) '(defun defmacro defvar defconst autoload
+  (if (and (memq (car-safe form) '(defun defmacro defvar defvaralias defconst autoload
                                    custom-declare-variable))
            (stringp (nth 3 form)))
       (byte-compile-output-docform nil nil '("\n(" 3 ")") form nil