From 411141fb8e659c11194b40b6fc645b7226c76d12 Mon Sep 17 00:00:00 2001 From: Alan Mackenzie Date: Sun, 9 Feb 2014 12:34:25 +0000 Subject: [PATCH] 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. --- lisp/ChangeLog | 6 ++++++ lisp/progmodes/cc-defs.el | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 39d4a83033..8f13ebaab2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2014-02-09 Alan Mackenzie + + 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 * help.el (describe-bindings): Doc fix (bug#9888). diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el index f72e2f99b1..1606cfb335 100644 --- a/lisp/progmodes/cc-defs.el +++ b/lisp/progmodes/cc-defs.el @@ -1293,10 +1293,14 @@ been put there by c-put-char-property. POINT remains unchanged." ;; 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 -- 2.20.1