Commit 9c4aeabf authored by Alan Mackenzie's avatar Alan Mackenzie
Browse files

progmodes/cc-engine.el (c-state-cache-non-literal-place): Correct to

avoid the insides of macros.
parent b215eee5
2011-08-16 Alan Mackenzie <acm@muc.de>
* progmodes/cc-engine.el (c-state-cache-non-literal-place):
Correct, to avoid the inside of macros.
2011-08-16 Richard Stallman <rms@gnu.org>
* epa-mail.el: Handle GnuPG group definitions.
......
......@@ -2130,13 +2130,17 @@ comment at the start of cc-engine.el for more info."
pos))
(defsubst c-state-cache-non-literal-place (pos state)
;; Return a position outside of a string/comment at or before POS.
;; Return a position outside of a string/comment/macro at or before POS.
;; STATE is the parse-partial-sexp state at POS.
(if (or (nth 3 state) ; in a string?
(nth 4 state)) ; in a comment?
(nth 8 state)
pos))
(let ((res (if (or (nth 3 state) ; in a string?
(nth 4 state)) ; in a comment?
(nth 8 state)
pos)))
(save-excursion
(goto-char res)
(if (c-beginning-of-macro)
(point)
res))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Stuff to do with point-min, and coping with any literal there.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment