projects
/
chise
/
xemacs-chise.git.1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
21.4.14 "Reasonable Discussion".
[chise/xemacs-chise.git.1]
/
lisp
/
bytecomp.el
diff --git
a/lisp/bytecomp.el
b/lisp/bytecomp.el
index
2fd75be
..
c1cc824
100644
(file)
--- a/
lisp/bytecomp.el
+++ b/
lisp/bytecomp.el
@@
-2391,7
+2391,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)
(body (cdr (cdr fun)))
(doc (if (stringp (car body))
(prog1 (car body)
- (setq body (cdr body)))))
+ ;; Discard the doc string
+ ;; only if it is not the only element of the body.
+ (if (cdr body)
+ (setq body (cdr body))))))
(int (assq 'interactive body)))
(dolist (arg arglist)
(cond ((not (symbolp arg))
(int (assq 'interactive body)))
(dolist (arg arglist)
(cond ((not (symbolp arg))
@@
-3142,7
+3145,9
@@
If FORM is a lambda or a macro, byte-compile it as a function."
(defun byte-compile-arithcompare (form)
(case (length (cdr form))
(0 (byte-compile-subr-wrong-args form "1 or more"))
(defun byte-compile-arithcompare (form)
(case (length (cdr form))
(0 (byte-compile-subr-wrong-args form "1 or more"))
- (1 (byte-compile-constant t))
+ (1 (if byte-compile-delete-errors
+ (byte-compile-constant t)
+ (byte-compile-normal-call form)))
(2 (byte-compile-two-args form))
(t (byte-compile-normal-call form))))
(2 (byte-compile-two-args form))
(t (byte-compile-normal-call form))))