auctex-diffs
[Top][All Lists]
Advanced

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

[AUCTeX-diffs] GNU AUCTeX branch, master, updated. 688fae25c7edd7f9d4e01


From: Mosè Giordano
Subject: [AUCTeX-diffs] GNU AUCTeX branch, master, updated. 688fae25c7edd7f9d4e019739622f3c48f0a05ac
Date: Thu, 1 Mar 2018 10:46:25 -0500 (EST)

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  688fae25c7edd7f9d4e019739622f3c48f0a05ac (commit)
      from  ed54fb1b6f4c64765ba5be4c7c2d75fbea4ecbff (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 688fae25c7edd7f9d4e019739622f3c48f0a05ac
Author: Alex Branham <address@hidden>
Date:   Thu Mar 1 09:40:03 2018 -0600

    Remove cl from AUCTeX
    
    * tex.el: replace last 'cl with 'cl-lib
    * latex.el: replace cl function with cl-lib function
    
    Signed-off-by: Mosè Giordano <address@hidden>

diff --git a/latex.el b/latex.el
index d3c2e65..d30c256 100644
--- a/latex.el
+++ b/latex.el
@@ -6545,35 +6545,35 @@ function would return non-nil and `(match-string 1)' 
would return
 
 (defun LaTeX-indent-tabular ()
   "Return indent column for the current tabular-like line."
-  (destructuring-bind
-   (beg-pos . beg-col)
-   (LaTeX-env-beginning-pos-col)
-   (let ((tabular-like-end-regex
-         (format "\\\\end{%s}"
-                 (regexp-opt
-                  (let (out)
-                    (mapc (lambda (x)
-                             (when (eq (cadr x) 'LaTeX-indent-tabular)
-                               (push (car x) out)))
-                           LaTeX-indent-environment-list)
-                    out)))))
-     (cond ((looking-at tabular-like-end-regex)
-           beg-col)
-
-          ((looking-at "\\\\\\\\")
-           (+ 2 beg-col))
-
-          ((looking-at "&")
-           (LaTeX-hanging-ampersand-position))
-
-          (t
-           (+ 2
-              (let ((any-col (save-excursion
-                               (when (re-search-backward "\\\\\\\\\\|[^\\]&" 
beg-pos t)
-                                 (current-column)))))
-                (if (and any-col (= ?& (char-before (match-end 0))))
-                    (1+ any-col)
-                  beg-col))))))))
+  (cl-destructuring-bind
+      (beg-pos . beg-col)
+      (LaTeX-env-beginning-pos-col)
+    (let ((tabular-like-end-regex
+          (format "\\\\end{%s}"
+                  (regexp-opt
+                   (let (out)
+                     (mapc (lambda (x)
+                              (when (eq (cadr x) 'LaTeX-indent-tabular)
+                                (push (car x) out)))
+                            LaTeX-indent-environment-list)
+                     out)))))
+      (cond ((looking-at tabular-like-end-regex)
+            beg-col)
+
+           ((looking-at "\\\\\\\\")
+            (+ 2 beg-col))
+
+           ((looking-at "&")
+            (LaTeX-hanging-ampersand-position))
+
+           (t
+            (+ 2
+               (let ((any-col (save-excursion
+                                (when (re-search-backward "\\\\\\\\\\|[^\\]&" 
beg-pos t)
+                                  (current-column)))))
+                 (if (and any-col (= ?& (char-before (match-end 0))))
+                     (1+ any-col)
+                   beg-col))))))))
 
 (provide 'latex)
 
diff --git a/tex.el b/tex.el
index 8863a88..b7891a1 100644
--- a/tex.el
+++ b/tex.el
@@ -1,6 +1,6 @@
 ;;; tex.el --- Support for TeX documents.
 
-;; Copyright (C) 1985-1987, 1991, 1993-2017 Free Software Foundation, Inc.
+;; Copyright (C) 1985-1987, 1991, 1993-2018 Free Software Foundation, Inc.
 
 ;; Maintainer: address@hidden
 ;; Keywords: tex
@@ -34,7 +34,7 @@
 (require 'custom)
 (require 'tex-site)
 (eval-when-compile
-  (require 'cl))
+  (require 'cl-lib))
 
 (defgroup TeX-file nil
   "Files used by AUCTeX."
@@ -2710,11 +2710,11 @@ are returned."
                (dolist (subdir subdirs)
                  (setq path (file-name-as-directory (concat item subdir)))
                  (when (file-exists-p path)
-                   (pushnew path input-dir-list :test #'equal)))
+                   (cl-pushnew path input-dir-list :test #'equal)))
              (setq path (file-name-as-directory item))
              (when (file-exists-p path)
-               (pushnew path input-dir-list :test #'equal))))
-         ;; No duplication in result is assured since `pushnew' is
+               (cl-pushnew path input-dir-list :test #'equal))))
+         ;; No duplication in result is assured since `cl-pushnew' is
          ;; used above.  Should we introduce an option for speed just
          ;; to accumulate all the results without care for
          ;; duplicates?
@@ -3131,6 +3131,7 @@ FORCE is not nil."
 
 (defcustom TeX-complete-word 'ispell-complete-word
   "*Function to call for completing non-macros in `tex-mode'."
+  :type 'function
   :group 'TeX-macro)
 
 (defcustom TeX-complete-expert-commands nil
@@ -4521,7 +4522,7 @@ EXTENSIONS defaults to `TeX-file-extensions'."
                                    "$TEXMFDIST")
                                   "latex"))
       (when (file-readable-p dir)
-        (pushnew dir list :test #'equal)))
+        (cl-pushnew dir list :test #'equal)))
     (nreverse list)))
 
 (defcustom TeX-tree-roots (TeX-tree-roots)
@@ -6404,7 +6405,7 @@ NAME may be a package, a command, or a document."
       (when (memq major-mode (nth 1 elt))
        (let ((completions (funcall (nth 2 elt))))
          (unless (null completions)
-            (pushnew (cons completions (nth 0 elt)) docs :test #'equal)))))
+            (cl-pushnew (cons completions (nth 0 elt)) docs :test #'equal)))))
     (if (null docs)
        (progn
          (if (executable-find "texdoc")
@@ -6528,7 +6529,7 @@ of the car of `ispell-tex-skip-alists'.  This only 
happens if
     (let ((raws (car ispell-tex-skip-alists))
          (envs (cadr ispell-tex-skip-alists)))
       (dolist (x skip)
-       (pushnew x raws :test #'equal))
+       (cl-pushnew x raws :test #'equal))
       (setq ispell-tex-skip-alists (list raws envs)))))
 
 (defun TeX-ispell-skip-setcdr (skip)
@@ -6541,7 +6542,7 @@ of the cdr of `ispell-tex-skip-alists'.  This only 
happens if
     (let ((raws (car ispell-tex-skip-alists))
          (envs (cadr ispell-tex-skip-alists)))
       (dolist (x skip)
-       (pushnew x envs :test #'equal))
+       (cl-pushnew x envs :test #'equal))
       (setq ispell-tex-skip-alists (list raws envs)))))
 
 (defun TeX-ispell-tex-arg-end (&optional arg1 arg2 arg3)

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

Summary of changes:
 latex.el | 58 +++++++++++++++++++++++++++++-----------------------------
 tex.el   | 19 ++++++++++---------
 2 files changed, 39 insertions(+), 38 deletions(-)


hooks/post-receive
-- 
GNU AUCTeX



reply via email to

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