[AUCTeX-diffs] GNU AUCTeX branch, master, updated. 86de20d0b285803ead0f242be5216916bab2abc0

[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  86de20d0b285803ead0f242be5216916bab2abc0 (commit)
      from  0b24e363f829f381415fe7cc34f6386baafa9921 (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 86de20d0b285803ead0f242be5216916bab2abc0
Author: Ikumi Keita <ikumi@ikumi.que.jp>
Date:   Sun Apr 10 16:52:37 2022 +0900

    Make prettification work reliably
    
    Simplify at the same time, assuming to bump required Emacs version to
    25.1.
    
    * tex.el (TeX--prettify-symbols-compose-p): Define unconditionally.
    (VirTeX-common-initialization): Always prepare for prettification.

diff --git a/tex.el b/tex.el
index ca4b8ad3..0187459b 100644
--- a/tex.el
+++ b/tex.el
@@ -3719,14 +3719,12 @@ The algorithm is as follows:
                      answer
                    TeX-default-mode))))))
 
-(when (and (boundp 'tex--prettify-symbols-alist)
-           (boundp 'prettify-symbols-compose-predicate))
-  (defun TeX--prettify-symbols-compose-p (start end match)
-    (and (tex--prettify-symbols-compose-p start end match)
-         (not (let ((face (get-text-property end 'face)))
-                (if (consp face)
-                    (memq 'font-latex-verbatim-face face)
-                  (eq face 'font-latex-verbatim-face)))))))
+(defun TeX--prettify-symbols-compose-p (start end match)
+  (and (tex--prettify-symbols-compose-p start end match)
+       (not (let ((face (get-text-property end 'face)))
+              (if (consp face)
+                  (memq 'font-latex-verbatim-face face)
+                (eq face 'font-latex-verbatim-face))))))
 
 (defun VirTeX-common-initialization ()
   "Perform basic initialization."
@@ -3786,13 +3784,10 @@ The algorithm is as follows:
     (TeX-source-correlate-mode 1))
 
   ;; Prettify Symbols mode
-  (when (fboundp 'TeX--prettify-symbols-compose-p)
-    (set (make-local-variable 'prettify-symbols-alist) 
tex--prettify-symbols-alist)
-    (TeX--if-macro-fboundp add-function
-        (add-function :override (local 'prettify-symbols-compose-predicate)
-                      #'TeX--prettify-symbols-compose-p)
-      (set (make-local-variable 'prettify-symbols-compose-predicate)
-           #'TeX--prettify-symbols-compose-p)))
+  (require 'tex-mode)
+  (setq-local prettify-symbols-alist tex--prettify-symbols-alist)
+  (add-function :override (local 'prettify-symbols-compose-predicate)
+                #'TeX--prettify-symbols-compose-p)
 
   ;; Standard Emacs completion-at-point support
   (add-hook 'completion-at-point-functions

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

Summary of changes:
 tex.el | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
GNU AUCTeX