From 7600cf45994d0c1d6fb42d8b0ddf725d9600bd1d Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Mon, 7 Mar 2011 15:29:03 -0500 Subject: [PATCH] Fix a cc-cmds.el patch from acm that I applied incorrectly (Bug#7595). * lisp/progmodes/cc-cmds.el (c-beginning-of-statement): Fix incorrect application of patch from Alan Mackenzie (Bug#7595). --- lisp/ChangeLog | 5 +++++ lisp/progmodes/cc-cmds.el | 19 ++++++------------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d23bb9e650e..1302bb414b2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-03-07 Chong Yidong + + * progmodes/cc-cmds.el (c-beginning-of-statement): Fix incorrect + application of patch from Alan Mackenzie (Bug#7595). + 2011-03-07 Deniz Dogan * net/rcirc.el (rcirc-connect): Fix PASS bug. diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el index 5ac30bc28ce..0f873e678c3 100644 --- a/lisp/progmodes/cc-cmds.el +++ b/lisp/progmodes/cc-cmds.el @@ -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))) -- 2.39.5