emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/auctex adc70b8 4/6: Fix void function error


From: Tassilo Horn
Subject: [elpa] externals/auctex adc70b8 4/6: Fix void function error
Date: Thu, 25 Mar 2021 09:45:01 -0400 (EDT)

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

    Fix void function error
    
    * font-latex.el (font-latex-make-built-in-keywords): Bring back the
    defun of `font-latex-match-*-make` before the defcustom of
    `font-latex-match-*-keywords' because the latter depends on the
    former through :set function.
    Add defvar without value to suppress byte compile warnings for
    `font-latex-match-*-keywords'.
---
 font-latex.el | 64 +++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 36 insertions(+), 28 deletions(-)

diff --git a/font-latex.el b/font-latex.el
index cf72831..75502b5 100644
--- a/font-latex.el
+++ b/font-latex.el
@@ -620,34 +620,6 @@ Use `font-latex-add-keywords' instead.
 Generated by `font-latex-make-built-in-keywords'."))
             defs)
 
-      ;; defcustom font-latex-match-*-keywords
-      (push `(defcustom ,(intern (concat prefix name "-keywords")) nil
-               ,(concat "List of keywords "
-                        (when (eq type 'command) "and formats ")
-                        "for " name " face.\n"
-                        (if (eq type 'command)
-                            "\
-Each element has to be a list consisting of the name of a macro
-omitting the leading backslash and a format specifier as
-described in the doc string of `font-latex-user-keyword-classes'."
-                          "\
-Each element has to be the name of a macro as a string, omitting
-the leading backslash.")
-                        "\n\n\
-Setting this variable directly does not take effect; restart
-Emacs.
-
-Generated by `font-latex-make-built-in-keywords'.")
-               :type '(repeat ,(if (eq type 'command)
-                                   '(list (string :tag "Keyword")
-                                          (string :tag "Format"))
-                                 '(string :tag "Keyword")))
-               :set (lambda (symbol value)
-                      (set-default symbol value)
-                      (funcall ',(intern (concat prefix name "-make"))))
-               :group 'font-latex-keywords)
-            defs)
-
       ;; defvar font-latex-match-*
       (push `(defvar-local ,(intern (concat prefix name)) nil
                ,(concat "Regular expression to match " name
@@ -656,6 +628,14 @@ Generated by `font-latex-make-built-in-keywords'.")
 Generated by `font-latex-make-built-in-keywords'"))
             defs)
 
+      ;; Put this
+      ;; defvar font-latex-match-*-keywords
+      ;; without value here just to suppress compiler
+      ;; warnings. defcustom follows the next defun because its :set
+      ;; function depends on the defun.
+      (push `(defvar ,(intern (concat prefix name "-keywords")))
+            defs)
+
       ;; defun font-latex-match-*-make
       (push `(defun ,(intern (concat prefix name "-make")) ()
                ,(concat "Make or remake the variable `" prefix name "'.
@@ -687,6 +667,34 @@ Generated by `font-latex-make-built-in-keywords'.")
                           "\\)")))))
             defs)
 
+      ;; defcustom font-latex-match-*-keywords
+      (push `(defcustom ,(intern (concat prefix name "-keywords")) nil
+               ,(concat "List of keywords "
+                        (when (eq type 'command) "and formats ")
+                        "for " name " face.\n"
+                        (if (eq type 'command)
+                            "\
+Each element has to be a list consisting of the name of a macro
+omitting the leading backslash and a format specifier as
+described in the doc string of `font-latex-user-keyword-classes'."
+                          "\
+Each element has to be the name of a macro as a string, omitting
+the leading backslash.")
+                        "\n\n\
+Setting this variable directly does not take effect; restart
+Emacs.
+
+Generated by `font-latex-make-built-in-keywords'.")
+               :type '(repeat ,(if (eq type 'command)
+                                   '(list (string :tag "Keyword")
+                                          (string :tag "Format"))
+                                 '(string :tag "Keyword")))
+               :set (lambda (symbol value)
+                      (set-default symbol value)
+                      (funcall ',(intern (concat prefix name "-make"))))
+               :group 'font-latex-keywords)
+            defs)
+
       ;; defun font-latex-match-*
       (push (font-latex--make-match-defun prefix name face type) defs)
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]