diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-09-07 16:14:55 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-09-07 16:14:55 -0400 |
| commit | daac280ae09b00e8a218ba3b6f9205d2372e93db (patch) | |
| tree | 70d4f49db955edcafd8ea948e6ed0c921c6f5dff /lisp | |
| parent | 9dd40b000598aff88c6249ecf2b5a866935e9321 (diff) | |
| download | emacs-daac280ae09b00e8a218ba3b6f9205d2372e93db.tar.gz emacs-daac280ae09b00e8a218ba3b6f9205d2372e93db.tar.bz2 emacs-daac280ae09b00e8a218ba3b6f9205d2372e93db.zip | |
* lisp/emacs-lisp/byte-run.el (defun): Tweak message. Simplify code.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 12 | ||||
| -rw-r--r-- | lisp/emacs-lisp/byte-run.el | 7 |
2 files changed, 11 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index efdc0b80d13..052b85ef757 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,7 +1,11 @@ +2012-09-07 Stefan Monnier <monnier@iro.umontreal.ca> + + * emacs-lisp/byte-run.el (defun): Tweak message. Simplify code. + 2012-09-07 Matt McClure <mlm@aya.yale.edu> (tiny change) - * progmodes/python.el (python-shell-send-string): When - default-directory is remote, create temp file on remote + * progmodes/python.el (python-shell-send-string): + When default-directory is remote, create temp file on remote filesystem. (python-shell-send-file): When file is remote, pass local view of file paths to remote Python interpreter. (Bug#12340) @@ -15,8 +19,8 @@ * subr.el (read-char-choice): Allow quitting via ESC ESC. - * userlock.el (ask-user-about-supersession-threat): Use - read-char-choice (Bug#12093). + * userlock.el (ask-user-about-supersession-threat): + Use read-char-choice (Bug#12093). 2012-09-07 Chong Yidong <cyd@gnu.org> diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el index 9b66c8ffd60..d1382f42b19 100644 --- a/lisp/emacs-lisp/byte-run.el +++ b/lisp/emacs-lisp/byte-run.el @@ -185,11 +185,10 @@ The return value is undefined. ((and (featurep 'cl) (memq (car x) ;C.f. cl-do-proclaim. '(special inline notinline optimize warn))) - (if (null (stringp docstring)) - (push (list 'declare x) body) - (setcdr body (cons (list 'declare x) (cdr body)))) + (push (list 'declare x) + (if (stringp docstring) (cdr body) body)) nil) - (t (message "Warning: Unknown defun property %S in %S" + (t (message "Warning: Unknown defun property `%S' in %S" (car x) name))))) decls)) (def (list 'defalias |