bug#24132: 25.1.50; Missing fontification for header names in C++ mode

[Alan Mackenzie]

Hello, Phil.

On Tue, Aug 02, 2016 at 11:17:06AM -0400, Phil wrote:

> src/emacs -Q -eval '(progn (insert "#include 
> \"foo/bar.h\"")(c++-mode)(backward-char 11)(delete-char 1) (insert "\""))'

> Expected: The header name "foo/bar.h" is fontified as string.
> Actual: the header name isn't fontified.

Thanks for taking the trouble to report this.

Could you please try out the following patch to CC Mode, and either
confirm that it solves the problem, or tell me what's still not working
properly.  Thanks in advance!  (The file to patch is in directory
.../lisp/progmodes.)

> In GNU Emacs 25.1.50.1 (x86_64-unknown-linux-gnu, GTK+ Version 3.10.8)
>  of 2016-08-02 built on unknown
> Repository revision: 53917616b0aca43b9ca85531d4dcb426885bdb73
> Windowing system distributor 'The X.Org Foundation', version 11.0.11702000
> System Description:   Ubuntu 14.04 LTS

[ .... ]

> Major mode: C++/l

> Minor modes in effect:
>   tooltip-mode: t
>   global-eldoc-mode: t
>   electric-indent-mode: t
>   mouse-wheel-mode: t
>   tool-bar-mode: t
>   menu-bar-mode: t
>   file-name-shadow-mode: t
>   global-font-lock-mode: t
>   font-lock-mode: t
>   blink-cursor-mode: t
>   auto-composition-mode: t
>   auto-encryption-mode: t
>   auto-compression-mode: t
>   line-number-mode: t
>   transient-mark-mode: t
>   abbrev-mode: t

[ .... ]



diff -r df6a39556cd1 cc-mode.el
--- a/cc-mode.el        Sat Jul 23 14:46:28 2016 +0000
+++ b/cc-mode.el        Wed Aug 03 19:56:05 2016 +0000
@@ -874,24 +874,31 @@
   ;; This function is in the C/C++/ObjC values of
   ;; `c-get-state-before-change-functions' and is called exclusively as a
   ;; before change function.
-  (c-save-buffer-state ()
+  (c-save-buffer-state (m-beg ss-found)
     (goto-char c-new-BEG)
     (while (and (< (point) beg)
-               (search-forward-regexp c-anchored-cpp-prefix beg t))
+               (search-forward-regexp c-anchored-cpp-prefix beg 'bound))
       (goto-char (match-beginning 1))
-      (let ((m-beg (point)))
-       (c-end-of-macro)
-       (c-clear-char-property-with-value
-        m-beg (min (point) beg) 'syntax-table '(1))))
+      (setq m-beg (point))
+      (c-end-of-macro)
+      (c-clear-char-property-with-value m-beg (point) 'syntax-table '(1)))
 
-    (goto-char end)
+    (while (and (< (point) end)
+               (setq ss-found
+                     (search-forward-regexp c-anchored-cpp-prefix end 'bound)))
+      (goto-char (match-beginning 1))
+      (setq m-beg (point))
+      (c-end-of-macro))
+    (if (and ss-found (> (point) end))
+       (c-clear-char-property-with-value m-beg (point) 'syntax-table '(1)))
+    
     (while (and (< (point) c-new-END)
-               (search-forward-regexp c-anchored-cpp-prefix c-new-END t))
+               (search-forward-regexp c-anchored-cpp-prefix c-new-END 'bound))
       (goto-char (match-beginning 1))
-      (let ((m-beg (point)))
-       (c-end-of-macro)
-       (c-clear-char-property-with-value
-        m-beg (min (point) c-new-END) 'syntax-table '(1))))))
+      (setq m-beg (point))
+      (c-end-of-macro)
+      (c-clear-char-property-with-value
+       m-beg (point) 'syntax-table '(1)))))
 
 (defun c-extend-region-for-CPP (beg end)
   ;; Adjust `c-new-BEG', `c-new-END' respectively to the beginning and end of


-- 
Alan Mackenzie (Nuremberg, Germany).