procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(c-up-conditional): Handle commented-out #-cmds properly.

Browse source
This commit is contained in:
Richard M. Stallman 1993-05-29 18:14:34 +00:00
parent 47d319aaa8
commit 1e2d7ccea0
1 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
lisp/progmodes/c-mode.el
View file

@ -1271,24 +1271,25 @@ When going forwards, `#elif' is ignored."
;; the regexp matcher.
(funcall search-function
"#[ \t]*\\(if\\|elif\\|endif\\)"
nil t)
(progn
(beginning-of-line)
(looking-at "^[ \t]*#[ \t]*\\(if\\|elif\\|endif\\)")))
;; Update depth according to what we found.
nil t))
(beginning-of-line)
(cond ((looking-at "[ \t]*#[ \t]*endif")
(setq depth (+ depth increment)))
((looking-at "[ \t]*#[ \t]*elif")
(if (and forward (= depth 0))
(setq found (point))))
(t (setq depth (- depth increment))))
;; If this line exits a level of conditional, exit inner loop.
(if (< depth 0)
(setq found (point)))
;; When searching forward, start from end of line
;; so that we don't find the same line again.
(if forward (end-of-line))))
;; Now verify it is really a preproc line.
(if (looking-at "^[ \t]*#[ \t]*\\(if\\|elif\\|endif\\)")
(progn
;; Update depth according to what we found.
(beginning-of-line)
(cond ((looking-at "[ \t]*#[ \t]*endif")
(setq depth (+ depth increment)))
((looking-at "[ \t]*#[ \t]*elif")
(if (and forward (= depth 0))
(setq found (point))))
(t (setq depth (- depth increment))))
;; If this line exits a level of conditional, exit inner loop.
(if (< depth 0)
(setq found (point)))
;; When searching forward, start from end of line
;; so that we don't find the same line again.
(if forward (end-of-line))))))
(or found
(error "No containing preprocessor conditional"))
(goto-char (setq new found)))