[Emacs-diffs] /srv/bzr/emacs/trunk r100082: (progmodes/cc-mode.el) c-extend-region-for-CPP: Fix an off-by-one error

[Alan Mackenzie]

------------------------------------------------------------
revno: 100082
committer: Alan Mackenzie <address@hidden>
branch nick: trunk
timestamp: Thu 2010-04-29 14:48:32 +0000
message:
  (progmodes/cc-mode.el) c-extend-region-for-CPP: Fix an off-by-one error
  (in end of macro position).
modified:
  lisp/ChangeLog
  lisp/progmodes/cc-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-04-29 14:04:33 +0000
+++ b/lisp/ChangeLog    2010-04-29 14:48:32 +0000
@@ -1,3 +1,8 @@
+2010-04-29  Alan Mackenzie  <address@hidden>
+
+       * progmodes/cc-mode.el (c-extend-region-for-CPP): Fix an
+       off-by-one error (in end of macro position).
+
 2010-04-29  Stefan Monnier  <address@hidden>
 
        * net/browse-url.el (browse-url-firefox-program): Use iceweasel if

=== modified file 'lisp/progmodes/cc-mode.el'
--- a/lisp/progmodes/cc-mode.el 2010-04-19 15:07:52 +0000
+++ b/lisp/progmodes/cc-mode.el 2010-04-29 14:48:32 +0000
@@ -818,8 +818,10 @@
   (setq c-old-BOM (point))
 
   (goto-char end)
-  (if (c-beginning-of-macro)
-    (c-end-of-macro))
+  (when (c-beginning-of-macro)
+    (c-end-of-macro)
+    (or (eobp) (forward-char)))         ; Over the terminating NL which may be 
marked
+                                ; with a c-cpp-delimiter category property
   (setq c-old-EOM (point)))
 
 (defun c-neutralize-CPP-line (beg end)