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

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

[nongnu] elpa/julia-mode e27e6d2 290/352: fix compilation error, silence


From: ELPA Syncer
Subject: [nongnu] elpa/julia-mode e27e6d2 290/352: fix compilation error, silence byte-compiler warnings in emacs>23
Date: Sun, 29 Aug 2021 11:23:04 -0400 (EDT)

branch: elpa/julia-mode
commit e27e6d27e199edc76c52467482419ba737a2bc2f
Author: nverno <noah.v.peart@gmail.com>
Commit: nverno <noah.v.peart@gmail.com>

    fix compilation error, silence byte-compiler warnings in emacs>23
---
 .travis.yml   |  4 ++--
 julia-mode.el | 38 +++++++++++++++++++++-----------------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5ecccec..a542264 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,9 +36,9 @@ install:
 
 script:
   - $EMACS --version
-  - $EMACS --batch --eval '(progn (push "." load-path) (byte-compile-file 
"julia-mode.el"))'
+  - $EMACS --batch -L . --eval "(and (>= emacs-major-version 24) (setq 
byte-compile-error-on-warn t))" -f batch-byte-compile julia-mode.el
   - if [ "$EMACS" != emacs23 ]; then
-      $EMACS -batch -L . -l ert -l julia-mode-tests.el -f  
ert-run-tests-batch-and-exit;
+      $EMACS -batch -L . -l ert -l julia-mode-tests.el -f 
ert-run-tests-batch-and-exit;
     fi
 
 notifications:
diff --git a/julia-mode.el b/julia-mode.el
index 2bb36f4..d54953b 100644
--- a/julia-mode.el
+++ b/julia-mode.el
@@ -363,14 +363,14 @@ Based on `python-syntax-stringify'."
         (put-text-property string-start-pos (1+ string-start-pos)
                            'syntax-table (string-to-syntax "|"))))))
 
-(unless (< emacs-major-version 24)
-  (defconst julia-syntax-propertize-function
+(defconst julia-syntax-propertize-function
+  (unless (< emacs-major-version 24)
     (syntax-propertize-rules
      ("\"\"\""
       (0 (ignore (julia-stringify-triple-quote))))
      (julia-char-regex
-      (1 "\"") ; Treat ' as a string delimiter.
-      (2 ".") ; Don't highlight anything between.
+      (1 "\"")                 ; Treat ' as a string delimiter.
+      (2 ".")                  ; Don't highlight anything between.
       (3 "\""))))) ; Treat the last " in """ as a string delimiter.
 
 (defun julia-in-comment (&optional syntax-ppss)
@@ -641,9 +641,9 @@ meaning always increase indent on TAB and decrease on 
S-TAB."
 ;;; Navigation
 ;; based off python.el
 (defconst julia-beginning-of-defun-regex
-  (eval-when-compile (concat julia-function-regex "\\|"
-                             julia-function-assignment-regex "\\|"
-                             "\\_<macro\\_>"))
+  (concat julia-function-regex "\\|"
+          julia-function-assignment-regex "\\|"
+          "\\_<macro\\_>")
   "Regex matching beginning of Julia function or macro.")
 
 (defun julia-syntax-context-type (&optional syntax-ppss)
@@ -791,12 +791,12 @@ Return nil if point is not in a function, otherwise 
point."
            (list
             `(,julia-char-regex
               (1 "\"") ; Treat ' as a string delimiter.
-              (2 ".") ; Don't highlight anything between the open and close '.
-              (3 "\"")); Treat the close ' as a string delimiter.
+              (2 ".")  ; Don't highlight anything between the open and close '.
+              (3 "\""))              ; Treat the close ' as a string delimiter.
             `(,julia-triple-quoted-string-regex
-              (1 "\"") ; Treat the first " in """ as a string delimiter.
-              (2 ".") ; Don't highlight anything between.
-              (3 "\"")))) ; Treat the last " in """ as a string delimiter.
+              (1 "\"")        ; Treat the first " in """ as a string delimiter.
+              (2 ".")         ; Don't highlight anything between.
+              (3 "\""))))     ; Treat the last " in """ as a string delimiter.
     ;; Emacs 24 and later has syntax-propertize-function, so use that instead.
     (set (make-local-variable 'syntax-propertize-function)
          julia-syntax-propertize-function))
@@ -855,6 +855,8 @@ strings."
 ;; (add-hook 'inferior-julia-mode-hook 'julia-math-mode)
 
 (when (require 'latex nil t)
+  (declare-function LaTeX-math-abbrev-prefix "latex")
+
   (defun julia-math-insert (s)
     "Inserts math symbol given by `s'"
     (when s
@@ -862,15 +864,17 @@ strings."
         (when sym
           (insert sym)))))
 
-  (define-minor-mode julia-math-mode
-    "A minor mode with easy access to TeX math commands. The
+  (with-no-warnings
+    (define-minor-mode julia-math-mode
+      "A minor mode with easy access to TeX math commands. The
 command is only entered if it is supported in Julia. The
 following commands are defined:
 
 \\{LaTeX-math-mode-map}"
-    nil nil (list (cons (LaTeX-math-abbrev-prefix) LaTeX-math-keymap))
-    (if julia-math-mode
-        (set (make-local-variable 'LaTeX-math-insert-function) 
'julia-math-insert))))
+      nil nil (list (cons (LaTeX-math-abbrev-prefix) LaTeX-math-keymap))
+      (if julia-math-mode
+          (set (make-local-variable 'LaTeX-math-insert-function)
+               'julia-math-insert)))))
 
 ;; Code for `inferior-julia-mode'
 (require 'comint)



reply via email to

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