[AUCTeX-diffs] [elpa] externals/auctex 86de20d0b2 02/14: Make prettification work reliably

[Tassilo Horn]

branch: externals/auctex
commit 86de20d0b285803ead0f242be5216916bab2abc0
Author: Ikumi Keita <ikumi@ikumi.que.jp>
Commit: Ikumi Keita <ikumi@ikumi.que.jp>

    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.
---
 tex.el | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/tex.el b/tex.el
index ca4b8ad35b..0187459b64 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