aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2005-10-24 16:44:55 +0000
committerStefan Monnier2005-10-24 16:44:55 +0000
commit79e74246bca5fd779b89524c3d15a97abb1523d6 (patch)
treeb9cb37367bb9896925fed779daa29d706c06d518
parentfd8e7a802c77d15b147b9e20592270db34778728 (diff)
downloademacs-79e74246bca5fd779b89524c3d15a97abb1523d6.tar.gz
emacs-79e74246bca5fd779b89524c3d15a97abb1523d6.zip
(define-obsolete-function-alias, define-obsolete-variable-alias):
Add `doc-string' declaration.
-rw-r--r--lisp/emacs-lisp/byte-run.el26
1 files changed, 14 insertions, 12 deletions
diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index 453bef5ecbb..1ebc8f765fa 100644
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -128,6 +128,7 @@ is equivalent to the following two lines of code:
128\(make-obsolete 'old-fun 'new-fun \"22.1\") 128\(make-obsolete 'old-fun 'new-fun \"22.1\")
129 129
130See the docstrings of `defalias' and `make-obsolete' for more details." 130See the docstrings of `defalias' and `make-obsolete' for more details."
131 (declare (doc-string 4))
131 `(progn 132 `(progn
132 (defalias ,obsolete-name ,current-name ,docstring) 133 (defalias ,obsolete-name ,current-name ,docstring)
133 (make-obsolete ,obsolete-name ,current-name ,when))) 134 (make-obsolete ,obsolete-name ,current-name ,when)))
@@ -160,9 +161,10 @@ is equivalent to the following two lines of code:
160 161
161See the docstrings of `defvaralias' and `make-obsolete-variable' or 162See the docstrings of `defvaralias' and `make-obsolete-variable' or
162Info node `(elisp)Variable Aliases' for more details." 163Info node `(elisp)Variable Aliases' for more details."
164 (declare (doc-string 4))
163 `(progn 165 `(progn
164 (defvaralias ,obsolete-name ,current-name ,docstring) 166 (defvaralias ,obsolete-name ,current-name ,docstring)
165 (make-obsolete-variable ,obsolete-name ,current-name ,when))) 167 (make-obsolete-variable ,obsolete-name ,current-name ,when)))
166 168
167(defmacro dont-compile (&rest body) 169(defmacro dont-compile (&rest body)
168 "Like `progn', but the body always runs interpreted (not compiled). 170 "Like `progn', but the body always runs interpreted (not compiled).
@@ -171,10 +173,10 @@ If you think you need this, you're probably making a mistake somewhere."
171 (list 'eval (list 'quote (if (cdr body) (cons 'progn body) (car body))))) 173 (list 'eval (list 'quote (if (cdr body) (cons 'progn body) (car body)))))
172 174
173 175
174;;; interface to evaluating things at compile time and/or load time 176;; interface to evaluating things at compile time and/or load time
175;;; these macro must come after any uses of them in this file, as their 177;; these macro must come after any uses of them in this file, as their
176;;; definition in the file overrides the magic definitions on the 178;; definition in the file overrides the magic definitions on the
177;;; byte-compile-macro-environment. 179;; byte-compile-macro-environment.
178 180
179(defmacro eval-when-compile (&rest body) 181(defmacro eval-when-compile (&rest body)
180 "Like `progn', but evaluates the body at compile time if you're compiling. 182 "Like `progn', but evaluates the body at compile time if you're compiling.
@@ -198,12 +200,12 @@ In interpreted code, this is entirely equivalent to `progn'."
198 (car (last body))) 200 (car (last body)))
199 201
200 202
201;;; I nuked this because it's not a good idea for users to think of using it. 203;; I nuked this because it's not a good idea for users to think of using it.
202;;; These options are a matter of installation preference, and have nothing to 204;; These options are a matter of installation preference, and have nothing to
203;;; with particular source files; it's a mistake to suggest to users 205;; with particular source files; it's a mistake to suggest to users
204;;; they should associate these with particular source files. 206;; they should associate these with particular source files.
205;;; There is hardly any reason to change these parameters, anyway. 207;; There is hardly any reason to change these parameters, anyway.
206;;; --rms. 208;; --rms.
207 209
208;; (put 'byte-compiler-options 'lisp-indent-function 0) 210;; (put 'byte-compiler-options 'lisp-indent-function 0)
209;; (defmacro byte-compiler-options (&rest args) 211;; (defmacro byte-compiler-options (&rest args)
@@ -229,5 +231,5 @@ In interpreted code, this is entirely equivalent to `progn'."
229;; (file-format emacs19))" 231;; (file-format emacs19))"
230;; nil) 232;; nil)
231 233
232;;; arch-tag: 76f8328a-1f66-4df2-9b6d-5c3666dc05e9 234;; arch-tag: 76f8328a-1f66-4df2-9b6d-5c3666dc05e9
233;;; byte-run.el ends here 235;;; byte-run.el ends here