diff options
| author | Stefan Monnier | 2014-02-21 12:45:26 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2014-02-21 12:45:26 -0500 |
| commit | 3d136b1b7246eae2a86b4444904f02b77dc8951d (patch) | |
| tree | 994c4ea0e1f83df9a5a77951be30a2ef189fa4d6 | |
| parent | 7ce645e001cd89ca55bb18487c43de1a0774d81d (diff) | |
| download | emacs-3d136b1b7246eae2a86b4444904f02b77dc8951d.tar.gz emacs-3d136b1b7246eae2a86b4444904f02b77dc8951d.zip | |
* lisp/emacs-lisp/cl-macs.el (cl-define-compiler-macro): Add indent rule.
Fixes: debbugs:16829
| -rw-r--r-- | lisp/ChangeLog | 13 | ||||
| -rw-r--r-- | lisp/emacs-lisp/cl-macs.el | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 082bcd12f98..58bdb6534d5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-02-21 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * emacs-lisp/cl-macs.el (cl-define-compiler-macro): Add indent rule | ||
| 4 | (bug#16829). | ||
| 5 | |||
| 1 | 2014-02-21 Juanma Barranquero <lekktu@gmail.com> | 6 | 2014-02-21 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 7 | ||
| 3 | * whitespace.el (whitespace-space, whitespace-hspace, whitespace-tab) | 8 | * whitespace.el (whitespace-space, whitespace-hspace, whitespace-tab) |
| @@ -25,10 +30,10 @@ | |||
| 25 | 2014-02-21 Martin Rudalics <rudalics@gmx.at> | 30 | 2014-02-21 Martin Rudalics <rudalics@gmx.at> |
| 26 | 31 | ||
| 27 | Fix handling of window-min-height/-width (Bug#16738). | 32 | Fix handling of window-min-height/-width (Bug#16738). |
| 28 | * window.el (window--dump-window, window--dump-frame): New | 33 | * window.el (window--dump-window, window--dump-frame): |
| 29 | functions. | 34 | New functions. |
| 30 | (window--min-size-1): Account for window dividers. When | 35 | (window--min-size-1): Account for window dividers. |
| 31 | window-resize-pixelwise is nil, delay rounding till after the | 36 | When window-resize-pixelwise is nil, delay rounding till after the |
| 32 | sum of the window components has been calculated. | 37 | sum of the window components has been calculated. |
| 33 | (window--min-delta-1, window--max-delta-1): When PIXELWISE is | 38 | (window--min-delta-1, window--max-delta-1): When PIXELWISE is |
| 34 | nil make sure at least one text line and two text columns remain | 39 | nil make sure at least one text line and two text columns remain |
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index 45448ecf5dc..b1861cf7dfa 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el | |||
| @@ -2710,7 +2710,7 @@ compiler macros are expanded repeatedly until no further expansions are | |||
| 2710 | possible. Unlike regular macros, BODY can decide to \"punt\" and leave the | 2710 | possible. Unlike regular macros, BODY can decide to \"punt\" and leave the |
| 2711 | original function call alone by declaring an initial `&whole foo' parameter | 2711 | original function call alone by declaring an initial `&whole foo' parameter |
| 2712 | and then returning foo." | 2712 | and then returning foo." |
| 2713 | (declare (debug cl-defmacro)) | 2713 | (declare (debug cl-defmacro) (indent 2)) |
| 2714 | (let ((p args) (res nil)) | 2714 | (let ((p args) (res nil)) |
| 2715 | (while (consp p) (push (pop p) res)) | 2715 | (while (consp p) (push (pop p) res)) |
| 2716 | (setq args (nconc (nreverse res) (and p (list '&rest p))))) | 2716 | (setq args (nconc (nreverse res) (and p (list '&rest p))))) |