From: Alan Mackenzie <acm@muc.de>
Date: Thu, 25 Jun 2020 17:07:16 +0000 (+0000)
Subject: CC Mode.  Fix an off by one error.  Fixes bug #41809
X-Git-Tag: emacs-27.1.90~38
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b2ee6650243ed2777f3a6c400f194f770f00da6f;p=emacs.git

CC Mode.  Fix an off by one error.  Fixes bug #41809

* lisp/progmodes/cc-engine.el (c-full-pp-to-literal): Change > to >= (twice).
---

diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index f751e72de47..babe6e74760 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -3122,7 +3122,7 @@ comment at the start of cc-engine.el for more info."
 	       (not base)   ; FIXME!!! Compare base and far-base??
 					; (2019-05-21)
 	       (not end)
-	       (> here end))
+	       (>= here end))
 	      (progn
 		(setq far-base-and-state (c-parse-ps-state-below here)
 		      far-base (car far-base-and-state)
@@ -3135,7 +3135,7 @@ comment at the start of cc-engine.el for more info."
 	      (or
 	       (and (> here base) (null end))
 	       (null (nth 8 s))
-	       (and end (> here end))
+	       (and end (>= here end))
 	       (not
 		(or
 		 (and (nth 3 s)		; string