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).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d23bb9e650ed8ca30b2ee0d5e3a925f44119f8ff..1302bb414b2fc0d0c70d94b1cd393a51a94cef8e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.

diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el
index 5ac30bc28ce1e94fbf286bf0802dc921025304c1..0f873e678c383821bb0e3d6f4b82d220d4946b12 100644 (file)
--- 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)))