[Emacs-diffs] /srv/bzr/emacs/trunk r103578: Fix a cc-cmds.el patch from acm that I applied incorrectly (Bug#7595).

[Chong Yidong]

------------------------------------------------------------
revno: 103578
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Mon 2011-03-07 15:29:03 -0500
message:
  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).
modified:
  lisp/ChangeLog
  lisp/progmodes/cc-cmds.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-03-07 12:03:22 +0000
+++ b/lisp/ChangeLog    2011-03-07 20:29:03 +0000
@@ -1,3 +1,8 @@
+2011-03-07  Chong Yidong  <address@hidden>
+
+       * progmodes/cc-cmds.el (c-beginning-of-statement): Fix incorrect
+       application of patch from Alan Mackenzie (Bug#7595).
+
 2011-03-07  Deniz Dogan  <address@hidden>
 
        * net/rcirc.el (rcirc-connect): Fix PASS bug.

=== modified file 'lisp/progmodes/cc-cmds.el'
--- a/lisp/progmodes/cc-cmds.el 2011-02-20 18:36:29 +0000
+++ b/lisp/progmodes/cc-cmds.el 2011-03-07 20:29:03 +0000
@@ -2564,19 +2564,12 @@
                ;; 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)))