From 1e8571214b21e3389ca5a7a79a271e30a11fcd0f Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Mon, 16 Nov 2009 04:06:12 +0000 Subject: [PATCH] (byte-compile-output-file-form): Quote doc string reference in defvaralias as it is not in special form. (byte-compile-output-docform): Doc fix. --- lisp/ChangeLog | 6 ++++++ lisp/emacs-lisp/bytecomp.el | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e8b4dbea089..fd9e082cdc6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2009-11-16 YAMAMOTO Mitsuharu + + * emacs-lisp/bytecomp.el (byte-compile-output-file-form): + Quote doc string reference in defvaralias as it is not in special form. + (byte-compile-output-docform): Doc fix. + 2009-11-16 Jay Belanger * calc/calc.el (math-2-word-size, math-half-2-word-size) diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 60a85a7c80f..2f0c7db4c34 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -1925,7 +1925,7 @@ Call from the source buffer." (defun byte-compile-output-file-form (form) ;; writes the given form to the output buffer, being careful of docstrings - ;; in defun, defmacro, defvar, defconst, autoload and + ;; in defun, defmacro, defvar, defvaralias, defconst, autoload and ;; custom-declare-variable because make-docfile is so amazingly stupid. ;; 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 @@ -1935,7 +1935,8 @@ Call from the source buffer." (stringp (nth 3 form))) (byte-compile-output-docform nil nil '("\n(" 3 ")") form nil (memq (car form) - '(autoload custom-declare-variable))) + '(defvaralias autoload + custom-declare-variable))) (let ((print-escape-newlines t) (print-length nil) (print-level nil) @@ -1959,7 +1960,7 @@ we output that argument and the following argument \(the constants vector) together, for lazy loading. QUOTED says that we have to put a quote before the list that represents a doc string reference. -`autoload' and `custom-declare-variable' need that." +`defvaralias', `autoload' and `custom-declare-variable' need that." ;; We need to examine byte-compile-dynamic-docstrings ;; in the input buffer (now current), not in the output buffer. (let ((dynamic-docstrings byte-compile-dynamic-docstrings)) -- 2.11.4.GIT