summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1996-09-17 19:01:09 +0000
committerRichard M. Stallman <rms@gnu.org>1996-09-17 19:01:09 +0000
commit0f00b805e7bea0771eafd321a23bacd357fe1b8c (patch)
treeaed3c739d149f47abeae59f7d203d3940e2298e5 /lisp/emacs-lisp
parent6baa0de637df099795393bdf7643559c45ddac1a (diff)
downloademacs-0f00b805e7bea0771eafd321a23bacd357fe1b8c.tar.gz
(byte-compile-lambda): If the doc string is also the
return value, use it for both.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/bytecomp.el7
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 13f52717cff..719584bfcc9 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -10,7 +10,7 @@
;;; This version incorporates changes up to version 2.10 of the
;;; Zawinski-Furuseth compiler.
-(defconst byte-compile-version "$Revision: 2.17 $")
+(defconst byte-compile-version "$Revision: 2.19 $")
;; This file is part of GNU Emacs.
@@ -1900,7 +1900,10 @@ If FORM is a lambda or a macro, byte-compile it as a function."
(body (cdr (cdr fun)))
(doc (if (stringp (car body))
(prog1 (car body)
- (setq body (cdr body)))))
+ ;; Discard the doc string
+ ;; unless it is the last element of the body.
+ (if (nthcdr 2 body)
+ (setq body (cdr body))))))
(int (assq 'interactive body)))
(cond (int
;; Skip (interactive) if it is in front (the most usual location).