diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/cc-engine.el | 18 |
2 files changed, 14 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2554bd6d83a..ec6991504bb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-08-29 Glenn Morris <rgm@gnu.org> + + * progmodes/cc-engine.el (c-pull-open-brace): + Move definition before use. + 2013-08-29 Stefan Monnier <monnier@iro.umontreal.ca> * emacs-lisp/cl-macs.el (cl-defsubst): Make it clear that args diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index b9345b2ae6a..db2a6c68539 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -6479,6 +6479,15 @@ comment at the start of cc-engine.el for more info." (c-go-list-forward) t))) +(defmacro c-pull-open-brace (ps) + ;; Pull the next open brace from PS (which has the form of paren-state), + ;; skipping over any brace pairs. Returns NIL when PS is exhausted. + `(progn + (while (consp (car ,ps)) + (setq ,ps (cdr ,ps))) + (prog1 (car ,ps) + (setq ,ps (cdr ,ps))))) + (defun c-back-over-member-initializers () ;; Test whether we are in a C++ member initializer list, and if so, go back ;; to the introducing ":", returning the position of the opening paren of @@ -8403,15 +8412,6 @@ comment at the start of cc-engine.el for more info." (back-to-indentation) (vector (point) open-paren-pos)))))) -(defmacro c-pull-open-brace (ps) - ;; Pull the next open brace from PS (which has the form of paren-state), - ;; skipping over any brace pairs. Returns NIL when PS is exhausted. - `(progn - (while (consp (car ,ps)) - (setq ,ps (cdr ,ps))) - (prog1 (car ,ps) - (setq ,ps (cdr ,ps))))) - (defun c-most-enclosing-decl-block (paren-state) ;; Return the buffer position of the most enclosing decl-block brace (in the ;; sense of c-looking-at-decl-block) in the PAREN-STATE structure, or nil if |