[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 52305bc 2/2: Merge branch 'master' of git.savannah.
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] master 52305bc 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs |
Date: |
Thu, 13 Jun 2019 04:53:23 -0400 (EDT) |
branch: master
commit 52305bcb5140355b8405f4ad9aca95eee9bf2b97
Merge: 769e9fa 95c400a
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
---
lisp/progmodes/cc-mode.el | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index b8e21e2..83c0e36 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -506,6 +506,13 @@ preferably use the `c-mode-menu' language constant
directly."
;; and `after-change-functions'. Note that this variable is not set when
;; `c-before-change' is invoked by a change to text properties.
+(defvar c-syntax-table-hwm most-positive-fixnum)
+;; A workaround for `syntax-ppss''s failure to take account of changes in
+;; syntax-table text properties. This variable gets set to the lowest
+;; position where the syntax-table text property is changed, and that value
+;; gets supplied to `syntax-ppss-flush-cache' just before a font locking is
+;; due to take place.
+
(defun c-basic-common-init (mode default-style)
"Do the necessary initialization for the syntax handling routines
and the line breaking/filling code. Intended to be used by other
@@ -888,13 +895,6 @@ Note that the style variables are always made local to the
buffer."
;;; Change hooks, linking with Font Lock and electric-indent-mode.
-(defvar c-syntax-table-hwm most-positive-fixnum)
-;; A workaround for `syntax-ppss''s failure to take account of changes in
-;; syntax-table text properties. This variable gets set to the lowest
-;; position where the syntax-table text property is changed, and that value
-;; gets supplied to `syntax-ppss-flush-cache' just before a font locking is
-;; due to take place.
-
(defun c-called-from-text-property-change-p ()
;; Is the primitive which invoked `before-change-functions' or
;; `after-change-functions' one which merely changes text properties? This
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 52305bc 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs,
Eli Zaretskii <=