[elpa] externals/auctex b2a50892b0 4/8: Refactor completion annotation code

[Tassilo Horn]

branch: externals/auctex
commit b2a50892b0431c48c65dc7e6ca24393c54fa4788
Author: Tassilo Horn <tsdh@gnu.org>
Commit: Tassilo Horn <tsdh@gnu.org>

    Refactor completion annotation code
    
    * tex.el
    (TeX--completion-annotation-from-tex--prettify-symbols-alist): New
    function.
    (TeX--completion-annotation-function): Use it.
---
 tex.el | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/tex.el b/tex.el
index a1e3b17223..e686894811 100644
--- a/tex.el
+++ b/tex.el
@@ -3242,15 +3242,22 @@ Or alternatively:
                                          (all-completions symbol list nil)))))
         (funcall (nth 1 entry))))))
 
+(defun TeX--completion-annotation-from-tex--prettify-symbols-alist (sym)
+  (when (boundp 'tex--prettify-symbols-alist)
+    (let ((ann (cdr (assoc (concat "\\" sym)
+                           tex--prettify-symbols-alist))))
+      (when ann
+        (concat " " (char-to-string ann))))))
+
+(declare-function LaTeX--completion-annotation-from-math-menu
+                  "latex" (sym))
+
 (defun TeX--completion-annotation-function (sym)
   "Annotation function for symbol/macro completion.
 Used as `:annotation-function' in `completion-extra-properties'."
-  (let ((ann (cdr (assoc (concat "\\" sym)
-                         tex--prettify-symbols-alist))))
-    (if ann
-        (concat " " (char-to-string ann))
-      (when (fboundp #'LaTeX--completion-annotation-from-math-menu)
-        (LaTeX--completion-annotation-from-math-menu sym)))))
+  (or (TeX--completion-annotation-from-tex--prettify-symbols-alist sym)
+      (and (fboundp #'LaTeX--completion-annotation-from-math-menu)
+           (LaTeX--completion-annotation-from-math-menu sym))))
 
 (defun TeX--completion-at-point ()
   "(La)TeX completion at point function.