[Emacs-diffs] trunk r116378: Fix c-invalidate-state-cache on narrowed buffers.

[Alan Mackenzie]

------------------------------------------------------------
revno: 116378
revision-id: address@hidden
parent: address@hidden
committer: Alan Mackenzie <address@hidden>
branch nick: trunk
timestamp: Sun 2014-02-09 12:34:25 +0000
message:
  Fix c-invalidate-state-cache on narrowed buffers.
  progmodes/cc-defs.el (c-with-all-but-one-cpps-commented-out): Widen when
  setting and clearing the CPP delimiter properties.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/progmodes/cc-defs.el      ccdefs.el-20091113204419-o5vbwnq5f7feedwu-1226

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-02-09 06:01:33 +0000
+++ b/lisp/ChangeLog    2014-02-09 12:34:25 +0000
@@ -1,3 +1,9 @@
+2014-02-09  Alan Mackenzie  <address@hidden>
+
+       Fix c-invalidate-state-cache on narrowed buffers.
+       * progmodes/cc-defs.el (c-with-all-but-one-cpps-commented-out):
+       Widen when setting and clearing the CPP delimiter properties.
+
 2014-02-09  Lars Ingebrigtsen  <address@hidden>
 
        * help.el (describe-bindings): Doc fix (bug#9888).

=== modified file 'lisp/progmodes/cc-defs.el'
--- a/lisp/progmodes/cc-defs.el 2014-02-02 10:25:29 +0000
+++ b/lisp/progmodes/cc-defs.el 2014-02-09 12:34:25 +0000
@@ -1293,10 +1293,14 @@
   ;; suppressed.
   `(unwind-protect
        (c-save-buffer-state ()
-        (c-clear-cpp-delimiters ,beg ,end)
+        (save-restriction
+          (widen)
+          (c-clear-cpp-delimiters ,beg ,end))
         ,`(c-with-cpps-commented-out ,@forms))
      (c-save-buffer-state ()
-       (c-set-cpp-delimiters ,beg ,end))))
+       (save-restriction
+        (widen)
+        (c-set-cpp-delimiters ,beg ,end)))))
 
 (defsubst c-intersect-lists (list alist)
   ;; return the element of ALIST that matches the first element found