From 5859413df235e87a89257e991cc6c6fd220b2b9c Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Fri, 27 Jan 2023 11:25:08 +0100 Subject: [PATCH] ; * lisp/progmodes/cc-engine.el: Delete trailing whitespace. This was holding up the automatic merges due to commit hooks. --- lisp/progmodes/cc-engine.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index ebcb20f0f8c..2631c24f8db 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -7357,7 +7357,7 @@ multi-line strings (but not C++, for example)." (cons (match-beginning 1) (cons (match-end 1) (match-beginning 2)))) (goto-char here)))) - + (defun c-ml-string-opener-intersects-region (&optional start finish) ;; If any part of the region [START FINISH] is inside an ml-string opener, ;; return a dotted list of the start, end and double-quote position of that -- 2.39.2