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

Fix a cc-cmds.el patch from acm that I applied incorrectly (Bug#7595).

Browse source 
* lisp/progmodes/cc-cmds.el (c-beginning-of-statement): Fix incorrect
application of patch from Alan Mackenzie (Bug#7595).
This commit is contained in:
Chong Yidong 2011-03-07 15:29:03 -05:00
parent fa7062f653
commit 7600cf4599
2 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2011-03-07 Chong Yidong <cyd@stupidchicken.com>
* progmodes/cc-cmds.el (c-beginning-of-statement): Fix incorrect
application of patch from Alan Mackenzie (Bug#7595).
2011-03-07 Deniz Dogan <deniz.a.m.dogan@gmail.com>
* net/rcirc.el (rcirc-connect): Fix PASS bug.

19
lisp/progmodes/cc-cmds.el
View file

@ -2564,19 +2564,12 @@ be more \"DWIM:ey\"."
;; Are we about to move backwards into or out of a
;; preprocessor command? If so, locate its beginning.
(when (eq (cdr res) 'macro-boundary)
(setq macro-fence
(save-excursion
(if macro-fence
(progn
(end-of-line)
(and (not (eobp))
(progn (c-skip-ws-forward)
(c-beginning-of-macro))
(progn (c-end-of-macro)
(point))))
(and (not (eobp))
(c-beginning-of-macro)
(progn (c-end-of-macro) (point)))))))
(save-excursion
(beginning-of-line)
(setq macro-fence
(and (not (bobp))
(progn (c-skip-ws-backward) (c-beginning-of-macro))
(point)))))
;; Are we about to move backwards into a literal?
(when (memq (cdr res) '(macro-boundary literal))
(setq range (c-ascertain-preceding-literal)))