aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2019-08-02 23:11:28 +0200
committerLars Ingebrigtsen2019-08-02 23:11:28 +0200
commite56e85d227b9c14b02e9c938efe994176a015db2 (patch)
treedefc89d648e7554669f6c2dd111e11b6659b925b
parent530a4af66cee9e028e767d5be471dfd9d4955f50 (diff)
downloademacs-e56e85d227b9c14b02e9c938efe994176a015db2.tar.gz
emacs-e56e85d227b9c14b02e9c938efe994176a015db2.zip
macroexp doc fixes
* lisp/emacs-lisp/macroexp.el (macroexp-progn): Doc clarification (bug#19371). (macroexp-let*): Doc fix.
-rw-r--r--lisp/emacs-lisp/macroexp.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el
index a04b3951c6a..9b29d0058c0 100644
--- a/lisp/emacs-lisp/macroexp.el
+++ b/lisp/emacs-lisp/macroexp.el
@@ -319,7 +319,8 @@ definitions to shadow the loaded ones for use in file byte-compilation."
319 (cons (nreverse decls) body))) 319 (cons (nreverse decls) body)))
320 320
321(defun macroexp-progn (exps) 321(defun macroexp-progn (exps)
322 "Return an expression equivalent to \\=`(progn ,@EXPS)." 322 "Return EXPS with `progn' prepended.
323If EXPS is a single expression, `progn' is not prepended."
323 (if (cdr exps) `(progn ,@exps) (car exps))) 324 (if (cdr exps) `(progn ,@exps) (car exps)))
324 325
325(defun macroexp-unprogn (exp) 326(defun macroexp-unprogn (exp)
@@ -328,7 +329,7 @@ Never returns an empty list."
328 (if (eq (car-safe exp) 'progn) (or (cdr exp) '(nil)) (list exp))) 329 (if (eq (car-safe exp) 'progn) (or (cdr exp) '(nil)) (list exp)))
329 330
330(defun macroexp-let* (bindings exp) 331(defun macroexp-let* (bindings exp)
331 "Return an expression equivalent to \\=`(let* ,bindings ,exp)." 332 "Return an expression equivalent to \\=`(let* ,BINDINGS ,EXP)."
332 (cond 333 (cond
333 ((null bindings) exp) 334 ((null bindings) exp)
334 ((eq 'let* (car-safe exp)) `(let* (,@bindings ,@(cadr exp)) ,@(cddr exp))) 335 ((eq 'let* (car-safe exp)) `(let* (,@bindings ,@(cadr exp)) ,@(cddr exp)))