diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-06-23 11:38:23 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-06-23 11:38:23 -0400 |
| commit | dc5d230cac26a7ad04afd63bfc8db7c3df529fba (patch) | |
| tree | dbe754c92c664a8bce769174e97e5660380df0c4 /lisp/emacs-lisp/macroexp.el | |
| parent | e8c1cabf0330c190594cb77942a5690afee9e926 (diff) | |
| download | emacs-dc5d230cac26a7ad04afd63bfc8db7c3df529fba.tar.gz | |
Miscellaneous minor cleanups and simplifications.
* lisp/help-fns.el (describe-variable): Don't croak when doc is not found.
* lisp/vc/pcvs.el (cvs-retrieve-revision): Avoid toggle-read-only.
* lisp/menu-bar.el (menu-bar-line-wrapping-menu): Purecopy a tiny bit more.
* lisp/emacs-lisp/syntax.el (syntax-ppss): Simplify with new `if' place.
* lisp/emacs-lisp/smie.el (smie-next-sexp): CSE.
* lisp/emacs-lisp/macroexp.el (macroexp-let2): Fix edebug spec and avoid
((lambda ..) ..).
* lisp/emacs-lisp/eieio.el (eieio-oref, slot-value): Use simpler defsetf.
Diffstat (limited to 'lisp/emacs-lisp/macroexp.el')
| -rw-r--r-- | lisp/emacs-lisp/macroexp.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el index 6275fd1cdf8..c6e1c0fea38 100644 --- a/lisp/emacs-lisp/macroexp.el +++ b/lisp/emacs-lisp/macroexp.el @@ -269,11 +269,11 @@ This is like `(let ((v ,EXP)) ,EXPS) except that `v' is a new generated symbol which EXPS can find in VAR. TEST should be the name of a predicate on EXP checking whether the `let' can be skipped; if nil, as is usual, `macroexp-const-p' is used." - (declare (indent 3) (debug (sexp form sexp body))) + (declare (indent 3) (debug (sexp sexp form body))) (let ((bodysym (make-symbol "body")) (expsym (make-symbol "exp"))) `(let* ((,expsym ,exp) - (,var (if (,(or test #'macroexp-const-p) ,expsym) + (,var (if (funcall #',(or test #'macroexp-const-p) ,expsym) ,expsym (make-symbol "x"))) (,bodysym ,(macroexp-progn exps))) (if (eq ,var ,expsym) ,bodysym |