(byte-compile-lambda): If the doc string is also the

return value, use it for both.

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 13f52717cffcd0be8d6949a94fb6797ece15d46c..719584bfcc9daa8f662c26c93f65eb2ea0ea86ca 100644 (file)
--- 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).