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 @@
+2014-02-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/cl-macs.el (cl-define-compiler-macro): Add indent rule
+        (bug#16829).
+
 2014-02-21  Juanma Barranquero  <lekktu@gmail.com>
 
         * whitespace.el (whitespace-space, whitespace-hspace, whitespace-tab)
@@ -25,10 +30,10 @@
 2014-02-21  Martin Rudalics  <rudalics@gmx.at>
 
         Fix handling of window-min-height/-width (Bug#16738).
-        * window.el (window--dump-window, window--dump-frame): New
-        functions.
-        (window--min-size-1): Account for window dividers.  When
-        window-resize-pixelwise is nil, delay rounding till after the
+        * window.el (window--dump-window, window--dump-frame):
+        New functions.
+        (window--min-size-1): Account for window dividers.
+        When window-resize-pixelwise is nil, delay rounding till after the
         sum of the window components has been calculated.
         (window--min-delta-1, window--max-delta-1): When PIXELWISE is
         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
 possible.  Unlike regular macros, BODY can decide to \"punt\" and leave the
 original function call alone by declaring an initial `&whole foo' parameter
 and then returning foo."
-  (declare (debug cl-defmacro))
+  (declare (debug cl-defmacro) (indent 2))
   (let ((p args) (res nil))
     (while (consp p) (push (pop p) res))
     (setq args (nconc (nreverse res) (and p (list '&rest p)))))