[AUCTeX-diffs] GNU AUCTeX branch, master, updated. 1d72a5ceec85f507a252ccc41f9a5abda966e110

[Ikumi Keita]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU AUCTeX".

The branch, master has been updated
       via  1d72a5ceec85f507a252ccc41f9a5abda966e110 (commit)
       via  89798122cb96d78a8b56178d46a0fb40ba85342a (commit)
       via  7565d7c8d9e8bb78bdd3635824979a7bb78b2e07 (commit)
       via  68247ff4680eabcbad11853447880f5a77735112 (commit)
      from  8cd9db38c6eba5066dd02cf9166e51160f93abe9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1d72a5ceec85f507a252ccc41f9a5abda966e110
Author: Ikumi Keita <address@hidden>
Date:   Sun Jan 5 21:15:02 2020 +0900

    Remove compatibility code for older emacsen
    
    According to NEWS.22, `font-lock-extra-managed-props' is available in
    all supported emacsen.
    
    * font-latex.el (font-latex-script,font-latex-script-char): Remove
    `boundp' test for `font-lock-extra-managed-props'.
    (font-latex-unfontify-region): Don't play with `invisible' text
    property because it is now handled by font-lock thanks to
    `font-lock-extra-managed-props'.

diff --git a/font-latex.el b/font-latex.el
index 0e767c7..81e52c6 100644
--- a/font-latex.el
+++ b/font-latex.el
@@ -1375,8 +1375,7 @@ If optional argument is non-nil, print status messages."
        (if (and (eq (car-safe prop) 'raise)
                 (null (cddr prop)))
            (put-text-property beg next 'display nil))
-       (setq beg next)))
-    (remove-text-properties start end '(invisible))))
+       (setq beg next)))))
 
 (defun font-latex-after-hacking-local-variables ()
   "Refresh fontification if required by updates of file-local variables.
@@ -2054,27 +2053,15 @@ END marks boundaries for searching for quotation ends."
                    (while (eq (char-before pos) ?\\)
                      (setq pos (1- pos) odd (not odd)))
                    odd)))
-    ;; Adding other text properties than `face' is supported by
-    ;; `font-lock-apply-highlight' in CVS Emacsen since 2001-10-28.
-    ;; With the introduction of this feature the variable
-    ;; `font-lock-extra-managed-props' was introduced and serves here
-    ;; for feature checking.
-    (let ((extra-props-flag (boundp 'font-lock-extra-managed-props)))
-      (if (eq (char-after pos) ?_)
-         (if extra-props-flag
-             (font-latex--get-script-props pos :sub)
-           'font-latex-subscript-face)
-       (if extra-props-flag
-           (font-latex--get-script-props pos :super)
-         'font-latex-superscript-face)))))
+    (if (eq (char-after pos) ?_)
+       (font-latex--get-script-props pos :sub)
+      (font-latex--get-script-props pos :super))))
 
 (defun font-latex-script-char (pos)
   "Return face and display spec for subscript and superscript character at 
POS."
-  (if (boundp 'font-lock-extra-managed-props)
-      `(face font-latex-script-char-face
-            ,@(when (eq font-latex-fontify-script 'invisible)
-                '(invisible t)))
-    'font-latex-script-char-face))
+  `(face font-latex-script-char-face
+        ,@(when (eq font-latex-fontify-script 'invisible)
+            '(invisible t))))
 
 ;;; docTeX
 

commit 89798122cb96d78a8b56178d46a0fb40ba85342a
Author: Ikumi Keita <address@hidden>
Date:   Sun Jan 5 20:03:11 2020 +0900

    Don't use obsolete variable
    
    According to NEWS.20, `font-lock' no longer supports
    `font-lock-comment-start-regexp'.
    
    * font-latex.el (defvar): Remove `defvar' for
    `font-lock-comment-start-regexp'.
    (font-latex-setup): Don't include `font-lock-comment-start-regexp' in
    `font-lock-defaults'.

diff --git a/font-latex.el b/font-latex.el
index de7d5ea..0e767c7 100644
--- a/font-latex.el
+++ b/font-latex.el
@@ -1221,9 +1221,6 @@ have changed."
 
 ;;; Setup
 
-(defvar font-lock-comment-start-regexp nil
-  "Regexp to match the start of a comment.")
-
 (defvar font-latex-extend-region-functions nil
   "List of functions extending the region for multiline constructs.
 
@@ -1281,8 +1278,7 @@ triggers Font Lock to recognize the change."
          `((font-latex-keywords font-latex-keywords-1 font-latex-keywords-2)
            nil nil ,font-latex-syntax-alist nil))
        (variables
-        '((font-lock-comment-start-regexp . "%")
-          (font-lock-mark-block-function . mark-paragraph)
+        '((font-lock-mark-block-function . mark-paragraph)
           (font-lock-fontify-region-function
            . font-latex-fontify-region)
           (font-lock-unfontify-region-function

commit 7565d7c8d9e8bb78bdd3635824979a7bb78b2e07
Author: Ikumi Keita <address@hidden>
Date:   Sun Jan 5 19:44:13 2020 +0900

    Remove compatibility code for older emacsen
    
    Since `font-lock-multiline' is available in all supported emacsen, we
    no longer need `font-latex-multiline'.
    
    * font-latex.el (font-latex-setup): Remove `boundp' check.
    (font-latex-unfontify-region): Delete unnecessary code.
    (font-lock-after-change-function): Delete obsolete advice.
    (font-latex-put-multiline-property-maybe): Remove.
    (font-latex-match-command-with-arguments):
    (font-latex-match-command-in-braces):
    (font-latex-match-math-env):
    (font-latex-match-math-envII):
    (font-latex-match-quotation):
    Remove call on `font-latex-put-multiline-property-maybe'.

diff --git a/font-latex.el b/font-latex.el
index 72bd2d2..de7d5ea 100644
--- a/font-latex.el
+++ b/font-latex.el
@@ -1258,9 +1258,8 @@ triggers Font Lock to recognize the change."
   "Setup this buffer for LaTeX font-lock.  Usually called from a hook."
   (font-latex-set-syntactic-keywords)
 
-  ;; Activate multi-line fontification facilities if available.
-  (when (boundp 'font-lock-multiline)
-    (set (make-local-variable 'font-lock-multiline) t))
+  ;; Activate multi-line fontification facilities.
+  (set (make-local-variable 'font-lock-multiline) t)
 
   ;; Functions for extending the region.
   (dolist (elt '(font-latex-extend-region-backwards-command-with-args
@@ -1372,11 +1371,6 @@ If optional argument is non-nil, print status messages."
 (defun font-latex-unfontify-region (beg end &rest ignored)
   "Unfontify region from BEG to END."
   (font-lock-default-unfontify-region beg end)
-  ;; XEmacs does not provide `font-lock-extra-managed-props', so
-  ;; remove the `font-latex-multiline' property manually.  (The
-  ;; property is only added if `font-lock-multiline' is bound.)
-  (unless (boundp 'font-lock-multiline)
-    (remove-text-properties beg end '(font-latex-multiline)))
   (remove-text-properties beg end '(script-level))
   (let ((start beg))
     (while (< beg end)
@@ -1388,30 +1382,6 @@ If optional argument is non-nil, print status messages."
        (setq beg next)))
     (remove-text-properties start end '(invisible))))
 
-(defadvice font-lock-after-change-function (before font-latex-after-change
-                                                  activate)
-  "Extend region for fontification of multiline constructs.
-This is only necessary if the editor does not provide multiline
-fontification facilities like `font-lock-multiline' itself."
-  (unless (boundp 'font-lock-multiline)
-    (let ((ad-beg (ad-get-arg 0))
-         (ad-end (ad-get-arg 1)))
-      (save-excursion
-       (goto-char ad-beg)
-       (beginning-of-line)
-       (when (get-text-property (point) 'font-latex-multiline)
-         (setq ad-beg (previous-single-property-change (point)
-                                                       'font-latex-multiline))
-         (when (numberp ad-beg)
-           (ad-set-arg 0 ad-beg)))
-       (goto-char ad-end)
-       (end-of-line)
-       (when (get-text-property (point) 'font-latex-multiline)
-         (setq ad-end (next-single-property-change (point)
-                                                   'font-latex-multiline))
-         (when (numberp ad-end)
-           (ad-set-arg 1 ad-end)))))))
-
 (defun font-latex-after-hacking-local-variables ()
   "Refresh fontification if required by updates of file-local variables.
 This function is added to `hack-local-variables-hook' and
@@ -1528,16 +1498,6 @@ In docTeX mode \"%\" at the start of a line will be 
treated as whitespace."
          t))
     (forward-comment 1)))
 
-(defun font-latex-put-multiline-property-maybe (beg end)
-  "Add a multiline property if no equivalent is provided by the editor.
-The text property is used to find the start or end of a multiline
-construct when unfontifying a region.  Emacs adds such a text
-property automatically if `font-lock-multiline' is set to t and
-extends the region to be unfontified automatically as well."
-  (unless (boundp 'font-lock-multiline)
-    (put-text-property beg end 'font-latex-multiline t)))
-
-
 ;;; Match functions
 
 (defvar font-latex-matched-faces nil
@@ -1657,7 +1617,6 @@ Returns nil if none of KEYWORDS is found."
                                           (1+ error-indicator-pos))
                                     match-data))
            (push 'font-latex-warning-face font-latex-matched-faces))
-         (font-latex-put-multiline-property-maybe beg end)
          (store-match-data match-data)
          (throw 'match t))))))
 
@@ -1710,11 +1669,9 @@ Returns nil if no command is found."
              (narrow-to-region (point-min) limit)
              (forward-char -1)         ; Move on the opening bracket
              (if (font-latex-find-matching-close ?\{ ?\})
-                 (progn
-                   (font-latex-put-multiline-property-maybe beg (1- (point)))
-                   (store-match-data (list kbeg kbeg
-                                           kbeg kend
-                                           beg (1- (point)))))
+                 (store-match-data (list kbeg kbeg
+                                         kbeg kend
+                                         beg (1- (point))))
                (goto-char kend)
                (store-match-data (list (1- kbeg) kbeg
                                        kbeg kend
@@ -1816,9 +1773,7 @@ Used for patterns like:
                                      limit 'move)
                   (string= (match-string 1) close-tag))
              ;; Found closing tag.
-             (progn
-               (font-latex-put-multiline-property-maybe beg (point))
-               (store-match-data (list beg beg beg (point))))
+             (store-match-data (list beg beg beg (point)))
            ;; Did not find closing tag.
            (goto-char (+ beg 2))
            (store-match-data (list beg (point) (point) (point))))
@@ -1886,7 +1841,6 @@ The \\begin{equation} incl. arguments in the same line and
          (setq end (match-beginning 0))
        (goto-char beg)
        (setq end beg))
-      (font-latex-put-multiline-property-maybe beg end)
       (store-match-data (list beg end))
       t)))
 
@@ -1979,7 +1933,6 @@ set to french, and >>german<< (and 8-bit) are used if set 
to german."
                (progn
                  (goto-char after-beg)
                  (store-match-data (list after-beg after-beg beg after-beg)))
-             (font-latex-put-multiline-property-maybe beg (point))
              (store-match-data (list beg (point) (point) (point))))
            (throw 'match t)))))))
 

commit 68247ff4680eabcbad11853447880f5a77735112
Author: Ikumi Keita <address@hidden>
Date:   Sun Jan 5 19:33:33 2020 +0900

    Delete obsolete comment
    
    * font-latex.el: Delete obsolete comment.  `font-latex-do-multi-line'
    was removed in 2007.

diff --git a/font-latex.el b/font-latex.el
index 3b69f8f..72bd2d2 100644
--- a/font-latex.el
+++ b/font-latex.el
@@ -31,11 +31,6 @@
 ;; font-lock mode is a minor mode that causes your comments to be
 ;; displayed in one face, strings in another, reserved words in
 ;; another, and so on.
-;;
-;; ** Infinite loops !? **
-;; If you get an infinite loop, send a bug report!
-;; Then set the following in your ~/.emacs file to keep on working:
-;;   (setq font-latex-do-multi-line nil)
 
 ;;; Code:
 

-----------------------------------------------------------------------

Summary of changes:
 font-latex.el | 97 +++++++++--------------------------------------------------
 1 file changed, 14 insertions(+), 83 deletions(-)


hooks/post-receive
-- 
GNU AUCTeX