Re: bug#72126: closed (Bug#72126 fixed: v29.2 Java FontLock mode weirdness ?)

[Alan Mackenzie <acm@muc.de>]

[-- Attachment #1: Type: text/plain, Size: 2201 bytes --]

Hello, Jason.

On Fri, Jul 26, 2024 at 14:26:37 +0100, Jason Vas Dias wrote:


> Good day Alan, Eli, all -

>   Thank you for submitting a patch for this - as you stated :

>   > Anyhow, here's the patch.  Please apply it to
>   > ..../lisp/progmodes/cc-engine.el in your Emacs directory, and then byte
>   > compile the patched file, then load it (or start Emacs afresh).  Please
>   > test out the patched CC Mode with your real Java code, and confirm to me
>   > that the bug has indeed been fixed.  If you want any help with the
>   > patching or byte compilation, feel free to send me private email.

>   > I'm taking it that the patch works OK.  I've committed it to the
>   > emacs-30 release branch, from where it will find it way to the master
>   > branch in the next few days

>   I'd very much like to test your patch, ie. get an Emacs which fixes
>   this problem, which is most annoying when editing large amounts of Java.

>   But I could find no attached patch in any of your emails to me or on the bug
>   report.

The patch was actually inline in my email from 2024-07-14 rather than
being an attached file.  It is easier to read and comment on patches
this way unless they are big.  Normally, patch is good (in fact,
astoundingly good) at ignoring irrelevant text, so all you need to do is
save the email to a file ~/foo.patch, followed by

    $ cd .../lisp/progmodes
    $ patch < ~/foo.patch

..  However, I'm attaching the patch to this mail again, anyway.

>   Please could you send me either :
>    A) The patch, against Emacs 30 (devel branch) -
>       I can backport to v29.4  version

Will do.

>   or  
>    B) A link to the correct GIT repo, and a Commit Reference ID - again,
>       I can backport to v29.4

The commit to the emacs-30 branch was:

commit caf7426f0ca280b7cf40736e595cad8f7361152f (HEAD -> emacs-30)
Author: Alan Mackenzie <acm@muc.de>
Date:   Mon Jul 22 12:24:43 2024 +0000

    FIx spurious fontification of variable in Java Mode

>   or
>    C) The complete cc-engine.el from v29.4 with patch applied.

>   On receipt, I will test and let you know the results.

Thanks!

> Thank You & Best Regards,
> Jason

-- 
Alan Mackenzie (Nuremberg, Germany).


[-- Attachment #2: diff.20240714.diff --]
[-- Type: text/plain, Size: 736 bytes --]

diff -r aba0055b21e4 cc-engine.el
--- a/cc-engine.el	Mon Jul 01 20:21:18 2024 +0000
+++ b/cc-engine.el	Sun Jul 14 20:21:48 2024 +0000
@@ -8794,6 +8794,7 @@
   ;; This function might do hidden buffer changes.
 
   (let ((start (point))
+	(old-record-type-identifiers c-record-type-identifiers)
 	(old-found-types (copy-hash-table c-found-types))
 	;; If `c-record-type-identifiers' is set then activate
 	;; recording of any found types that constitute an argument in
@@ -8830,7 +8831,8 @@
 		    (nconc c-record-found-types c-record-type-identifiers)))
 	    t)
 
-	(setq c-found-types old-found-types)
+	(setq c-record-type-identifiers old-record-type-identifiers
+	      c-found-types old-found-types)
 	(goto-char start)
 	nil))))