[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master e8db522e43: ; * lisp/progmodes/cc-engine.el: Delete trailing whit
From: |
Stefan Kangas |
Subject: |
master e8db522e43: ; * lisp/progmodes/cc-engine.el: Delete trailing whitespace. |
Date: |
Fri, 27 Jan 2023 05:30:21 -0500 (EST) |
branch: master
commit e8db522e43701740fecc37a3f6fa7d6fb9f25ee8
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>
; * lisp/progmodes/cc-engine.el: Delete trailing whitespace.
This was holding up the automatic merges due to commit hooks.
---
lisp/progmodes/cc-engine.el | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 2ec8324036..f1e93c1c23 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
@@ -9232,7 +9232,7 @@ multi-line strings (but not C++, for example)."
;; known type match only is a prefix of another name.
(setq id-end (match-end 1))
-
+
(when (and c-record-type-identifiers
(or c-promote-possible-types (eq res t)))
(c-record-type-id (cons (match-beginning 1) (match-end 1))))
@@ -9375,7 +9375,7 @@ multi-line strings (but not C++, for example)."
(c-forward-syntactic-ws)
(setq subres (c-forward-type nil t))
(setq pos (point))))
-
+
(progn
;; If either operand certainly is a type then both are, but we
;; don't let the existence of the operator itself promote two
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master e8db522e43: ; * lisp/progmodes/cc-engine.el: Delete trailing whitespace.,
Stefan Kangas <=