From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 11 13:10:47 2018 Received: (at submit) by debbugs.gnu.org; 11 Feb 2018 18:10:47 +0000 Received: from localhost ([127.0.0.1]:38595 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ekw5N-0005SC-UR for submit@debbugs.gnu.org; Sun, 11 Feb 2018 13:10:47 -0500 Received: from eggs.gnu.org ([208.118.235.92]:47356) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ekw5M-0005Rz-Bw for submit@debbugs.gnu.org; Sun, 11 Feb 2018 13:10:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ekw5D-000767-Lj for submit@debbugs.gnu.org; Sun, 11 Feb 2018 13:10:39 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:38758) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ekw5D-00075c-Ev for submit@debbugs.gnu.org; Sun, 11 Feb 2018 13:10:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38164) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ekw58-0006Z5-V0 for bug-auctex@gnu.org; Sun, 11 Feb 2018 13:10:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ekw54-0006vM-F1 for bug-auctex@gnu.org; Sun, 11 Feb 2018 13:10:30 -0500 Received: from mail-ot0-x22b.google.com ([2607:f8b0:4003:c0f::22b]:38704) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ekw53-0006u6-Rw for bug-auctex@gnu.org; Sun, 11 Feb 2018 13:10:26 -0500 Received: by mail-ot0-x22b.google.com with SMTP id h14so12105826otj.5 for ; Sun, 11 Feb 2018 10:10:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=user-agent:from:to:subject:date:message-id:mime-version; bh=LR+mueCD/SRhrSNgic55VBhmUgSRWeUX8uD191TLvKs=; b=i31HkErRGiBeHIwR16R6x1/CRerxV3V5x5LyK8/ke2eivFHVeKDE0NFsnk4aGp12I/ SfARqSR1z9/RkiuCLznw0afd/yyaUFA5reoyYx7RIpnxUWALNXlcHSEl9UF+QbjMVC/g skOCrg3A55NtJc7dSad1cv3CkXMMzXR8NUncgH2ORsCh+CyUaa9SQEZRXjZ8c2Go4f4L cffx4ttIPjJIj8KLdbCmbeBssDhEhz3kQd7JEnfmJJbeqUJaIuPGY4XezLln/QFesmcs hLVaL+g94BrCfNfn6ADSEu9bWbJl/sXGb9R9P9vMps0uKKbAZpMAZX9Em6K505WZ5Uja IbVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:user-agent:from:to:subject:date:message-id :mime-version; bh=LR+mueCD/SRhrSNgic55VBhmUgSRWeUX8uD191TLvKs=; b=Jl4J6cJVmp37woQpSY19Qm1K1vqREqhmIZGo7aw6JtTMzH+Yh6Pok7x1P39wJ9v07Z w8AZDdBo1GNAt9+KuUvzGiG4no+6ODR+fYuNEeqbzf2oyd3pA38PCjWc/gEf75ZUHBXS lHaOWPUvxz66eQCIDCqghU56nDqf4jTLv5kdTAuY6yXmtIV+KThEEHodklwrBTN3ypYC CIugeRTI8kgCZjYeFrVgbY20f+8JhF8IZOHtf045ps01kwrxH09Ukc5SqZ2ULFm2+gXJ sR0SzcpC7FOrxM8+DVJztKRMEMRN7bl0EZ5s0Mc+/RC104d58djNe3Gf7oDJ6+rfnEO2 mNRQ== X-Gm-Message-State: APf1xPA084qBZhPBqMUdgKuelI8lSJlMi+e7ubjg9jAPFHLZ8SizWeML sRWY8CimM4OsWAIlqFSBeA1trKMU X-Google-Smtp-Source: AH8x224kZnjJDIlr5qnC/xxXEQFBgRN5z2mKR+ucyDPkTMfGn3kxyal4cwGj5NH7NmHZ4A71pfbUqg== X-Received: by 10.157.61.165 with SMTP id l34mr6670281otc.276.1518372624851; Sun, 11 Feb 2018 10:10:24 -0800 (PST) Received: from mars (cpe-70-114-192-208.austin.res.rr.com. [70.114.192.208]) by smtp.gmail.com with ESMTPSA id v81sm3252598oig.12.2018.02.11.10.10.24 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 11 Feb 2018 10:10:24 -0800 (PST) User-agent: mu4e 1.0; emacs 26.0.91 From: Alex Branham To: bug-auctex@gnu.org Subject: [patch] replace cl with cl-lib Date: Sun, 11 Feb 2018 12:10:49 -0600 Message-ID: <87wozjo0ra.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) --=-=-= Content-Type: text/plain The attached patch replaces cl with cl-lib. >From 6bc94eaee8a189af5f847878b6280c6a1a0e4b54 Mon Sep 17 00:00:00 2001 From: Alex Branham Date: Tue, 30 Jan 2018 20:56:13 -0600 Subject: [PATCH] Replace cl with cl-lib --- bib-cite.el | 5 +++-- font-latex.el | 2 +- latex.el | 3 ++- style/babel.el | 3 ++- style/caption.el | 22 +++++++++++----------- style/empheq.el | 12 ++++++------ style/enumitem.el | 18 +++++++++--------- style/floatrow.el | 17 +++++++++-------- style/fvextra.el | 9 +++++---- style/listings.el | 11 ++++++----- style/mdframed.el | 13 +++++++------ style/tcolorbox.el | 7 ++++--- 12 files changed, 65 insertions(+), 57 deletions(-) diff --git a/bib-cite.el b/bib-cite.el index 0be0eb0b..5cb8a1d2 100644 --- a/bib-cite.el +++ b/bib-cite.el @@ -589,7 +589,8 @@ ;; ---------------------------------------------------------------------------- ;;; Code: -(eval-when-compile (require 'cl)) +(eval-when-compile + (require 'cl-lib)) (defgroup bib-cite nil "bib-cite, LaTeX minor-mode to display \\cite, \\ref and \\label commands." @@ -2427,7 +2428,7 @@ bib-dos-or-os2-variable affects: (or (and (fboundp 'TeX-split-string) (TeX-split-string sep-char value)) (dired-split sep-char value))))) - (loop for x in entries if (bib-cite-file-directory-p x) collect x)))) + (cl-loop for x in entries if (bib-cite-file-directory-p x) collect x)))) (provide 'bib-cite) ;;; bib-cite.el ends here diff --git a/font-latex.el b/font-latex.el index 9b621985..1df751ad 100644 --- a/font-latex.el +++ b/font-latex.el @@ -43,7 +43,7 @@ (require 'tex) (eval-when-compile - (require 'cl)) + (require 'cl-lib)) (defgroup font-latex nil "Font-latex text highlighting package." diff --git a/latex.el b/latex.el index c2d8a4ca..05d6f55c 100644 --- a/latex.el +++ b/latex.el @@ -31,7 +31,8 @@ (require 'tex) (require 'tex-style) (require 'tex-ispell) -(eval-when-compile (require 'cl)) ;FIXME: Use cl-lib. +(eval-when-compile + (require 'cl-lib)) ;;; Syntax diff --git a/style/babel.el b/style/babel.el index c1119b9b..d8c5e3ff 100644 --- a/style/babel.el +++ b/style/babel.el @@ -30,7 +30,8 @@ ;;; Code: -(eval-when-compile (require 'cl)) +(eval-when-compile + (require 'cl-lib)) (defvar LaTeX-babel-language-list '("afrikaans" diff --git a/style/caption.el b/style/caption.el index df6328e3..f23e59da 100644 --- a/style/caption.el +++ b/style/caption.el @@ -34,8 +34,8 @@ ;;; Code: -;; Needed for compiling `pushnew': -(eval-when-compile (require 'cl)) +(eval-when-compile + (require 'cl-lib)) ;; Needed for auto-parsing. (require 'tex) @@ -168,19 +168,19 @@ in `caption'-completions." ;; For `\DeclareCaptionOption', only add the value ;; (remember: key=^^^^^^, val="defined key") (if (string-equal key "option") - (pushnew (list val) opts :test #'equal) + (cl-pushnew (list val) opts :test #'equal) ;; For anything but `\DeclareCaptionOption', do the standard ;; procedure. Again, take care of `subrefformat' for `subcaption.el'. (if val-match (progn (when (and (string-equal key "labelformat") (boundp 'LaTeX-subcaption-key-val-options)) - (pushnew (list "subrefformat" - (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) - opts :test #'equal)) - (pushnew (list key (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) - opts :test #'equal)) - (pushnew (list key (list val)) opts :test #'equal))) + (cl-pushnew (list "subrefformat" + (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) + opts :test #'equal)) + (cl-pushnew (list key (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) + opts :test #'equal)) + (cl-pushnew (list key (list val)) opts :test #'equal))) (setq LaTeX-caption-key-val-options-local (copy-alist opts)))) ;; Support for environments defined with newfloat.sty: These ;; environments are added to "type" and "type*" key: @@ -192,8 +192,8 @@ in `caption'-completions." (val-match (cdr (assoc key LaTeX-caption-key-val-options-local))) (temp (copy-alist LaTeX-caption-key-val-options-local)) (opts (assq-delete-all (car (assoc key temp)) temp))) - (pushnew (list key (TeX-delete-duplicate-strings (apply #'append val val-match))) - opts :test #'equal) + (cl-pushnew (list key (TeX-delete-duplicate-strings (apply #'append val val-match))) + opts :test #'equal) (setq LaTeX-caption-key-val-options-local (copy-alist opts)))))) (defun LaTeX-arg-caption-command (optional &optional prompt) diff --git a/style/empheq.el b/style/empheq.el index 4365136e..b0231e82 100644 --- a/style/empheq.el +++ b/style/empheq.el @@ -31,8 +31,8 @@ ;;; Code: -;; Needed for compiling `pushnew': -(eval-when-compile (require 'cl)) +(eval-when-compile + (require 'cl-lib)) ;; Needed for auto-parsing. (require 'tex) @@ -142,11 +142,11 @@ (where (cadr delims))) (if (string= where "Left") (progn - (pushnew (concat TeX-esc "empheq" delim) lval :test #'equal) - (pushnew (concat TeX-esc "empheqbig" delim) lval :test #'equal)) + (cl-pushnew (concat TeX-esc "empheq" delim) lval :test #'equal) + (cl-pushnew (concat TeX-esc "empheqbig" delim) lval :test #'equal)) (progn - (pushnew (concat TeX-esc "empheq" delim) rval :test #'equal) - (pushnew (concat TeX-esc "empheqbig" delim) rval :test #'equal))))) + (cl-pushnew (concat TeX-esc "empheq" delim) rval :test #'equal) + (cl-pushnew (concat TeX-esc "empheqbig" delim) rval :test #'equal))))) (when lval (setq tmp (assq-delete-all (car (assoc "left" tmp)) tmp)) (setq lvals (append lval lvals)) diff --git a/style/enumitem.el b/style/enumitem.el index f347446a..1518a7a6 100644 --- a/style/enumitem.el +++ b/style/enumitem.el @@ -38,8 +38,8 @@ ;;; Code: -;; Needed for compiling `pushnew': -(eval-when-compile (require 'cl)) +(eval-when-compile + (require 'cl-lib)) ;; Needed for auto-parsing. (require 'tex) @@ -266,9 +266,9 @@ in `enumitem'-completions." (temp (copy-alist LaTeX-enumitem-key-val-options-local)) (opts (assq-delete-all (car (assoc key temp)) temp))) (if val-match - (pushnew (list key (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) - opts :test #'equal) - (pushnew (list key (list val)) opts :test #'equal)) + (cl-pushnew (list key (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) + opts :test #'equal) + (cl-pushnew (list key (list val)) opts :test #'equal)) (setq LaTeX-enumitem-key-val-options-local (copy-alist opts)))) (dolist (newalign (LaTeX-enumitem-SetLabelAlign-list)) (let* ((key "align") @@ -276,8 +276,8 @@ in `enumitem'-completions." (val-match (cdr (assoc key LaTeX-enumitem-key-val-options-local))) (temp (copy-alist LaTeX-enumitem-key-val-options-local)) (opts (assq-delete-all (car (assoc key temp)) temp))) - (pushnew (list key (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) - opts :test #'equal) + (cl-pushnew (list key (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) + opts :test #'equal) (setq LaTeX-enumitem-key-val-options-local (copy-alist opts))))) (TeX-add-style-hook @@ -405,13 +405,13 @@ in `enumitem'-completions." (lambda () (let ((enums '("enumerate"))) (when (LaTeX-provided-package-options-member "enumitem" "inline") - (pushnew "enumerate*" enums :test #'equal)) + (cl-pushnew "enumerate*" enums :test #'equal)) (dolist (env-type (LaTeX-enumitem-newlist-list)) (let ((env (car env-type)) (type (cadr env-type))) (when (or (string-equal type "enumerate") (string-equal type "enumerate*")) - (pushnew env enums :test #'equal)))) + (cl-pushnew env enums :test #'equal)))) (completing-read "List name: " enums))))) ;; "Align" is added as new value to "align" key in key-val list. diff --git a/style/floatrow.el b/style/floatrow.el index 5beb1096..bc358d1b 100644 --- a/style/floatrow.el +++ b/style/floatrow.el @@ -58,8 +58,9 @@ ;;; Code: -;; Needed for compiling `pushnew': -(eval-when-compile (require 'cl)) +;; Needed for compiling `cl-pushnew': +(eval-when-compile + (require 'cl-lib)) ;; Needed for auto-parsing. (require 'tex) @@ -317,15 +318,15 @@ (assq-delete-all (car (assoc key temp)) temp))))) (cond ((string= key "precode") (dolist (x vcode-keys) - (pushnew (list x (TeX-delete-duplicate-strings (append (list val) val-match))) - opts :test #'equal))) + (cl-pushnew (list x (TeX-delete-duplicate-strings (append (list val) val-match))) + opts :test #'equal))) ((string= key "floatrowsep") (dolist (x sep-keys) - (pushnew (list x (TeX-delete-duplicate-strings (append (list val) val-match))) - opts :test #'equal))) + (cl-pushnew (list x (TeX-delete-duplicate-strings (append (list val) val-match))) + opts :test #'equal))) (t - (pushnew (list key (TeX-delete-duplicate-strings (append (list val) val-match))) - opts :test #'equal))) + (cl-pushnew (list key (TeX-delete-duplicate-strings (append (list val) val-match))) + opts :test #'equal))) (setq LaTeX-floatrow-key-val-options-local (copy-alist opts)))))) (defun LaTeX-floatrow-arg-floatbox (optional) diff --git a/style/fvextra.el b/style/fvextra.el index eeb7d37a..7f49d6cc 100644 --- a/style/fvextra.el +++ b/style/fvextra.el @@ -31,8 +31,9 @@ ;;; Code: -;; Needed for compiling `pushnew': -(eval-when-compile (require 'cl)) +;; Needed for compiling `cl-pushnew': +(eval-when-compile + (require 'cl-lib)) (defvar LaTeX-fvextra-key-val-options '(;; 3 General options @@ -99,8 +100,8 @@ (dolist (x keys) (setq tmp (assq-delete-all (car (assoc x tmp)) tmp)) (if (string= x "highlightcolor") - (pushnew (list x (mapcar #'car (funcall colorcmd))) tmp :test #'equal) - (pushnew (list x (append '("none") (mapcar #'car (funcall colorcmd)))) tmp :test #'equal))) + (cl-pushnew (list x (mapcar #'car (funcall colorcmd))) tmp :test #'equal) + (cl-pushnew (list x (append '("none") (mapcar #'car (funcall colorcmd)))) tmp :test #'equal))) (setq LaTeX-fancyvrb-key-val-options-local (copy-alist tmp))))) diff --git a/style/listings.el b/style/listings.el index 73ddc00f..52adba34 100644 --- a/style/listings.el +++ b/style/listings.el @@ -40,8 +40,9 @@ ;;; Code: -;; Needed for compiling `pushnew': -(eval-when-compile (require 'cl)) +;; Needed for compiling `cl-pushnew': +(eval-when-compile + (require 'cl-lib)) ;; The following are options taken from chapter 4 of the listings ;; manual (2007/02/22 Version 1.4). @@ -284,9 +285,9 @@ with user-defined values via the \"lstdefinestyle\" macro." (key (car elt)) (temp (copy-alist LaTeX-listings-key-val-options-local)) (opts (assq-delete-all (car (assoc key temp)) temp))) - (pushnew (list key (TeX-delete-duplicate-strings - (mapcar #'car (LaTeX-listings-lstdefinestyle-list)))) - opts :test #'equal) + (cl-pushnew (list key (TeX-delete-duplicate-strings + (mapcar #'car (LaTeX-listings-lstdefinestyle-list)))) + opts :test #'equal) (setq LaTeX-listings-key-val-options-local (copy-alist opts)))) diff --git a/style/mdframed.el b/style/mdframed.el index cd26e3fd..ed643dac 100644 --- a/style/mdframed.el +++ b/style/mdframed.el @@ -37,8 +37,9 @@ ;;; Code: -;; Needed for compiling `pushnew': -(eval-when-compile (require 'cl)) +;; Needed for compiling `cl-pushnew': +(eval-when-compile + (require 'cl-lib)) ;; Needed for auto-parsing. (require 'tex) @@ -214,9 +215,9 @@ (val (cadr (assoc "style" LaTeX-mdframed-key-val-options))) (temp (copy-alist LaTeX-mdframed-key-val-options-local)) (opts (assq-delete-all (car (assoc key temp)) temp))) - (pushnew (list key (TeX-delete-duplicate-strings - (append val (mapcar #'car (LaTeX-mdframed-mdfdefinestyle-list))))) - opts :test #'equal) + (cl-pushnew (list key (TeX-delete-duplicate-strings + (append val (mapcar #'car (LaTeX-mdframed-mdfdefinestyle-list))))) + opts :test #'equal) (setq LaTeX-mdframed-key-val-options-local (copy-alist opts)))) ;; @@ -242,7 +243,7 @@ (tmp (copy-alist LaTeX-mdframed-key-val-options-local))) (dolist (x keys) (setq tmp (assq-delete-all (car (assoc x tmp)) tmp)) - (pushnew (list x (mapcar #'car (funcall colorcmd))) tmp :test #'equal)) + (cl-pushnew (list x (mapcar #'car (funcall colorcmd))) tmp :test #'equal)) (setq LaTeX-mdframed-key-val-options-local (copy-alist tmp))))) diff --git a/style/tcolorbox.el b/style/tcolorbox.el index 6805983b..b8e65122 100644 --- a/style/tcolorbox.el +++ b/style/tcolorbox.el @@ -40,8 +40,9 @@ ;;; Code: -;; Needed for compiling `pushnew': -(eval-when-compile (require 'cl)) +;; Needed for compiling `cl-pushnew': +(eval-when-compile + (require 'cl-lib)) ;; Needed for auto-parsing. (require 'tex) @@ -476,7 +477,7 @@ e.g. \"tcolorboxlib-raster.el\"." (tmp (copy-alist LaTeX-tcolorbox-keyval-options-local))) (dolist (key keys) (setq tmp (assq-delete-all (car (assoc key tmp)) tmp)) - (pushnew + (cl-pushnew (list key (mapcar #'car (LaTeX-xcolor-definecolor-list))) tmp :test #'equal)) (setq LaTeX-tcolorbox-keyval-options-local (copy-alist tmp))) (setq LaTeX-tcolorbox-keyval-options-full -- 2.16.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Replace-cl-with-cl-lib.patch >From 6bc94eaee8a189af5f847878b6280c6a1a0e4b54 Mon Sep 17 00:00:00 2001 From: Alex Branham Date: Tue, 30 Jan 2018 20:56:13 -0600 Subject: [PATCH] Replace cl with cl-lib --- bib-cite.el | 5 +++-- font-latex.el | 2 +- latex.el | 3 ++- style/babel.el | 3 ++- style/caption.el | 22 +++++++++++----------- style/empheq.el | 12 ++++++------ style/enumitem.el | 18 +++++++++--------- style/floatrow.el | 17 +++++++++-------- style/fvextra.el | 9 +++++---- style/listings.el | 11 ++++++----- style/mdframed.el | 13 +++++++------ style/tcolorbox.el | 7 ++++--- 12 files changed, 65 insertions(+), 57 deletions(-) diff --git a/bib-cite.el b/bib-cite.el index 0be0eb0b..5cb8a1d2 100644 --- a/bib-cite.el +++ b/bib-cite.el @@ -589,7 +589,8 @@ ;; ---------------------------------------------------------------------------- ;;; Code: -(eval-when-compile (require 'cl)) +(eval-when-compile + (require 'cl-lib)) (defgroup bib-cite nil "bib-cite, LaTeX minor-mode to display \\cite, \\ref and \\label commands." @@ -2427,7 +2428,7 @@ bib-dos-or-os2-variable affects: (or (and (fboundp 'TeX-split-string) (TeX-split-string sep-char value)) (dired-split sep-char value))))) - (loop for x in entries if (bib-cite-file-directory-p x) collect x)))) + (cl-loop for x in entries if (bib-cite-file-directory-p x) collect x)))) (provide 'bib-cite) ;;; bib-cite.el ends here diff --git a/font-latex.el b/font-latex.el index 9b621985..1df751ad 100644 --- a/font-latex.el +++ b/font-latex.el @@ -43,7 +43,7 @@ (require 'tex) (eval-when-compile - (require 'cl)) + (require 'cl-lib)) (defgroup font-latex nil "Font-latex text highlighting package." diff --git a/latex.el b/latex.el index c2d8a4ca..05d6f55c 100644 --- a/latex.el +++ b/latex.el @@ -31,7 +31,8 @@ (require 'tex) (require 'tex-style) (require 'tex-ispell) -(eval-when-compile (require 'cl)) ;FIXME: Use cl-lib. +(eval-when-compile + (require 'cl-lib)) ;;; Syntax diff --git a/style/babel.el b/style/babel.el index c1119b9b..d8c5e3ff 100644 --- a/style/babel.el +++ b/style/babel.el @@ -30,7 +30,8 @@ ;;; Code: -(eval-when-compile (require 'cl)) +(eval-when-compile + (require 'cl-lib)) (defvar LaTeX-babel-language-list '("afrikaans" diff --git a/style/caption.el b/style/caption.el index df6328e3..f23e59da 100644 --- a/style/caption.el +++ b/style/caption.el @@ -34,8 +34,8 @@ ;;; Code: -;; Needed for compiling `pushnew': -(eval-when-compile (require 'cl)) +(eval-when-compile + (require 'cl-lib)) ;; Needed for auto-parsing. (require 'tex) @@ -168,19 +168,19 @@ in `caption'-completions." ;; For `\DeclareCaptionOption', only add the value ;; (remember: key=^^^^^^, val="defined key") (if (string-equal key "option") - (pushnew (list val) opts :test #'equal) + (cl-pushnew (list val) opts :test #'equal) ;; For anything but `\DeclareCaptionOption', do the standard ;; procedure. Again, take care of `subrefformat' for `subcaption.el'. (if val-match (progn (when (and (string-equal key "labelformat") (boundp 'LaTeX-subcaption-key-val-options)) - (pushnew (list "subrefformat" - (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) - opts :test #'equal)) - (pushnew (list key (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) - opts :test #'equal)) - (pushnew (list key (list val)) opts :test #'equal))) + (cl-pushnew (list "subrefformat" + (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) + opts :test #'equal)) + (cl-pushnew (list key (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) + opts :test #'equal)) + (cl-pushnew (list key (list val)) opts :test #'equal))) (setq LaTeX-caption-key-val-options-local (copy-alist opts)))) ;; Support for environments defined with newfloat.sty: These ;; environments are added to "type" and "type*" key: @@ -192,8 +192,8 @@ in `caption'-completions." (val-match (cdr (assoc key LaTeX-caption-key-val-options-local))) (temp (copy-alist LaTeX-caption-key-val-options-local)) (opts (assq-delete-all (car (assoc key temp)) temp))) - (pushnew (list key (TeX-delete-duplicate-strings (apply #'append val val-match))) - opts :test #'equal) + (cl-pushnew (list key (TeX-delete-duplicate-strings (apply #'append val val-match))) + opts :test #'equal) (setq LaTeX-caption-key-val-options-local (copy-alist opts)))))) (defun LaTeX-arg-caption-command (optional &optional prompt) diff --git a/style/empheq.el b/style/empheq.el index 4365136e..b0231e82 100644 --- a/style/empheq.el +++ b/style/empheq.el @@ -31,8 +31,8 @@ ;;; Code: -;; Needed for compiling `pushnew': -(eval-when-compile (require 'cl)) +(eval-when-compile + (require 'cl-lib)) ;; Needed for auto-parsing. (require 'tex) @@ -142,11 +142,11 @@ (where (cadr delims))) (if (string= where "Left") (progn - (pushnew (concat TeX-esc "empheq" delim) lval :test #'equal) - (pushnew (concat TeX-esc "empheqbig" delim) lval :test #'equal)) + (cl-pushnew (concat TeX-esc "empheq" delim) lval :test #'equal) + (cl-pushnew (concat TeX-esc "empheqbig" delim) lval :test #'equal)) (progn - (pushnew (concat TeX-esc "empheq" delim) rval :test #'equal) - (pushnew (concat TeX-esc "empheqbig" delim) rval :test #'equal))))) + (cl-pushnew (concat TeX-esc "empheq" delim) rval :test #'equal) + (cl-pushnew (concat TeX-esc "empheqbig" delim) rval :test #'equal))))) (when lval (setq tmp (assq-delete-all (car (assoc "left" tmp)) tmp)) (setq lvals (append lval lvals)) diff --git a/style/enumitem.el b/style/enumitem.el index f347446a..1518a7a6 100644 --- a/style/enumitem.el +++ b/style/enumitem.el @@ -38,8 +38,8 @@ ;;; Code: -;; Needed for compiling `pushnew': -(eval-when-compile (require 'cl)) +(eval-when-compile + (require 'cl-lib)) ;; Needed for auto-parsing. (require 'tex) @@ -266,9 +266,9 @@ in `enumitem'-completions." (temp (copy-alist LaTeX-enumitem-key-val-options-local)) (opts (assq-delete-all (car (assoc key temp)) temp))) (if val-match - (pushnew (list key (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) - opts :test #'equal) - (pushnew (list key (list val)) opts :test #'equal)) + (cl-pushnew (list key (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) + opts :test #'equal) + (cl-pushnew (list key (list val)) opts :test #'equal)) (setq LaTeX-enumitem-key-val-options-local (copy-alist opts)))) (dolist (newalign (LaTeX-enumitem-SetLabelAlign-list)) (let* ((key "align") @@ -276,8 +276,8 @@ in `enumitem'-completions." (val-match (cdr (assoc key LaTeX-enumitem-key-val-options-local))) (temp (copy-alist LaTeX-enumitem-key-val-options-local)) (opts (assq-delete-all (car (assoc key temp)) temp))) - (pushnew (list key (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) - opts :test #'equal) + (cl-pushnew (list key (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) + opts :test #'equal) (setq LaTeX-enumitem-key-val-options-local (copy-alist opts))))) (TeX-add-style-hook @@ -405,13 +405,13 @@ in `enumitem'-completions." (lambda () (let ((enums '("enumerate"))) (when (LaTeX-provided-package-options-member "enumitem" "inline") - (pushnew "enumerate*" enums :test #'equal)) + (cl-pushnew "enumerate*" enums :test #'equal)) (dolist (env-type (LaTeX-enumitem-newlist-list)) (let ((env (car env-type)) (type (cadr env-type))) (when (or (string-equal type "enumerate") (string-equal type "enumerate*")) - (pushnew env enums :test #'equal)))) + (cl-pushnew env enums :test #'equal)))) (completing-read "List name: " enums))))) ;; "Align" is added as new value to "align" key in key-val list. diff --git a/style/floatrow.el b/style/floatrow.el index 5beb1096..bc358d1b 100644 --- a/style/floatrow.el +++ b/style/floatrow.el @@ -58,8 +58,9 @@ ;;; Code: -;; Needed for compiling `pushnew': -(eval-when-compile (require 'cl)) +;; Needed for compiling `cl-pushnew': +(eval-when-compile + (require 'cl-lib)) ;; Needed for auto-parsing. (require 'tex) @@ -317,15 +318,15 @@ (assq-delete-all (car (assoc key temp)) temp))))) (cond ((string= key "precode") (dolist (x vcode-keys) - (pushnew (list x (TeX-delete-duplicate-strings (append (list val) val-match))) - opts :test #'equal))) + (cl-pushnew (list x (TeX-delete-duplicate-strings (append (list val) val-match))) + opts :test #'equal))) ((string= key "floatrowsep") (dolist (x sep-keys) - (pushnew (list x (TeX-delete-duplicate-strings (append (list val) val-match))) - opts :test #'equal))) + (cl-pushnew (list x (TeX-delete-duplicate-strings (append (list val) val-match))) + opts :test #'equal))) (t - (pushnew (list key (TeX-delete-duplicate-strings (append (list val) val-match))) - opts :test #'equal))) + (cl-pushnew (list key (TeX-delete-duplicate-strings (append (list val) val-match))) + opts :test #'equal))) (setq LaTeX-floatrow-key-val-options-local (copy-alist opts)))))) (defun LaTeX-floatrow-arg-floatbox (optional) diff --git a/style/fvextra.el b/style/fvextra.el index eeb7d37a..7f49d6cc 100644 --- a/style/fvextra.el +++ b/style/fvextra.el @@ -31,8 +31,9 @@ ;;; Code: -;; Needed for compiling `pushnew': -(eval-when-compile (require 'cl)) +;; Needed for compiling `cl-pushnew': +(eval-when-compile + (require 'cl-lib)) (defvar LaTeX-fvextra-key-val-options '(;; 3 General options @@ -99,8 +100,8 @@ (dolist (x keys) (setq tmp (assq-delete-all (car (assoc x tmp)) tmp)) (if (string= x "highlightcolor") - (pushnew (list x (mapcar #'car (funcall colorcmd))) tmp :test #'equal) - (pushnew (list x (append '("none") (mapcar #'car (funcall colorcmd)))) tmp :test #'equal))) + (cl-pushnew (list x (mapcar #'car (funcall colorcmd))) tmp :test #'equal) + (cl-pushnew (list x (append '("none") (mapcar #'car (funcall colorcmd)))) tmp :test #'equal))) (setq LaTeX-fancyvrb-key-val-options-local (copy-alist tmp))))) diff --git a/style/listings.el b/style/listings.el index 73ddc00f..52adba34 100644 --- a/style/listings.el +++ b/style/listings.el @@ -40,8 +40,9 @@ ;;; Code: -;; Needed for compiling `pushnew': -(eval-when-compile (require 'cl)) +;; Needed for compiling `cl-pushnew': +(eval-when-compile + (require 'cl-lib)) ;; The following are options taken from chapter 4 of the listings ;; manual (2007/02/22 Version 1.4). @@ -284,9 +285,9 @@ with user-defined values via the \"lstdefinestyle\" macro." (key (car elt)) (temp (copy-alist LaTeX-listings-key-val-options-local)) (opts (assq-delete-all (car (assoc key temp)) temp))) - (pushnew (list key (TeX-delete-duplicate-strings - (mapcar #'car (LaTeX-listings-lstdefinestyle-list)))) - opts :test #'equal) + (cl-pushnew (list key (TeX-delete-duplicate-strings + (mapcar #'car (LaTeX-listings-lstdefinestyle-list)))) + opts :test #'equal) (setq LaTeX-listings-key-val-options-local (copy-alist opts)))) diff --git a/style/mdframed.el b/style/mdframed.el index cd26e3fd..ed643dac 100644 --- a/style/mdframed.el +++ b/style/mdframed.el @@ -37,8 +37,9 @@ ;;; Code: -;; Needed for compiling `pushnew': -(eval-when-compile (require 'cl)) +;; Needed for compiling `cl-pushnew': +(eval-when-compile + (require 'cl-lib)) ;; Needed for auto-parsing. (require 'tex) @@ -214,9 +215,9 @@ (val (cadr (assoc "style" LaTeX-mdframed-key-val-options))) (temp (copy-alist LaTeX-mdframed-key-val-options-local)) (opts (assq-delete-all (car (assoc key temp)) temp))) - (pushnew (list key (TeX-delete-duplicate-strings - (append val (mapcar #'car (LaTeX-mdframed-mdfdefinestyle-list))))) - opts :test #'equal) + (cl-pushnew (list key (TeX-delete-duplicate-strings + (append val (mapcar #'car (LaTeX-mdframed-mdfdefinestyle-list))))) + opts :test #'equal) (setq LaTeX-mdframed-key-val-options-local (copy-alist opts)))) ;; @@ -242,7 +243,7 @@ (tmp (copy-alist LaTeX-mdframed-key-val-options-local))) (dolist (x keys) (setq tmp (assq-delete-all (car (assoc x tmp)) tmp)) - (pushnew (list x (mapcar #'car (funcall colorcmd))) tmp :test #'equal)) + (cl-pushnew (list x (mapcar #'car (funcall colorcmd))) tmp :test #'equal)) (setq LaTeX-mdframed-key-val-options-local (copy-alist tmp))))) diff --git a/style/tcolorbox.el b/style/tcolorbox.el index 6805983b..b8e65122 100644 --- a/style/tcolorbox.el +++ b/style/tcolorbox.el @@ -40,8 +40,9 @@ ;;; Code: -;; Needed for compiling `pushnew': -(eval-when-compile (require 'cl)) +;; Needed for compiling `cl-pushnew': +(eval-when-compile + (require 'cl-lib)) ;; Needed for auto-parsing. (require 'tex) @@ -476,7 +477,7 @@ e.g. \"tcolorboxlib-raster.el\"." (tmp (copy-alist LaTeX-tcolorbox-keyval-options-local))) (dolist (key keys) (setq tmp (assq-delete-all (car (assoc key tmp)) tmp)) - (pushnew + (cl-pushnew (list key (mapcar #'car (LaTeX-xcolor-definecolor-list))) tmp :test #'equal)) (setq LaTeX-tcolorbox-keyval-options-local (copy-alist tmp))) (setq LaTeX-tcolorbox-keyval-options-full -- 2.16.1 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 14 10:43:39 2018 Received: (at 30424) by debbugs.gnu.org; 14 Feb 2018 15:43:39 +0000 Received: from localhost ([127.0.0.1]:43047 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1elzDe-0008CW-6c for submit@debbugs.gnu.org; Wed, 14 Feb 2018 10:43:39 -0500 Received: from mail-ot0-f174.google.com ([74.125.82.174]:40492) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1elzDa-0008CE-Se for 30424@debbugs.gnu.org; Wed, 14 Feb 2018 10:43:36 -0500 Received: by mail-ot0-f174.google.com with SMTP id s4so20713449oth.7 for <30424@debbugs.gnu.org>; Wed, 14 Feb 2018 07:43:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=references:user-agent:from:to:subject:in-reply-to:date:message-id :mime-version; bh=wswfNMptKedEirRROqS5sHsW3tiRO4zZ6/PQMK7WHh8=; b=pt6Vl+6gxgBQQfYX0m5iGU3uDJftJtj7qM2U8HrdQo6zRgR1RKTWk8ebBYbwPD/xxH zeRwWuVkx8QHgaRHpZ3YzRUcoC6Fw+xDLjfeZqKklXo4ZDcEF5j4TNk2qPv/Z4vsOmNi kaoS0MmhOrFDBINShh9Lk8IB/+E+me13VhPvYo5WsqZ5rhVNJhEeFcTU9wGmygrcHZuL b2JCWS7sIIP5GZyHBLBVEs9tUcnouYe70bulIAAeK0tXtPwLdnFqpc2A3xYAFDByV+dB 5mf3ULsdIjaIW7HyfwJWLpMMlHWDisE9U0J9cy53yNk2pe+LKx7TZiA8aaqC1AZQNHVQ jt/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:references:user-agent:from:to:subject :in-reply-to:date:message-id:mime-version; bh=wswfNMptKedEirRROqS5sHsW3tiRO4zZ6/PQMK7WHh8=; b=uhlq12t1668ZDPUFl5LjUMx7vvzG6FpUbKEySIeuQeSLS/sp2F1O7NBBRKhI7InVOq qfFEYqTNdoHVOFXas34qWmJrDC2MlchZXEybZWFiytVQmThx/J6qc8CfjyRLtqPlyqy9 8i6yDQ/XHXfXh5YHYV/TB+D2UNlKpRtHK5NybOE9mkjCVVbv3agyqe6PtKqROcZdLDCr 7gaG3cXiyXurp71iYrKYxmTu+ckG9JGHFi2ipkb/Uwk9o6gvE+4vfrZLyiZN+5MZwQSX eOf+k9m+VqWGmMfC/LrS0JCjtL7P6S/EEy/RC+YIwN6boMFggHnl60PpNK/OkLs0CwkP fnXw== X-Gm-Message-State: APf1xPDXwsbpiNhSHqALgupv81EZA2Ip/uUqH75FSMgdljgnvS1WsaOP NQhlidTsptlnEEiElZFJi6kBV+Vt X-Google-Smtp-Source: AH8x227bHkOolmv5dBZTp03Oqnh/lD4IpXi+Nsi8sFHiq1HuaxZAaQAcR74SLOkhvXAoUsEx7xT9nQ== X-Received: by 10.157.27.145 with SMTP id z17mr3587994otd.285.1518623008731; Wed, 14 Feb 2018 07:43:28 -0800 (PST) Received: from mars (nat-128-62-58-57.public.utexas.edu. [128.62.58.57]) by smtp.gmail.com with ESMTPSA id p128sm2731839oif.17.2018.02.14.07.43.28 for <30424@debbugs.gnu.org> (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Feb 2018 07:43:28 -0800 (PST) References: <87wozjo0ra.fsf@gmail.com> User-agent: mu4e 1.0; emacs 26.0.91 From: Alex Branham To: 30424@debbugs.gnu.org Subject: Re: [patch] replace cl with cl-lib In-reply-to: <87wozjo0ra.fsf@gmail.com> Date: Wed, 14 Feb 2018 09:43:56 -0600 Message-ID: <878tbva85f.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 30424 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Turns out that this patch breaks font locking in some cases. I'll look into it and report back later. On Sun 11 Feb 2018 at 12:10, Alex Branham wrote: > The attached patch replaces cl with cl-lib. > > From 6bc94eaee8a189af5f847878b6280c6a1a0e4b54 Mon Sep 17 00:00:00 2001 > From: Alex Branham > Date: Tue, 30 Jan 2018 20:56:13 -0600 > Subject: [PATCH] Replace cl with cl-lib > > --- > bib-cite.el | 5 +++-- > font-latex.el | 2 +- > latex.el | 3 ++- > style/babel.el | 3 ++- > style/caption.el | 22 +++++++++++----------- > style/empheq.el | 12 ++++++------ > style/enumitem.el | 18 +++++++++--------- > style/floatrow.el | 17 +++++++++-------- > style/fvextra.el | 9 +++++---- > style/listings.el | 11 ++++++----- > style/mdframed.el | 13 +++++++------ > style/tcolorbox.el | 7 ++++--- > 12 files changed, 65 insertions(+), 57 deletions(-) > > diff --git a/bib-cite.el b/bib-cite.el > index 0be0eb0b..5cb8a1d2 100644 > --- a/bib-cite.el > +++ b/bib-cite.el > @@ -589,7 +589,8 @@ > ;; ---------------------------------------------------------------------------- > ;;; Code: > > -(eval-when-compile (require 'cl)) > +(eval-when-compile > + (require 'cl-lib)) > > (defgroup bib-cite nil > "bib-cite, LaTeX minor-mode to display \\cite, \\ref and \\label commands." > @@ -2427,7 +2428,7 @@ bib-dos-or-os2-variable affects: > (or (and (fboundp 'TeX-split-string) > (TeX-split-string sep-char value)) > (dired-split sep-char value))))) > - (loop for x in entries if (bib-cite-file-directory-p x) collect x)))) > + (cl-loop for x in entries if (bib-cite-file-directory-p x) collect x)))) > > (provide 'bib-cite) > ;;; bib-cite.el ends here > diff --git a/font-latex.el b/font-latex.el > index 9b621985..1df751ad 100644 > --- a/font-latex.el > +++ b/font-latex.el > @@ -43,7 +43,7 @@ > (require 'tex) > > (eval-when-compile > - (require 'cl)) > + (require 'cl-lib)) > > (defgroup font-latex nil > "Font-latex text highlighting package." > diff --git a/latex.el b/latex.el > index c2d8a4ca..05d6f55c 100644 > --- a/latex.el > +++ b/latex.el > @@ -31,7 +31,8 @@ > (require 'tex) > (require 'tex-style) > (require 'tex-ispell) > -(eval-when-compile (require 'cl)) ;FIXME: Use cl-lib. > +(eval-when-compile > + (require 'cl-lib)) > > ;;; Syntax > > diff --git a/style/babel.el b/style/babel.el > index c1119b9b..d8c5e3ff 100644 > --- a/style/babel.el > +++ b/style/babel.el > @@ -30,7 +30,8 @@ > > ;;; Code: > > -(eval-when-compile (require 'cl)) > +(eval-when-compile > + (require 'cl-lib)) > > (defvar LaTeX-babel-language-list > '("afrikaans" > diff --git a/style/caption.el b/style/caption.el > index df6328e3..f23e59da 100644 > --- a/style/caption.el > +++ b/style/caption.el > @@ -34,8 +34,8 @@ > > ;;; Code: > > -;; Needed for compiling `pushnew': > -(eval-when-compile (require 'cl)) > +(eval-when-compile > + (require 'cl-lib)) > > ;; Needed for auto-parsing. > (require 'tex) > @@ -168,19 +168,19 @@ in `caption'-completions." > ;; For `\DeclareCaptionOption', only add the value > ;; (remember: key=^^^^^^, val="defined key") > (if (string-equal key "option") > - (pushnew (list val) opts :test #'equal) > + (cl-pushnew (list val) opts :test #'equal) > ;; For anything but `\DeclareCaptionOption', do the standard > ;; procedure. Again, take care of `subrefformat' for `subcaption.el'. > (if val-match > (progn > (when (and (string-equal key "labelformat") > (boundp 'LaTeX-subcaption-key-val-options)) > - (pushnew (list "subrefformat" > - (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) > - opts :test #'equal)) > - (pushnew (list key (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) > - opts :test #'equal)) > - (pushnew (list key (list val)) opts :test #'equal))) > + (cl-pushnew (list "subrefformat" > + (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) > + opts :test #'equal)) > + (cl-pushnew (list key (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) > + opts :test #'equal)) > + (cl-pushnew (list key (list val)) opts :test #'equal))) > (setq LaTeX-caption-key-val-options-local (copy-alist opts)))) > ;; Support for environments defined with newfloat.sty: These > ;; environments are added to "type" and "type*" key: > @@ -192,8 +192,8 @@ in `caption'-completions." > (val-match (cdr (assoc key LaTeX-caption-key-val-options-local))) > (temp (copy-alist LaTeX-caption-key-val-options-local)) > (opts (assq-delete-all (car (assoc key temp)) temp))) > - (pushnew (list key (TeX-delete-duplicate-strings (apply #'append val val-match))) > - opts :test #'equal) > + (cl-pushnew (list key (TeX-delete-duplicate-strings (apply #'append val val-match))) > + opts :test #'equal) > (setq LaTeX-caption-key-val-options-local (copy-alist opts)))))) > > (defun LaTeX-arg-caption-command (optional &optional prompt) > diff --git a/style/empheq.el b/style/empheq.el > index 4365136e..b0231e82 100644 > --- a/style/empheq.el > +++ b/style/empheq.el > @@ -31,8 +31,8 @@ > > ;;; Code: > > -;; Needed for compiling `pushnew': > -(eval-when-compile (require 'cl)) > +(eval-when-compile > + (require 'cl-lib)) > > ;; Needed for auto-parsing. > (require 'tex) > @@ -142,11 +142,11 @@ > (where (cadr delims))) > (if (string= where "Left") > (progn > - (pushnew (concat TeX-esc "empheq" delim) lval :test #'equal) > - (pushnew (concat TeX-esc "empheqbig" delim) lval :test #'equal)) > + (cl-pushnew (concat TeX-esc "empheq" delim) lval :test #'equal) > + (cl-pushnew (concat TeX-esc "empheqbig" delim) lval :test #'equal)) > (progn > - (pushnew (concat TeX-esc "empheq" delim) rval :test #'equal) > - (pushnew (concat TeX-esc "empheqbig" delim) rval :test #'equal))))) > + (cl-pushnew (concat TeX-esc "empheq" delim) rval :test #'equal) > + (cl-pushnew (concat TeX-esc "empheqbig" delim) rval :test #'equal))))) > (when lval > (setq tmp (assq-delete-all (car (assoc "left" tmp)) tmp)) > (setq lvals (append lval lvals)) > diff --git a/style/enumitem.el b/style/enumitem.el > index f347446a..1518a7a6 100644 > --- a/style/enumitem.el > +++ b/style/enumitem.el > @@ -38,8 +38,8 @@ > > ;;; Code: > > -;; Needed for compiling `pushnew': > -(eval-when-compile (require 'cl)) > +(eval-when-compile > + (require 'cl-lib)) > > ;; Needed for auto-parsing. > (require 'tex) > @@ -266,9 +266,9 @@ in `enumitem'-completions." > (temp (copy-alist LaTeX-enumitem-key-val-options-local)) > (opts (assq-delete-all (car (assoc key temp)) temp))) > (if val-match > - (pushnew (list key (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) > - opts :test #'equal) > - (pushnew (list key (list val)) opts :test #'equal)) > + (cl-pushnew (list key (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) > + opts :test #'equal) > + (cl-pushnew (list key (list val)) opts :test #'equal)) > (setq LaTeX-enumitem-key-val-options-local (copy-alist opts)))) > (dolist (newalign (LaTeX-enumitem-SetLabelAlign-list)) > (let* ((key "align") > @@ -276,8 +276,8 @@ in `enumitem'-completions." > (val-match (cdr (assoc key LaTeX-enumitem-key-val-options-local))) > (temp (copy-alist LaTeX-enumitem-key-val-options-local)) > (opts (assq-delete-all (car (assoc key temp)) temp))) > - (pushnew (list key (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) > - opts :test #'equal) > + (cl-pushnew (list key (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) > + opts :test #'equal) > (setq LaTeX-enumitem-key-val-options-local (copy-alist opts))))) > > (TeX-add-style-hook > @@ -405,13 +405,13 @@ in `enumitem'-completions." > (lambda () > (let ((enums '("enumerate"))) > (when (LaTeX-provided-package-options-member "enumitem" "inline") > - (pushnew "enumerate*" enums :test #'equal)) > + (cl-pushnew "enumerate*" enums :test #'equal)) > (dolist (env-type (LaTeX-enumitem-newlist-list)) > (let ((env (car env-type)) > (type (cadr env-type))) > (when (or (string-equal type "enumerate") > (string-equal type "enumerate*")) > - (pushnew env enums :test #'equal)))) > + (cl-pushnew env enums :test #'equal)))) > (completing-read "List name: " enums))))) > > ;; "Align" is added as new value to "align" key in key-val list. > diff --git a/style/floatrow.el b/style/floatrow.el > index 5beb1096..bc358d1b 100644 > --- a/style/floatrow.el > +++ b/style/floatrow.el > @@ -58,8 +58,9 @@ > > ;;; Code: > > -;; Needed for compiling `pushnew': > -(eval-when-compile (require 'cl)) > +;; Needed for compiling `cl-pushnew': > +(eval-when-compile > + (require 'cl-lib)) > > ;; Needed for auto-parsing. > (require 'tex) > @@ -317,15 +318,15 @@ > (assq-delete-all (car (assoc key temp)) temp))))) > (cond ((string= key "precode") > (dolist (x vcode-keys) > - (pushnew (list x (TeX-delete-duplicate-strings (append (list val) val-match))) > - opts :test #'equal))) > + (cl-pushnew (list x (TeX-delete-duplicate-strings (append (list val) val-match))) > + opts :test #'equal))) > ((string= key "floatrowsep") > (dolist (x sep-keys) > - (pushnew (list x (TeX-delete-duplicate-strings (append (list val) val-match))) > - opts :test #'equal))) > + (cl-pushnew (list x (TeX-delete-duplicate-strings (append (list val) val-match))) > + opts :test #'equal))) > (t > - (pushnew (list key (TeX-delete-duplicate-strings (append (list val) val-match))) > - opts :test #'equal))) > + (cl-pushnew (list key (TeX-delete-duplicate-strings (append (list val) val-match))) > + opts :test #'equal))) > (setq LaTeX-floatrow-key-val-options-local (copy-alist opts)))))) > > (defun LaTeX-floatrow-arg-floatbox (optional) > diff --git a/style/fvextra.el b/style/fvextra.el > index eeb7d37a..7f49d6cc 100644 > --- a/style/fvextra.el > +++ b/style/fvextra.el > @@ -31,8 +31,9 @@ > > ;;; Code: > > -;; Needed for compiling `pushnew': > -(eval-when-compile (require 'cl)) > +;; Needed for compiling `cl-pushnew': > +(eval-when-compile > + (require 'cl-lib)) > > (defvar LaTeX-fvextra-key-val-options > '(;; 3 General options > @@ -99,8 +100,8 @@ > (dolist (x keys) > (setq tmp (assq-delete-all (car (assoc x tmp)) tmp)) > (if (string= x "highlightcolor") > - (pushnew (list x (mapcar #'car (funcall colorcmd))) tmp :test #'equal) > - (pushnew (list x (append '("none") (mapcar #'car (funcall colorcmd)))) tmp :test #'equal))) > + (cl-pushnew (list x (mapcar #'car (funcall colorcmd))) tmp :test #'equal) > + (cl-pushnew (list x (append '("none") (mapcar #'car (funcall colorcmd)))) tmp :test #'equal))) > (setq LaTeX-fancyvrb-key-val-options-local > (copy-alist tmp))))) > > diff --git a/style/listings.el b/style/listings.el > index 73ddc00f..52adba34 100644 > --- a/style/listings.el > +++ b/style/listings.el > @@ -40,8 +40,9 @@ > > ;;; Code: > > -;; Needed for compiling `pushnew': > -(eval-when-compile (require 'cl)) > +;; Needed for compiling `cl-pushnew': > +(eval-when-compile > + (require 'cl-lib)) > > ;; The following are options taken from chapter 4 of the listings > ;; manual (2007/02/22 Version 1.4). > @@ -284,9 +285,9 @@ with user-defined values via the \"lstdefinestyle\" macro." > (key (car elt)) > (temp (copy-alist LaTeX-listings-key-val-options-local)) > (opts (assq-delete-all (car (assoc key temp)) temp))) > - (pushnew (list key (TeX-delete-duplicate-strings > - (mapcar #'car (LaTeX-listings-lstdefinestyle-list)))) > - opts :test #'equal) > + (cl-pushnew (list key (TeX-delete-duplicate-strings > + (mapcar #'car (LaTeX-listings-lstdefinestyle-list)))) > + opts :test #'equal) > (setq LaTeX-listings-key-val-options-local > (copy-alist opts)))) > > diff --git a/style/mdframed.el b/style/mdframed.el > index cd26e3fd..ed643dac 100644 > --- a/style/mdframed.el > +++ b/style/mdframed.el > @@ -37,8 +37,9 @@ > > ;;; Code: > > -;; Needed for compiling `pushnew': > -(eval-when-compile (require 'cl)) > +;; Needed for compiling `cl-pushnew': > +(eval-when-compile > + (require 'cl-lib)) > > ;; Needed for auto-parsing. > (require 'tex) > @@ -214,9 +215,9 @@ > (val (cadr (assoc "style" LaTeX-mdframed-key-val-options))) > (temp (copy-alist LaTeX-mdframed-key-val-options-local)) > (opts (assq-delete-all (car (assoc key temp)) temp))) > - (pushnew (list key (TeX-delete-duplicate-strings > - (append val (mapcar #'car (LaTeX-mdframed-mdfdefinestyle-list))))) > - opts :test #'equal) > + (cl-pushnew (list key (TeX-delete-duplicate-strings > + (append val (mapcar #'car (LaTeX-mdframed-mdfdefinestyle-list))))) > + opts :test #'equal) > (setq LaTeX-mdframed-key-val-options-local > (copy-alist opts)))) > ;; > @@ -242,7 +243,7 @@ > (tmp (copy-alist LaTeX-mdframed-key-val-options-local))) > (dolist (x keys) > (setq tmp (assq-delete-all (car (assoc x tmp)) tmp)) > - (pushnew (list x (mapcar #'car (funcall colorcmd))) tmp :test #'equal)) > + (cl-pushnew (list x (mapcar #'car (funcall colorcmd))) tmp :test #'equal)) > (setq LaTeX-mdframed-key-val-options-local > (copy-alist tmp))))) > > diff --git a/style/tcolorbox.el b/style/tcolorbox.el > index 6805983b..b8e65122 100644 > --- a/style/tcolorbox.el > +++ b/style/tcolorbox.el > @@ -40,8 +40,9 @@ > > ;;; Code: > > -;; Needed for compiling `pushnew': > -(eval-when-compile (require 'cl)) > +;; Needed for compiling `cl-pushnew': > +(eval-when-compile > + (require 'cl-lib)) > > ;; Needed for auto-parsing. > (require 'tex) > @@ -476,7 +477,7 @@ e.g. \"tcolorboxlib-raster.el\"." > (tmp (copy-alist LaTeX-tcolorbox-keyval-options-local))) > (dolist (key keys) > (setq tmp (assq-delete-all (car (assoc key tmp)) tmp)) > - (pushnew > + (cl-pushnew > (list key (mapcar #'car (LaTeX-xcolor-definecolor-list))) tmp :test #'equal)) > (setq LaTeX-tcolorbox-keyval-options-local (copy-alist tmp))) > (setq LaTeX-tcolorbox-keyval-options-full > -- > 2.16.1 > > > > From 6bc94eaee8a189af5f847878b6280c6a1a0e4b54 Mon Sep 17 00:00:00 2001 > From: Alex Branham > Date: Tue, 30 Jan 2018 20:56:13 -0600 > Subject: [PATCH] Replace cl with cl-lib > > --- > bib-cite.el | 5 +++-- > font-latex.el | 2 +- > latex.el | 3 ++- > style/babel.el | 3 ++- > style/caption.el | 22 +++++++++++----------- > style/empheq.el | 12 ++++++------ > style/enumitem.el | 18 +++++++++--------- > style/floatrow.el | 17 +++++++++-------- > style/fvextra.el | 9 +++++---- > style/listings.el | 11 ++++++----- > style/mdframed.el | 13 +++++++------ > style/tcolorbox.el | 7 ++++--- > 12 files changed, 65 insertions(+), 57 deletions(-) > > diff --git a/bib-cite.el b/bib-cite.el > index 0be0eb0b..5cb8a1d2 100644 > --- a/bib-cite.el > +++ b/bib-cite.el > @@ -589,7 +589,8 @@ > ;; ---------------------------------------------------------------------------- > ;;; Code: > > -(eval-when-compile (require 'cl)) > +(eval-when-compile > + (require 'cl-lib)) > > (defgroup bib-cite nil > "bib-cite, LaTeX minor-mode to display \\cite, \\ref and \\label commands." > @@ -2427,7 +2428,7 @@ bib-dos-or-os2-variable affects: > (or (and (fboundp 'TeX-split-string) > (TeX-split-string sep-char value)) > (dired-split sep-char value))))) > - (loop for x in entries if (bib-cite-file-directory-p x) collect x)))) > + (cl-loop for x in entries if (bib-cite-file-directory-p x) collect x)))) > > (provide 'bib-cite) > ;;; bib-cite.el ends here > diff --git a/font-latex.el b/font-latex.el > index 9b621985..1df751ad 100644 > --- a/font-latex.el > +++ b/font-latex.el > @@ -43,7 +43,7 @@ > (require 'tex) > > (eval-when-compile > - (require 'cl)) > + (require 'cl-lib)) > > (defgroup font-latex nil > "Font-latex text highlighting package." > diff --git a/latex.el b/latex.el > index c2d8a4ca..05d6f55c 100644 > --- a/latex.el > +++ b/latex.el > @@ -31,7 +31,8 @@ > (require 'tex) > (require 'tex-style) > (require 'tex-ispell) > -(eval-when-compile (require 'cl)) ;FIXME: Use cl-lib. > +(eval-when-compile > + (require 'cl-lib)) > > ;;; Syntax > > diff --git a/style/babel.el b/style/babel.el > index c1119b9b..d8c5e3ff 100644 > --- a/style/babel.el > +++ b/style/babel.el > @@ -30,7 +30,8 @@ > > ;;; Code: > > -(eval-when-compile (require 'cl)) > +(eval-when-compile > + (require 'cl-lib)) > > (defvar LaTeX-babel-language-list > '("afrikaans" > diff --git a/style/caption.el b/style/caption.el > index df6328e3..f23e59da 100644 > --- a/style/caption.el > +++ b/style/caption.el > @@ -34,8 +34,8 @@ > > ;;; Code: > > -;; Needed for compiling `pushnew': > -(eval-when-compile (require 'cl)) > +(eval-when-compile > + (require 'cl-lib)) > > ;; Needed for auto-parsing. > (require 'tex) > @@ -168,19 +168,19 @@ in `caption'-completions." > ;; For `\DeclareCaptionOption', only add the value > ;; (remember: key=^^^^^^, val="defined key") > (if (string-equal key "option") > - (pushnew (list val) opts :test #'equal) > + (cl-pushnew (list val) opts :test #'equal) > ;; For anything but `\DeclareCaptionOption', do the standard > ;; procedure. Again, take care of `subrefformat' for `subcaption.el'. > (if val-match > (progn > (when (and (string-equal key "labelformat") > (boundp 'LaTeX-subcaption-key-val-options)) > - (pushnew (list "subrefformat" > - (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) > - opts :test #'equal)) > - (pushnew (list key (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) > - opts :test #'equal)) > - (pushnew (list key (list val)) opts :test #'equal))) > + (cl-pushnew (list "subrefformat" > + (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) > + opts :test #'equal)) > + (cl-pushnew (list key (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) > + opts :test #'equal)) > + (cl-pushnew (list key (list val)) opts :test #'equal))) > (setq LaTeX-caption-key-val-options-local (copy-alist opts)))) > ;; Support for environments defined with newfloat.sty: These > ;; environments are added to "type" and "type*" key: > @@ -192,8 +192,8 @@ in `caption'-completions." > (val-match (cdr (assoc key LaTeX-caption-key-val-options-local))) > (temp (copy-alist LaTeX-caption-key-val-options-local)) > (opts (assq-delete-all (car (assoc key temp)) temp))) > - (pushnew (list key (TeX-delete-duplicate-strings (apply #'append val val-match))) > - opts :test #'equal) > + (cl-pushnew (list key (TeX-delete-duplicate-strings (apply #'append val val-match))) > + opts :test #'equal) > (setq LaTeX-caption-key-val-options-local (copy-alist opts)))))) > > (defun LaTeX-arg-caption-command (optional &optional prompt) > diff --git a/style/empheq.el b/style/empheq.el > index 4365136e..b0231e82 100644 > --- a/style/empheq.el > +++ b/style/empheq.el > @@ -31,8 +31,8 @@ > > ;;; Code: > > -;; Needed for compiling `pushnew': > -(eval-when-compile (require 'cl)) > +(eval-when-compile > + (require 'cl-lib)) > > ;; Needed for auto-parsing. > (require 'tex) > @@ -142,11 +142,11 @@ > (where (cadr delims))) > (if (string= where "Left") > (progn > - (pushnew (concat TeX-esc "empheq" delim) lval :test #'equal) > - (pushnew (concat TeX-esc "empheqbig" delim) lval :test #'equal)) > + (cl-pushnew (concat TeX-esc "empheq" delim) lval :test #'equal) > + (cl-pushnew (concat TeX-esc "empheqbig" delim) lval :test #'equal)) > (progn > - (pushnew (concat TeX-esc "empheq" delim) rval :test #'equal) > - (pushnew (concat TeX-esc "empheqbig" delim) rval :test #'equal))))) > + (cl-pushnew (concat TeX-esc "empheq" delim) rval :test #'equal) > + (cl-pushnew (concat TeX-esc "empheqbig" delim) rval :test #'equal))))) > (when lval > (setq tmp (assq-delete-all (car (assoc "left" tmp)) tmp)) > (setq lvals (append lval lvals)) > diff --git a/style/enumitem.el b/style/enumitem.el > index f347446a..1518a7a6 100644 > --- a/style/enumitem.el > +++ b/style/enumitem.el > @@ -38,8 +38,8 @@ > > ;;; Code: > > -;; Needed for compiling `pushnew': > -(eval-when-compile (require 'cl)) > +(eval-when-compile > + (require 'cl-lib)) > > ;; Needed for auto-parsing. > (require 'tex) > @@ -266,9 +266,9 @@ in `enumitem'-completions." > (temp (copy-alist LaTeX-enumitem-key-val-options-local)) > (opts (assq-delete-all (car (assoc key temp)) temp))) > (if val-match > - (pushnew (list key (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) > - opts :test #'equal) > - (pushnew (list key (list val)) opts :test #'equal)) > + (cl-pushnew (list key (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) > + opts :test #'equal) > + (cl-pushnew (list key (list val)) opts :test #'equal)) > (setq LaTeX-enumitem-key-val-options-local (copy-alist opts)))) > (dolist (newalign (LaTeX-enumitem-SetLabelAlign-list)) > (let* ((key "align") > @@ -276,8 +276,8 @@ in `enumitem'-completions." > (val-match (cdr (assoc key LaTeX-enumitem-key-val-options-local))) > (temp (copy-alist LaTeX-enumitem-key-val-options-local)) > (opts (assq-delete-all (car (assoc key temp)) temp))) > - (pushnew (list key (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) > - opts :test #'equal) > + (cl-pushnew (list key (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) > + opts :test #'equal) > (setq LaTeX-enumitem-key-val-options-local (copy-alist opts))))) > > (TeX-add-style-hook > @@ -405,13 +405,13 @@ in `enumitem'-completions." > (lambda () > (let ((enums '("enumerate"))) > (when (LaTeX-provided-package-options-member "enumitem" "inline") > - (pushnew "enumerate*" enums :test #'equal)) > + (cl-pushnew "enumerate*" enums :test #'equal)) > (dolist (env-type (LaTeX-enumitem-newlist-list)) > (let ((env (car env-type)) > (type (cadr env-type))) > (when (or (string-equal type "enumerate") > (string-equal type "enumerate*")) > - (pushnew env enums :test #'equal)))) > + (cl-pushnew env enums :test #'equal)))) > (completing-read "List name: " enums))))) > > ;; "Align" is added as new value to "align" key in key-val list. > diff --git a/style/floatrow.el b/style/floatrow.el > index 5beb1096..bc358d1b 100644 > --- a/style/floatrow.el > +++ b/style/floatrow.el > @@ -58,8 +58,9 @@ > > ;;; Code: > > -;; Needed for compiling `pushnew': > -(eval-when-compile (require 'cl)) > +;; Needed for compiling `cl-pushnew': > +(eval-when-compile > + (require 'cl-lib)) > > ;; Needed for auto-parsing. > (require 'tex) > @@ -317,15 +318,15 @@ > (assq-delete-all (car (assoc key temp)) temp))))) > (cond ((string= key "precode") > (dolist (x vcode-keys) > - (pushnew (list x (TeX-delete-duplicate-strings (append (list val) val-match))) > - opts :test #'equal))) > + (cl-pushnew (list x (TeX-delete-duplicate-strings (append (list val) val-match))) > + opts :test #'equal))) > ((string= key "floatrowsep") > (dolist (x sep-keys) > - (pushnew (list x (TeX-delete-duplicate-strings (append (list val) val-match))) > - opts :test #'equal))) > + (cl-pushnew (list x (TeX-delete-duplicate-strings (append (list val) val-match))) > + opts :test #'equal))) > (t > - (pushnew (list key (TeX-delete-duplicate-strings (append (list val) val-match))) > - opts :test #'equal))) > + (cl-pushnew (list key (TeX-delete-duplicate-strings (append (list val) val-match))) > + opts :test #'equal))) > (setq LaTeX-floatrow-key-val-options-local (copy-alist opts)))))) > > (defun LaTeX-floatrow-arg-floatbox (optional) > diff --git a/style/fvextra.el b/style/fvextra.el > index eeb7d37a..7f49d6cc 100644 > --- a/style/fvextra.el > +++ b/style/fvextra.el > @@ -31,8 +31,9 @@ > > ;;; Code: > > -;; Needed for compiling `pushnew': > -(eval-when-compile (require 'cl)) > +;; Needed for compiling `cl-pushnew': > +(eval-when-compile > + (require 'cl-lib)) > > (defvar LaTeX-fvextra-key-val-options > '(;; 3 General options > @@ -99,8 +100,8 @@ > (dolist (x keys) > (setq tmp (assq-delete-all (car (assoc x tmp)) tmp)) > (if (string= x "highlightcolor") > - (pushnew (list x (mapcar #'car (funcall colorcmd))) tmp :test #'equal) > - (pushnew (list x (append '("none") (mapcar #'car (funcall colorcmd)))) tmp :test #'equal))) > + (cl-pushnew (list x (mapcar #'car (funcall colorcmd))) tmp :test #'equal) > + (cl-pushnew (list x (append '("none") (mapcar #'car (funcall colorcmd)))) tmp :test #'equal))) > (setq LaTeX-fancyvrb-key-val-options-local > (copy-alist tmp))))) > > diff --git a/style/listings.el b/style/listings.el > index 73ddc00f..52adba34 100644 > --- a/style/listings.el > +++ b/style/listings.el > @@ -40,8 +40,9 @@ > > ;;; Code: > > -;; Needed for compiling `pushnew': > -(eval-when-compile (require 'cl)) > +;; Needed for compiling `cl-pushnew': > +(eval-when-compile > + (require 'cl-lib)) > > ;; The following are options taken from chapter 4 of the listings > ;; manual (2007/02/22 Version 1.4). > @@ -284,9 +285,9 @@ with user-defined values via the \"lstdefinestyle\" macro." > (key (car elt)) > (temp (copy-alist LaTeX-listings-key-val-options-local)) > (opts (assq-delete-all (car (assoc key temp)) temp))) > - (pushnew (list key (TeX-delete-duplicate-strings > - (mapcar #'car (LaTeX-listings-lstdefinestyle-list)))) > - opts :test #'equal) > + (cl-pushnew (list key (TeX-delete-duplicate-strings > + (mapcar #'car (LaTeX-listings-lstdefinestyle-list)))) > + opts :test #'equal) > (setq LaTeX-listings-key-val-options-local > (copy-alist opts)))) > > diff --git a/style/mdframed.el b/style/mdframed.el > index cd26e3fd..ed643dac 100644 > --- a/style/mdframed.el > +++ b/style/mdframed.el > @@ -37,8 +37,9 @@ > > ;;; Code: > > -;; Needed for compiling `pushnew': > -(eval-when-compile (require 'cl)) > +;; Needed for compiling `cl-pushnew': > +(eval-when-compile > + (require 'cl-lib)) > > ;; Needed for auto-parsing. > (require 'tex) > @@ -214,9 +215,9 @@ > (val (cadr (assoc "style" LaTeX-mdframed-key-val-options))) > (temp (copy-alist LaTeX-mdframed-key-val-options-local)) > (opts (assq-delete-all (car (assoc key temp)) temp))) > - (pushnew (list key (TeX-delete-duplicate-strings > - (append val (mapcar #'car (LaTeX-mdframed-mdfdefinestyle-list))))) > - opts :test #'equal) > + (cl-pushnew (list key (TeX-delete-duplicate-strings > + (append val (mapcar #'car (LaTeX-mdframed-mdfdefinestyle-list))))) > + opts :test #'equal) > (setq LaTeX-mdframed-key-val-options-local > (copy-alist opts)))) > ;; > @@ -242,7 +243,7 @@ > (tmp (copy-alist LaTeX-mdframed-key-val-options-local))) > (dolist (x keys) > (setq tmp (assq-delete-all (car (assoc x tmp)) tmp)) > - (pushnew (list x (mapcar #'car (funcall colorcmd))) tmp :test #'equal)) > + (cl-pushnew (list x (mapcar #'car (funcall colorcmd))) tmp :test #'equal)) > (setq LaTeX-mdframed-key-val-options-local > (copy-alist tmp))))) > > diff --git a/style/tcolorbox.el b/style/tcolorbox.el > index 6805983b..b8e65122 100644 > --- a/style/tcolorbox.el > +++ b/style/tcolorbox.el > @@ -40,8 +40,9 @@ > > ;;; Code: > > -;; Needed for compiling `pushnew': > -(eval-when-compile (require 'cl)) > +;; Needed for compiling `cl-pushnew': > +(eval-when-compile > + (require 'cl-lib)) > > ;; Needed for auto-parsing. > (require 'tex) > @@ -476,7 +477,7 @@ e.g. \"tcolorboxlib-raster.el\"." > (tmp (copy-alist LaTeX-tcolorbox-keyval-options-local))) > (dolist (key keys) > (setq tmp (assq-delete-all (car (assoc key tmp)) tmp)) > - (pushnew > + (cl-pushnew > (list key (mapcar #'car (LaTeX-xcolor-definecolor-list))) tmp :test #'equal)) > (setq LaTeX-tcolorbox-keyval-options-local (copy-alist tmp))) > (setq LaTeX-tcolorbox-keyval-options-full From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 15 21:28:25 2018 Received: (at 30424) by debbugs.gnu.org; 16 Feb 2018 02:28:25 +0000 Received: from localhost ([127.0.0.1]:45442 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1emVlA-0001uU-Eu for submit@debbugs.gnu.org; Thu, 15 Feb 2018 21:28:25 -0500 Received: from mail-ot0-f172.google.com ([74.125.82.172]:40414) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1emVl6-0001uG-FL for 30424@debbugs.gnu.org; Thu, 15 Feb 2018 21:28:22 -0500 Received: by mail-ot0-f172.google.com with SMTP id s4so1577267oth.7 for <30424@debbugs.gnu.org>; Thu, 15 Feb 2018 18:28:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=references:user-agent:from:to:subject:in-reply-to:date:message-id :mime-version; bh=AveFlar3d5C+ZqvgDK3UCf8r+v8BFWXYOhHQDvlfHmE=; b=M44T/16ahIUFxv+P2zEgQRpYS3MuV6QX7tKGeIDatDTSjFVeCGQMd1TUNvHeTHovJM f54GgnqsIpzIH45noTzia4DkZrmhjKBAXV1Vl5Q2V582gA4+3EslI35IoOWJ54hnIYvO YboZCbJmRTedOFMlCztDGhnh1E1UGX16w+Mmp6W9vIejswhM4yCnA8vQBGcXLUK0XrBg 7HjD8krPKd4/nj7Gc/ylnR3lLHQ41/YRBMsB9oPUam4MgLpXYT8CTxYks5m5vYYUZpgf 5MosPtbSyI8kq05z7ONWTqLRK1coiCfCFTF/l291pfVZFHqRTgWfqbdMVX/tsez+c0lC SznQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:references:user-agent:from:to:subject :in-reply-to:date:message-id:mime-version; bh=AveFlar3d5C+ZqvgDK3UCf8r+v8BFWXYOhHQDvlfHmE=; b=KHDgiwkcCAR9cgYhieZhpXfv3dHM2O7rrbeQXSdNahmb4noo4tY37fGksRIkT20Tn/ /nHEUUsaqQfRJSY6CxPhCuLXcPWtojGbE+SHdo/r9JqQVR4J9nSmMseburXPLZ0gi4bV kR1XdycFt4NAHB5lnBHSuXa3MyJOhz7bRdGDH3Txw7hjfXXORywPPZc4sRItOWgVus2/ VfxMZEw5MfRJuvBgQEh5kFEHoTEWhOtE2ga5tsfsbZS2gmPqAorelKtDDBGJ4vGqarLt EoAvtkEtVET2lBVmmd16owww7RyqVJ/10sIu/xyMHxbD6NI54ToJiNZO44dx8VksqWW4 xrbA== X-Gm-Message-State: APf1xPDYTQeUA3ALccnh+ykLqCSywHG1YrthlDnX2zS8ti4EJRYXNBsw g3bBsBzZottPKtSK/Y8iJxjyZVMG X-Google-Smtp-Source: AH8x226y9frDZ9KLt7rjM4jzFgEnadECQGpJ1mFWtOu+KBK7ZQ8NnOmtl70Ryu+LS8okMbRk3FgE8g== X-Received: by 10.157.48.148 with SMTP id s20mr3279026otc.218.1518748094117; Thu, 15 Feb 2018 18:28:14 -0800 (PST) Received: from mars (cpe-70-114-192-208.austin.res.rr.com. [70.114.192.208]) by smtp.gmail.com with ESMTPSA id q81sm3333302oih.38.2018.02.15.18.28.12 for <30424@debbugs.gnu.org> (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 Feb 2018 18:28:13 -0800 (PST) References: <87wozjo0ra.fsf@gmail.com> <878tbva85f.fsf@gmail.com> User-agent: mu4e 1.0; emacs 26.0.91 From: Alex Branham To: 30424@debbugs.gnu.org Subject: Re: [patch] replace cl with cl-lib In-reply-to: <878tbva85f.fsf@gmail.com> Date: Thu, 15 Feb 2018 20:28:42 -0600 Message-ID: <87h8qh4qhx.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 30424 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Actually the error I was receiving was due to a dirty working tree. I don't see any problems after cleaning it up then recompiling auctex with the patch applied. On Wed 14 Feb 2018 at 09:43, Alex Branham wrote: > Turns out that this patch breaks font locking in some cases. I'll look > into it and report back later. > > On Sun 11 Feb 2018 at 12:10, Alex Branham wrote: > >> The attached patch replaces cl with cl-lib. >> >> From 6bc94eaee8a189af5f847878b6280c6a1a0e4b54 Mon Sep 17 00:00:00 2001 >> From: Alex Branham >> Date: Tue, 30 Jan 2018 20:56:13 -0600 >> Subject: [PATCH] Replace cl with cl-lib >> >> --- >> bib-cite.el | 5 +++-- >> font-latex.el | 2 +- >> latex.el | 3 ++- >> style/babel.el | 3 ++- >> style/caption.el | 22 +++++++++++----------- >> style/empheq.el | 12 ++++++------ >> style/enumitem.el | 18 +++++++++--------- >> style/floatrow.el | 17 +++++++++-------- >> style/fvextra.el | 9 +++++---- >> style/listings.el | 11 ++++++----- >> style/mdframed.el | 13 +++++++------ >> style/tcolorbox.el | 7 ++++--- >> 12 files changed, 65 insertions(+), 57 deletions(-) >> >> diff --git a/bib-cite.el b/bib-cite.el >> index 0be0eb0b..5cb8a1d2 100644 >> --- a/bib-cite.el >> +++ b/bib-cite.el >> @@ -589,7 +589,8 @@ >> ;; ---------------------------------------------------------------------------- >> ;;; Code: >> >> -(eval-when-compile (require 'cl)) >> +(eval-when-compile >> + (require 'cl-lib)) >> >> (defgroup bib-cite nil >> "bib-cite, LaTeX minor-mode to display \\cite, \\ref and \\label commands." >> @@ -2427,7 +2428,7 @@ bib-dos-or-os2-variable affects: >> (or (and (fboundp 'TeX-split-string) >> (TeX-split-string sep-char value)) >> (dired-split sep-char value))))) >> - (loop for x in entries if (bib-cite-file-directory-p x) collect x)))) >> + (cl-loop for x in entries if (bib-cite-file-directory-p x) collect x)))) >> >> (provide 'bib-cite) >> ;;; bib-cite.el ends here >> diff --git a/font-latex.el b/font-latex.el >> index 9b621985..1df751ad 100644 >> --- a/font-latex.el >> +++ b/font-latex.el >> @@ -43,7 +43,7 @@ >> (require 'tex) >> >> (eval-when-compile >> - (require 'cl)) >> + (require 'cl-lib)) >> >> (defgroup font-latex nil >> "Font-latex text highlighting package." >> diff --git a/latex.el b/latex.el >> index c2d8a4ca..05d6f55c 100644 >> --- a/latex.el >> +++ b/latex.el >> @@ -31,7 +31,8 @@ >> (require 'tex) >> (require 'tex-style) >> (require 'tex-ispell) >> -(eval-when-compile (require 'cl)) ;FIXME: Use cl-lib. >> +(eval-when-compile >> + (require 'cl-lib)) >> >> ;;; Syntax >> >> diff --git a/style/babel.el b/style/babel.el >> index c1119b9b..d8c5e3ff 100644 >> --- a/style/babel.el >> +++ b/style/babel.el >> @@ -30,7 +30,8 @@ >> >> ;;; Code: >> >> -(eval-when-compile (require 'cl)) >> +(eval-when-compile >> + (require 'cl-lib)) >> >> (defvar LaTeX-babel-language-list >> '("afrikaans" >> diff --git a/style/caption.el b/style/caption.el >> index df6328e3..f23e59da 100644 >> --- a/style/caption.el >> +++ b/style/caption.el >> @@ -34,8 +34,8 @@ >> >> ;;; Code: >> >> -;; Needed for compiling `pushnew': >> -(eval-when-compile (require 'cl)) >> +(eval-when-compile >> + (require 'cl-lib)) >> >> ;; Needed for auto-parsing. >> (require 'tex) >> @@ -168,19 +168,19 @@ in `caption'-completions." >> ;; For `\DeclareCaptionOption', only add the value >> ;; (remember: key=^^^^^^, val="defined key") >> (if (string-equal key "option") >> - (pushnew (list val) opts :test #'equal) >> + (cl-pushnew (list val) opts :test #'equal) >> ;; For anything but `\DeclareCaptionOption', do the standard >> ;; procedure. Again, take care of `subrefformat' for `subcaption.el'. >> (if val-match >> (progn >> (when (and (string-equal key "labelformat") >> (boundp 'LaTeX-subcaption-key-val-options)) >> - (pushnew (list "subrefformat" >> - (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) >> - opts :test #'equal)) >> - (pushnew (list key (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) >> - opts :test #'equal)) >> - (pushnew (list key (list val)) opts :test #'equal))) >> + (cl-pushnew (list "subrefformat" >> + (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) >> + opts :test #'equal)) >> + (cl-pushnew (list key (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) >> + opts :test #'equal)) >> + (cl-pushnew (list key (list val)) opts :test #'equal))) >> (setq LaTeX-caption-key-val-options-local (copy-alist opts)))) >> ;; Support for environments defined with newfloat.sty: These >> ;; environments are added to "type" and "type*" key: >> @@ -192,8 +192,8 @@ in `caption'-completions." >> (val-match (cdr (assoc key LaTeX-caption-key-val-options-local))) >> (temp (copy-alist LaTeX-caption-key-val-options-local)) >> (opts (assq-delete-all (car (assoc key temp)) temp))) >> - (pushnew (list key (TeX-delete-duplicate-strings (apply #'append val val-match))) >> - opts :test #'equal) >> + (cl-pushnew (list key (TeX-delete-duplicate-strings (apply #'append val val-match))) >> + opts :test #'equal) >> (setq LaTeX-caption-key-val-options-local (copy-alist opts)))))) >> >> (defun LaTeX-arg-caption-command (optional &optional prompt) >> diff --git a/style/empheq.el b/style/empheq.el >> index 4365136e..b0231e82 100644 >> --- a/style/empheq.el >> +++ b/style/empheq.el >> @@ -31,8 +31,8 @@ >> >> ;;; Code: >> >> -;; Needed for compiling `pushnew': >> -(eval-when-compile (require 'cl)) >> +(eval-when-compile >> + (require 'cl-lib)) >> >> ;; Needed for auto-parsing. >> (require 'tex) >> @@ -142,11 +142,11 @@ >> (where (cadr delims))) >> (if (string= where "Left") >> (progn >> - (pushnew (concat TeX-esc "empheq" delim) lval :test #'equal) >> - (pushnew (concat TeX-esc "empheqbig" delim) lval :test #'equal)) >> + (cl-pushnew (concat TeX-esc "empheq" delim) lval :test #'equal) >> + (cl-pushnew (concat TeX-esc "empheqbig" delim) lval :test #'equal)) >> (progn >> - (pushnew (concat TeX-esc "empheq" delim) rval :test #'equal) >> - (pushnew (concat TeX-esc "empheqbig" delim) rval :test #'equal))))) >> + (cl-pushnew (concat TeX-esc "empheq" delim) rval :test #'equal) >> + (cl-pushnew (concat TeX-esc "empheqbig" delim) rval :test #'equal))))) >> (when lval >> (setq tmp (assq-delete-all (car (assoc "left" tmp)) tmp)) >> (setq lvals (append lval lvals)) >> diff --git a/style/enumitem.el b/style/enumitem.el >> index f347446a..1518a7a6 100644 >> --- a/style/enumitem.el >> +++ b/style/enumitem.el >> @@ -38,8 +38,8 @@ >> >> ;;; Code: >> >> -;; Needed for compiling `pushnew': >> -(eval-when-compile (require 'cl)) >> +(eval-when-compile >> + (require 'cl-lib)) >> >> ;; Needed for auto-parsing. >> (require 'tex) >> @@ -266,9 +266,9 @@ in `enumitem'-completions." >> (temp (copy-alist LaTeX-enumitem-key-val-options-local)) >> (opts (assq-delete-all (car (assoc key temp)) temp))) >> (if val-match >> - (pushnew (list key (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) >> - opts :test #'equal) >> - (pushnew (list key (list val)) opts :test #'equal)) >> + (cl-pushnew (list key (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) >> + opts :test #'equal) >> + (cl-pushnew (list key (list val)) opts :test #'equal)) >> (setq LaTeX-enumitem-key-val-options-local (copy-alist opts)))) >> (dolist (newalign (LaTeX-enumitem-SetLabelAlign-list)) >> (let* ((key "align") >> @@ -276,8 +276,8 @@ in `enumitem'-completions." >> (val-match (cdr (assoc key LaTeX-enumitem-key-val-options-local))) >> (temp (copy-alist LaTeX-enumitem-key-val-options-local)) >> (opts (assq-delete-all (car (assoc key temp)) temp))) >> - (pushnew (list key (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) >> - opts :test #'equal) >> + (cl-pushnew (list key (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) >> + opts :test #'equal) >> (setq LaTeX-enumitem-key-val-options-local (copy-alist opts))))) >> >> (TeX-add-style-hook >> @@ -405,13 +405,13 @@ in `enumitem'-completions." >> (lambda () >> (let ((enums '("enumerate"))) >> (when (LaTeX-provided-package-options-member "enumitem" "inline") >> - (pushnew "enumerate*" enums :test #'equal)) >> + (cl-pushnew "enumerate*" enums :test #'equal)) >> (dolist (env-type (LaTeX-enumitem-newlist-list)) >> (let ((env (car env-type)) >> (type (cadr env-type))) >> (when (or (string-equal type "enumerate") >> (string-equal type "enumerate*")) >> - (pushnew env enums :test #'equal)))) >> + (cl-pushnew env enums :test #'equal)))) >> (completing-read "List name: " enums))))) >> >> ;; "Align" is added as new value to "align" key in key-val list. >> diff --git a/style/floatrow.el b/style/floatrow.el >> index 5beb1096..bc358d1b 100644 >> --- a/style/floatrow.el >> +++ b/style/floatrow.el >> @@ -58,8 +58,9 @@ >> >> ;;; Code: >> >> -;; Needed for compiling `pushnew': >> -(eval-when-compile (require 'cl)) >> +;; Needed for compiling `cl-pushnew': >> +(eval-when-compile >> + (require 'cl-lib)) >> >> ;; Needed for auto-parsing. >> (require 'tex) >> @@ -317,15 +318,15 @@ >> (assq-delete-all (car (assoc key temp)) temp))))) >> (cond ((string= key "precode") >> (dolist (x vcode-keys) >> - (pushnew (list x (TeX-delete-duplicate-strings (append (list val) val-match))) >> - opts :test #'equal))) >> + (cl-pushnew (list x (TeX-delete-duplicate-strings (append (list val) val-match))) >> + opts :test #'equal))) >> ((string= key "floatrowsep") >> (dolist (x sep-keys) >> - (pushnew (list x (TeX-delete-duplicate-strings (append (list val) val-match))) >> - opts :test #'equal))) >> + (cl-pushnew (list x (TeX-delete-duplicate-strings (append (list val) val-match))) >> + opts :test #'equal))) >> (t >> - (pushnew (list key (TeX-delete-duplicate-strings (append (list val) val-match))) >> - opts :test #'equal))) >> + (cl-pushnew (list key (TeX-delete-duplicate-strings (append (list val) val-match))) >> + opts :test #'equal))) >> (setq LaTeX-floatrow-key-val-options-local (copy-alist opts)))))) >> >> (defun LaTeX-floatrow-arg-floatbox (optional) >> diff --git a/style/fvextra.el b/style/fvextra.el >> index eeb7d37a..7f49d6cc 100644 >> --- a/style/fvextra.el >> +++ b/style/fvextra.el >> @@ -31,8 +31,9 @@ >> >> ;;; Code: >> >> -;; Needed for compiling `pushnew': >> -(eval-when-compile (require 'cl)) >> +;; Needed for compiling `cl-pushnew': >> +(eval-when-compile >> + (require 'cl-lib)) >> >> (defvar LaTeX-fvextra-key-val-options >> '(;; 3 General options >> @@ -99,8 +100,8 @@ >> (dolist (x keys) >> (setq tmp (assq-delete-all (car (assoc x tmp)) tmp)) >> (if (string= x "highlightcolor") >> - (pushnew (list x (mapcar #'car (funcall colorcmd))) tmp :test #'equal) >> - (pushnew (list x (append '("none") (mapcar #'car (funcall colorcmd)))) tmp :test #'equal))) >> + (cl-pushnew (list x (mapcar #'car (funcall colorcmd))) tmp :test #'equal) >> + (cl-pushnew (list x (append '("none") (mapcar #'car (funcall colorcmd)))) tmp :test #'equal))) >> (setq LaTeX-fancyvrb-key-val-options-local >> (copy-alist tmp))))) >> >> diff --git a/style/listings.el b/style/listings.el >> index 73ddc00f..52adba34 100644 >> --- a/style/listings.el >> +++ b/style/listings.el >> @@ -40,8 +40,9 @@ >> >> ;;; Code: >> >> -;; Needed for compiling `pushnew': >> -(eval-when-compile (require 'cl)) >> +;; Needed for compiling `cl-pushnew': >> +(eval-when-compile >> + (require 'cl-lib)) >> >> ;; The following are options taken from chapter 4 of the listings >> ;; manual (2007/02/22 Version 1.4). >> @@ -284,9 +285,9 @@ with user-defined values via the \"lstdefinestyle\" macro." >> (key (car elt)) >> (temp (copy-alist LaTeX-listings-key-val-options-local)) >> (opts (assq-delete-all (car (assoc key temp)) temp))) >> - (pushnew (list key (TeX-delete-duplicate-strings >> - (mapcar #'car (LaTeX-listings-lstdefinestyle-list)))) >> - opts :test #'equal) >> + (cl-pushnew (list key (TeX-delete-duplicate-strings >> + (mapcar #'car (LaTeX-listings-lstdefinestyle-list)))) >> + opts :test #'equal) >> (setq LaTeX-listings-key-val-options-local >> (copy-alist opts)))) >> >> diff --git a/style/mdframed.el b/style/mdframed.el >> index cd26e3fd..ed643dac 100644 >> --- a/style/mdframed.el >> +++ b/style/mdframed.el >> @@ -37,8 +37,9 @@ >> >> ;;; Code: >> >> -;; Needed for compiling `pushnew': >> -(eval-when-compile (require 'cl)) >> +;; Needed for compiling `cl-pushnew': >> +(eval-when-compile >> + (require 'cl-lib)) >> >> ;; Needed for auto-parsing. >> (require 'tex) >> @@ -214,9 +215,9 @@ >> (val (cadr (assoc "style" LaTeX-mdframed-key-val-options))) >> (temp (copy-alist LaTeX-mdframed-key-val-options-local)) >> (opts (assq-delete-all (car (assoc key temp)) temp))) >> - (pushnew (list key (TeX-delete-duplicate-strings >> - (append val (mapcar #'car (LaTeX-mdframed-mdfdefinestyle-list))))) >> - opts :test #'equal) >> + (cl-pushnew (list key (TeX-delete-duplicate-strings >> + (append val (mapcar #'car (LaTeX-mdframed-mdfdefinestyle-list))))) >> + opts :test #'equal) >> (setq LaTeX-mdframed-key-val-options-local >> (copy-alist opts)))) >> ;; >> @@ -242,7 +243,7 @@ >> (tmp (copy-alist LaTeX-mdframed-key-val-options-local))) >> (dolist (x keys) >> (setq tmp (assq-delete-all (car (assoc x tmp)) tmp)) >> - (pushnew (list x (mapcar #'car (funcall colorcmd))) tmp :test #'equal)) >> + (cl-pushnew (list x (mapcar #'car (funcall colorcmd))) tmp :test #'equal)) >> (setq LaTeX-mdframed-key-val-options-local >> (copy-alist tmp))))) >> >> diff --git a/style/tcolorbox.el b/style/tcolorbox.el >> index 6805983b..b8e65122 100644 >> --- a/style/tcolorbox.el >> +++ b/style/tcolorbox.el >> @@ -40,8 +40,9 @@ >> >> ;;; Code: >> >> -;; Needed for compiling `pushnew': >> -(eval-when-compile (require 'cl)) >> +;; Needed for compiling `cl-pushnew': >> +(eval-when-compile >> + (require 'cl-lib)) >> >> ;; Needed for auto-parsing. >> (require 'tex) >> @@ -476,7 +477,7 @@ e.g. \"tcolorboxlib-raster.el\"." >> (tmp (copy-alist LaTeX-tcolorbox-keyval-options-local))) >> (dolist (key keys) >> (setq tmp (assq-delete-all (car (assoc key tmp)) tmp)) >> - (pushnew >> + (cl-pushnew >> (list key (mapcar #'car (LaTeX-xcolor-definecolor-list))) tmp :test #'equal)) >> (setq LaTeX-tcolorbox-keyval-options-local (copy-alist tmp))) >> (setq LaTeX-tcolorbox-keyval-options-full >> -- >> 2.16.1 >> >> >> >> From 6bc94eaee8a189af5f847878b6280c6a1a0e4b54 Mon Sep 17 00:00:00 2001 >> From: Alex Branham >> Date: Tue, 30 Jan 2018 20:56:13 -0600 >> Subject: [PATCH] Replace cl with cl-lib >> >> --- >> bib-cite.el | 5 +++-- >> font-latex.el | 2 +- >> latex.el | 3 ++- >> style/babel.el | 3 ++- >> style/caption.el | 22 +++++++++++----------- >> style/empheq.el | 12 ++++++------ >> style/enumitem.el | 18 +++++++++--------- >> style/floatrow.el | 17 +++++++++-------- >> style/fvextra.el | 9 +++++---- >> style/listings.el | 11 ++++++----- >> style/mdframed.el | 13 +++++++------ >> style/tcolorbox.el | 7 ++++--- >> 12 files changed, 65 insertions(+), 57 deletions(-) >> >> diff --git a/bib-cite.el b/bib-cite.el >> index 0be0eb0b..5cb8a1d2 100644 >> --- a/bib-cite.el >> +++ b/bib-cite.el >> @@ -589,7 +589,8 @@ >> ;; ---------------------------------------------------------------------------- >> ;;; Code: >> >> -(eval-when-compile (require 'cl)) >> +(eval-when-compile >> + (require 'cl-lib)) >> >> (defgroup bib-cite nil >> "bib-cite, LaTeX minor-mode to display \\cite, \\ref and \\label commands." >> @@ -2427,7 +2428,7 @@ bib-dos-or-os2-variable affects: >> (or (and (fboundp 'TeX-split-string) >> (TeX-split-string sep-char value)) >> (dired-split sep-char value))))) >> - (loop for x in entries if (bib-cite-file-directory-p x) collect x)))) >> + (cl-loop for x in entries if (bib-cite-file-directory-p x) collect x)))) >> >> (provide 'bib-cite) >> ;;; bib-cite.el ends here >> diff --git a/font-latex.el b/font-latex.el >> index 9b621985..1df751ad 100644 >> --- a/font-latex.el >> +++ b/font-latex.el >> @@ -43,7 +43,7 @@ >> (require 'tex) >> >> (eval-when-compile >> - (require 'cl)) >> + (require 'cl-lib)) >> >> (defgroup font-latex nil >> "Font-latex text highlighting package." >> diff --git a/latex.el b/latex.el >> index c2d8a4ca..05d6f55c 100644 >> --- a/latex.el >> +++ b/latex.el >> @@ -31,7 +31,8 @@ >> (require 'tex) >> (require 'tex-style) >> (require 'tex-ispell) >> -(eval-when-compile (require 'cl)) ;FIXME: Use cl-lib. >> +(eval-when-compile >> + (require 'cl-lib)) >> >> ;;; Syntax >> >> diff --git a/style/babel.el b/style/babel.el >> index c1119b9b..d8c5e3ff 100644 >> --- a/style/babel.el >> +++ b/style/babel.el >> @@ -30,7 +30,8 @@ >> >> ;;; Code: >> >> -(eval-when-compile (require 'cl)) >> +(eval-when-compile >> + (require 'cl-lib)) >> >> (defvar LaTeX-babel-language-list >> '("afrikaans" >> diff --git a/style/caption.el b/style/caption.el >> index df6328e3..f23e59da 100644 >> --- a/style/caption.el >> +++ b/style/caption.el >> @@ -34,8 +34,8 @@ >> >> ;;; Code: >> >> -;; Needed for compiling `pushnew': >> -(eval-when-compile (require 'cl)) >> +(eval-when-compile >> + (require 'cl-lib)) >> >> ;; Needed for auto-parsing. >> (require 'tex) >> @@ -168,19 +168,19 @@ in `caption'-completions." >> ;; For `\DeclareCaptionOption', only add the value >> ;; (remember: key=^^^^^^, val="defined key") >> (if (string-equal key "option") >> - (pushnew (list val) opts :test #'equal) >> + (cl-pushnew (list val) opts :test #'equal) >> ;; For anything but `\DeclareCaptionOption', do the standard >> ;; procedure. Again, take care of `subrefformat' for `subcaption.el'. >> (if val-match >> (progn >> (when (and (string-equal key "labelformat") >> (boundp 'LaTeX-subcaption-key-val-options)) >> - (pushnew (list "subrefformat" >> - (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) >> - opts :test #'equal)) >> - (pushnew (list key (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) >> - opts :test #'equal)) >> - (pushnew (list key (list val)) opts :test #'equal))) >> + (cl-pushnew (list "subrefformat" >> + (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) >> + opts :test #'equal)) >> + (cl-pushnew (list key (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) >> + opts :test #'equal)) >> + (cl-pushnew (list key (list val)) opts :test #'equal))) >> (setq LaTeX-caption-key-val-options-local (copy-alist opts)))) >> ;; Support for environments defined with newfloat.sty: These >> ;; environments are added to "type" and "type*" key: >> @@ -192,8 +192,8 @@ in `caption'-completions." >> (val-match (cdr (assoc key LaTeX-caption-key-val-options-local))) >> (temp (copy-alist LaTeX-caption-key-val-options-local)) >> (opts (assq-delete-all (car (assoc key temp)) temp))) >> - (pushnew (list key (TeX-delete-duplicate-strings (apply #'append val val-match))) >> - opts :test #'equal) >> + (cl-pushnew (list key (TeX-delete-duplicate-strings (apply #'append val val-match))) >> + opts :test #'equal) >> (setq LaTeX-caption-key-val-options-local (copy-alist opts)))))) >> >> (defun LaTeX-arg-caption-command (optional &optional prompt) >> diff --git a/style/empheq.el b/style/empheq.el >> index 4365136e..b0231e82 100644 >> --- a/style/empheq.el >> +++ b/style/empheq.el >> @@ -31,8 +31,8 @@ >> >> ;;; Code: >> >> -;; Needed for compiling `pushnew': >> -(eval-when-compile (require 'cl)) >> +(eval-when-compile >> + (require 'cl-lib)) >> >> ;; Needed for auto-parsing. >> (require 'tex) >> @@ -142,11 +142,11 @@ >> (where (cadr delims))) >> (if (string= where "Left") >> (progn >> - (pushnew (concat TeX-esc "empheq" delim) lval :test #'equal) >> - (pushnew (concat TeX-esc "empheqbig" delim) lval :test #'equal)) >> + (cl-pushnew (concat TeX-esc "empheq" delim) lval :test #'equal) >> + (cl-pushnew (concat TeX-esc "empheqbig" delim) lval :test #'equal)) >> (progn >> - (pushnew (concat TeX-esc "empheq" delim) rval :test #'equal) >> - (pushnew (concat TeX-esc "empheqbig" delim) rval :test #'equal))))) >> + (cl-pushnew (concat TeX-esc "empheq" delim) rval :test #'equal) >> + (cl-pushnew (concat TeX-esc "empheqbig" delim) rval :test #'equal))))) >> (when lval >> (setq tmp (assq-delete-all (car (assoc "left" tmp)) tmp)) >> (setq lvals (append lval lvals)) >> diff --git a/style/enumitem.el b/style/enumitem.el >> index f347446a..1518a7a6 100644 >> --- a/style/enumitem.el >> +++ b/style/enumitem.el >> @@ -38,8 +38,8 @@ >> >> ;;; Code: >> >> -;; Needed for compiling `pushnew': >> -(eval-when-compile (require 'cl)) >> +(eval-when-compile >> + (require 'cl-lib)) >> >> ;; Needed for auto-parsing. >> (require 'tex) >> @@ -266,9 +266,9 @@ in `enumitem'-completions." >> (temp (copy-alist LaTeX-enumitem-key-val-options-local)) >> (opts (assq-delete-all (car (assoc key temp)) temp))) >> (if val-match >> - (pushnew (list key (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) >> - opts :test #'equal) >> - (pushnew (list key (list val)) opts :test #'equal)) >> + (cl-pushnew (list key (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) >> + opts :test #'equal) >> + (cl-pushnew (list key (list val)) opts :test #'equal)) >> (setq LaTeX-enumitem-key-val-options-local (copy-alist opts)))) >> (dolist (newalign (LaTeX-enumitem-SetLabelAlign-list)) >> (let* ((key "align") >> @@ -276,8 +276,8 @@ in `enumitem'-completions." >> (val-match (cdr (assoc key LaTeX-enumitem-key-val-options-local))) >> (temp (copy-alist LaTeX-enumitem-key-val-options-local)) >> (opts (assq-delete-all (car (assoc key temp)) temp))) >> - (pushnew (list key (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) >> - opts :test #'equal) >> + (cl-pushnew (list key (TeX-delete-duplicate-strings (apply #'append (list val) val-match))) >> + opts :test #'equal) >> (setq LaTeX-enumitem-key-val-options-local (copy-alist opts))))) >> >> (TeX-add-style-hook >> @@ -405,13 +405,13 @@ in `enumitem'-completions." >> (lambda () >> (let ((enums '("enumerate"))) >> (when (LaTeX-provided-package-options-member "enumitem" "inline") >> - (pushnew "enumerate*" enums :test #'equal)) >> + (cl-pushnew "enumerate*" enums :test #'equal)) >> (dolist (env-type (LaTeX-enumitem-newlist-list)) >> (let ((env (car env-type)) >> (type (cadr env-type))) >> (when (or (string-equal type "enumerate") >> (string-equal type "enumerate*")) >> - (pushnew env enums :test #'equal)))) >> + (cl-pushnew env enums :test #'equal)))) >> (completing-read "List name: " enums))))) >> >> ;; "Align" is added as new value to "align" key in key-val list. >> diff --git a/style/floatrow.el b/style/floatrow.el >> index 5beb1096..bc358d1b 100644 >> --- a/style/floatrow.el >> +++ b/style/floatrow.el >> @@ -58,8 +58,9 @@ >> >> ;;; Code: >> >> -;; Needed for compiling `pushnew': >> -(eval-when-compile (require 'cl)) >> +;; Needed for compiling `cl-pushnew': >> +(eval-when-compile >> + (require 'cl-lib)) >> >> ;; Needed for auto-parsing. >> (require 'tex) >> @@ -317,15 +318,15 @@ >> (assq-delete-all (car (assoc key temp)) temp))))) >> (cond ((string= key "precode") >> (dolist (x vcode-keys) >> - (pushnew (list x (TeX-delete-duplicate-strings (append (list val) val-match))) >> - opts :test #'equal))) >> + (cl-pushnew (list x (TeX-delete-duplicate-strings (append (list val) val-match))) >> + opts :test #'equal))) >> ((string= key "floatrowsep") >> (dolist (x sep-keys) >> - (pushnew (list x (TeX-delete-duplicate-strings (append (list val) val-match))) >> - opts :test #'equal))) >> + (cl-pushnew (list x (TeX-delete-duplicate-strings (append (list val) val-match))) >> + opts :test #'equal))) >> (t >> - (pushnew (list key (TeX-delete-duplicate-strings (append (list val) val-match))) >> - opts :test #'equal))) >> + (cl-pushnew (list key (TeX-delete-duplicate-strings (append (list val) val-match))) >> + opts :test #'equal))) >> (setq LaTeX-floatrow-key-val-options-local (copy-alist opts)))))) >> >> (defun LaTeX-floatrow-arg-floatbox (optional) >> diff --git a/style/fvextra.el b/style/fvextra.el >> index eeb7d37a..7f49d6cc 100644 >> --- a/style/fvextra.el >> +++ b/style/fvextra.el >> @@ -31,8 +31,9 @@ >> >> ;;; Code: >> >> -;; Needed for compiling `pushnew': >> -(eval-when-compile (require 'cl)) >> +;; Needed for compiling `cl-pushnew': >> +(eval-when-compile >> + (require 'cl-lib)) >> >> (defvar LaTeX-fvextra-key-val-options >> '(;; 3 General options >> @@ -99,8 +100,8 @@ >> (dolist (x keys) >> (setq tmp (assq-delete-all (car (assoc x tmp)) tmp)) >> (if (string= x "highlightcolor") >> - (pushnew (list x (mapcar #'car (funcall colorcmd))) tmp :test #'equal) >> - (pushnew (list x (append '("none") (mapcar #'car (funcall colorcmd)))) tmp :test #'equal))) >> + (cl-pushnew (list x (mapcar #'car (funcall colorcmd))) tmp :test #'equal) >> + (cl-pushnew (list x (append '("none") (mapcar #'car (funcall colorcmd)))) tmp :test #'equal))) >> (setq LaTeX-fancyvrb-key-val-options-local >> (copy-alist tmp))))) >> >> diff --git a/style/listings.el b/style/listings.el >> index 73ddc00f..52adba34 100644 >> --- a/style/listings.el >> +++ b/style/listings.el >> @@ -40,8 +40,9 @@ >> >> ;;; Code: >> >> -;; Needed for compiling `pushnew': >> -(eval-when-compile (require 'cl)) >> +;; Needed for compiling `cl-pushnew': >> +(eval-when-compile >> + (require 'cl-lib)) >> >> ;; The following are options taken from chapter 4 of the listings >> ;; manual (2007/02/22 Version 1.4). >> @@ -284,9 +285,9 @@ with user-defined values via the \"lstdefinestyle\" macro." >> (key (car elt)) >> (temp (copy-alist LaTeX-listings-key-val-options-local)) >> (opts (assq-delete-all (car (assoc key temp)) temp))) >> - (pushnew (list key (TeX-delete-duplicate-strings >> - (mapcar #'car (LaTeX-listings-lstdefinestyle-list)))) >> - opts :test #'equal) >> + (cl-pushnew (list key (TeX-delete-duplicate-strings >> + (mapcar #'car (LaTeX-listings-lstdefinestyle-list)))) >> + opts :test #'equal) >> (setq LaTeX-listings-key-val-options-local >> (copy-alist opts)))) >> >> diff --git a/style/mdframed.el b/style/mdframed.el >> index cd26e3fd..ed643dac 100644 >> --- a/style/mdframed.el >> +++ b/style/mdframed.el >> @@ -37,8 +37,9 @@ >> >> ;;; Code: >> >> -;; Needed for compiling `pushnew': >> -(eval-when-compile (require 'cl)) >> +;; Needed for compiling `cl-pushnew': >> +(eval-when-compile >> + (require 'cl-lib)) >> >> ;; Needed for auto-parsing. >> (require 'tex) >> @@ -214,9 +215,9 @@ >> (val (cadr (assoc "style" LaTeX-mdframed-key-val-options))) >> (temp (copy-alist LaTeX-mdframed-key-val-options-local)) >> (opts (assq-delete-all (car (assoc key temp)) temp))) >> - (pushnew (list key (TeX-delete-duplicate-strings >> - (append val (mapcar #'car (LaTeX-mdframed-mdfdefinestyle-list))))) >> - opts :test #'equal) >> + (cl-pushnew (list key (TeX-delete-duplicate-strings >> + (append val (mapcar #'car (LaTeX-mdframed-mdfdefinestyle-list))))) >> + opts :test #'equal) >> (setq LaTeX-mdframed-key-val-options-local >> (copy-alist opts)))) >> ;; >> @@ -242,7 +243,7 @@ >> (tmp (copy-alist LaTeX-mdframed-key-val-options-local))) >> (dolist (x keys) >> (setq tmp (assq-delete-all (car (assoc x tmp)) tmp)) >> - (pushnew (list x (mapcar #'car (funcall colorcmd))) tmp :test #'equal)) >> + (cl-pushnew (list x (mapcar #'car (funcall colorcmd))) tmp :test #'equal)) >> (setq LaTeX-mdframed-key-val-options-local >> (copy-alist tmp))))) >> >> diff --git a/style/tcolorbox.el b/style/tcolorbox.el >> index 6805983b..b8e65122 100644 >> --- a/style/tcolorbox.el >> +++ b/style/tcolorbox.el >> @@ -40,8 +40,9 @@ >> >> ;;; Code: >> >> -;; Needed for compiling `pushnew': >> -(eval-when-compile (require 'cl)) >> +;; Needed for compiling `cl-pushnew': >> +(eval-when-compile >> + (require 'cl-lib)) >> >> ;; Needed for auto-parsing. >> (require 'tex) >> @@ -476,7 +477,7 @@ e.g. \"tcolorboxlib-raster.el\"." >> (tmp (copy-alist LaTeX-tcolorbox-keyval-options-local))) >> (dolist (key keys) >> (setq tmp (assq-delete-all (car (assoc key tmp)) tmp)) >> - (pushnew >> + (cl-pushnew >> (list key (mapcar #'car (LaTeX-xcolor-definecolor-list))) tmp :test #'equal)) >> (setq LaTeX-tcolorbox-keyval-options-local (copy-alist tmp))) >> (setq LaTeX-tcolorbox-keyval-options-full From debbugs-submit-bounces@debbugs.gnu.org Fri Feb 16 03:15:02 2018 Received: (at 30424) by debbugs.gnu.org; 16 Feb 2018 08:15:02 +0000 Received: from localhost ([127.0.0.1]:45581 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1embAb-0004As-1r for submit@debbugs.gnu.org; Fri, 16 Feb 2018 03:15:02 -0500 Received: from eggs.gnu.org ([208.118.235.92]:42487) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1embAW-0004Ab-GM for 30424@debbugs.gnu.org; Fri, 16 Feb 2018 03:14:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1embAM-0002LD-Nn for 30424@debbugs.gnu.org; Fri, 16 Feb 2018 03:14:51 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,T_RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:47314) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1embAM-0002L4-IX for 30424@debbugs.gnu.org; Fri, 16 Feb 2018 03:14:46 -0500 Received: from mail-it0-f44.google.com ([209.85.214.44]:38159) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1embAM-0000Z4-3b for 30424@debbugs.gnu.org; Fri, 16 Feb 2018 03:14:46 -0500 Received: by mail-it0-f44.google.com with SMTP id k6so1104370ita.3 for <30424@debbugs.gnu.org>; Fri, 16 Feb 2018 00:14:46 -0800 (PST) X-Gm-Message-State: APf1xPBvAmhrWZk9GF82MFYOIJIb5gYA1PIk4qMcqrONCMVQWUVIICvw e6oWzUGJjaws8GTb8MBe5LQhpHSWThPkZrMQARk= X-Google-Smtp-Source: AH8x224GzzI69fAzSa/jHDl7Ho0iTBBYHboBxNs9gRHIpn10VR/WXAJfivEAQk9a5lov4+BvUBuId7TgLOogbbGlG98= X-Received: by 10.36.194.70 with SMTP id i67mr5704329itg.56.1518768885460; Fri, 16 Feb 2018 00:14:45 -0800 (PST) MIME-Version: 1.0 Received: by 10.2.10.130 with HTTP; Fri, 16 Feb 2018 00:14:05 -0800 (PST) In-Reply-To: <87wozjo0ra.fsf@gmail.com> References: <87wozjo0ra.fsf@gmail.com> From: =?UTF-8?Q?Mos=C3=A8_Giordano?= Date: Fri, 16 Feb 2018 09:14:05 +0100 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: bug#30424: [patch] replace cl with cl-lib To: Alex Branham Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 30424 Cc: 30424@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Hi Alex, thanks for this new patch. From what I've seen this doesn't introduce runtime dependence on cl-lib but just replaces cl macros with corresponding cl-lib macros, is this correct? Bye, Mos=C3=A8 2018-02-11 19:10 GMT+01:00 Alex Branham : > The attached patch replaces cl with cl-lib. > > From 6bc94eaee8a189af5f847878b6280c6a1a0e4b54 Mon Sep 17 00:00:00 2001 > From: Alex Branham > Date: Tue, 30 Jan 2018 20:56:13 -0600 > Subject: [PATCH] Replace cl with cl-lib > > --- > bib-cite.el | 5 +++-- > font-latex.el | 2 +- > latex.el | 3 ++- > style/babel.el | 3 ++- > style/caption.el | 22 +++++++++++----------- > style/empheq.el | 12 ++++++------ > style/enumitem.el | 18 +++++++++--------- > style/floatrow.el | 17 +++++++++-------- > style/fvextra.el | 9 +++++---- > style/listings.el | 11 ++++++----- > style/mdframed.el | 13 +++++++------ > style/tcolorbox.el | 7 ++++--- > 12 files changed, 65 insertions(+), 57 deletions(-) > > diff --git a/bib-cite.el b/bib-cite.el > index 0be0eb0b..5cb8a1d2 100644 > --- a/bib-cite.el > +++ b/bib-cite.el > @@ -589,7 +589,8 @@ > ;; ---------------------------------------------------------------------= ------- > ;;; Code: > > -(eval-when-compile (require 'cl)) > +(eval-when-compile > + (require 'cl-lib)) > > (defgroup bib-cite nil > "bib-cite, LaTeX minor-mode to display \\cite, \\ref and \\label comma= nds." > @@ -2427,7 +2428,7 @@ bib-dos-or-os2-variable affects: > (or (and (fboundp 'TeX-split-string) > (TeX-split-string sep-char value)) > (dired-split sep-char value))))) > - (loop for x in entries if (bib-cite-file-directory-p x) collect x)= ))) > + (cl-loop for x in entries if (bib-cite-file-directory-p x) collect= x)))) > > (provide 'bib-cite) > ;;; bib-cite.el ends here > diff --git a/font-latex.el b/font-latex.el > index 9b621985..1df751ad 100644 > --- a/font-latex.el > +++ b/font-latex.el > @@ -43,7 +43,7 @@ > (require 'tex) > > (eval-when-compile > - (require 'cl)) > + (require 'cl-lib)) > > (defgroup font-latex nil > "Font-latex text highlighting package." > diff --git a/latex.el b/latex.el > index c2d8a4ca..05d6f55c 100644 > --- a/latex.el > +++ b/latex.el > @@ -31,7 +31,8 @@ > (require 'tex) > (require 'tex-style) > (require 'tex-ispell) > -(eval-when-compile (require 'cl)) ;FIXME: Use cl-lib. > +(eval-when-compile > + (require 'cl-lib)) > > ;;; Syntax > > diff --git a/style/babel.el b/style/babel.el > index c1119b9b..d8c5e3ff 100644 > --- a/style/babel.el > +++ b/style/babel.el > @@ -30,7 +30,8 @@ > > ;;; Code: > > -(eval-when-compile (require 'cl)) > +(eval-when-compile > + (require 'cl-lib)) > > (defvar LaTeX-babel-language-list > '("afrikaans" > diff --git a/style/caption.el b/style/caption.el > index df6328e3..f23e59da 100644 > --- a/style/caption.el > +++ b/style/caption.el > @@ -34,8 +34,8 @@ > > ;;; Code: > > -;; Needed for compiling `pushnew': > -(eval-when-compile (require 'cl)) > +(eval-when-compile > + (require 'cl-lib)) > > ;; Needed for auto-parsing. > (require 'tex) > @@ -168,19 +168,19 @@ in `caption'-completions." > ;; For `\DeclareCaptionOption', only add the value > ;; (remember: key=3D^^^^^^, val=3D"defined key") > (if (string-equal key "option") > - (pushnew (list val) opts :test #'equal) > + (cl-pushnew (list val) opts :test #'equal) > ;; For anything but `\DeclareCaptionOption', do the standard > ;; procedure. Again, take care of `subrefformat' for `subcaption= .el'. > (if val-match > (progn > (when (and (string-equal key "labelformat") > (boundp 'LaTeX-subcaption-key-val-options)) > - (pushnew (list "subrefformat" > - (TeX-delete-duplicate-strings (apply #'app= end (list val) val-match))) > - opts :test #'equal)) > - (pushnew (list key (TeX-delete-duplicate-strings (apply #'a= ppend (list val) val-match))) > - opts :test #'equal)) > - (pushnew (list key (list val)) opts :test #'equal))) > + (cl-pushnew (list "subrefformat" > + (TeX-delete-duplicate-strings (apply #'= append (list val) val-match))) > + opts :test #'equal)) > + (cl-pushnew (list key (TeX-delete-duplicate-strings (apply = #'append (list val) val-match))) > + opts :test #'equal)) > + (cl-pushnew (list key (list val)) opts :test #'equal))) > (setq LaTeX-caption-key-val-options-local (copy-alist opts)))) > ;; Support for environments defined with newfloat.sty: These > ;; environments are added to "type" and "type*" key: > @@ -192,8 +192,8 @@ in `caption'-completions." > (val-match (cdr (assoc key LaTeX-caption-key-val-options-loc= al))) > (temp (copy-alist LaTeX-caption-key-val-options-local)) > (opts (assq-delete-all (car (assoc key temp)) temp))) > - (pushnew (list key (TeX-delete-duplicate-strings (apply #'append = val val-match))) > - opts :test #'equal) > + (cl-pushnew (list key (TeX-delete-duplicate-strings (apply #'appe= nd val val-match))) > + opts :test #'equal) > (setq LaTeX-caption-key-val-options-local (copy-alist opts)))))) > > (defun LaTeX-arg-caption-command (optional &optional prompt) > diff --git a/style/empheq.el b/style/empheq.el > index 4365136e..b0231e82 100644 > --- a/style/empheq.el > +++ b/style/empheq.el > @@ -31,8 +31,8 @@ > > ;;; Code: > > -;; Needed for compiling `pushnew': > -(eval-when-compile (require 'cl)) > +(eval-when-compile > + (require 'cl-lib)) > > ;; Needed for auto-parsing. > (require 'tex) > @@ -142,11 +142,11 @@ > (where (cadr delims))) > (if (string=3D where "Left") > (progn > - (pushnew (concat TeX-esc "empheq" delim) lval :test #'equ= al) > - (pushnew (concat TeX-esc "empheqbig" delim) lval :test #'= equal)) > + (cl-pushnew (concat TeX-esc "empheq" delim) lval :test #'= equal) > + (cl-pushnew (concat TeX-esc "empheqbig" delim) lval :test= #'equal)) > (progn > - (pushnew (concat TeX-esc "empheq" delim) rval :test #'equal= ) > - (pushnew (concat TeX-esc "empheqbig" delim) rval :test #'eq= ual))))) > + (cl-pushnew (concat TeX-esc "empheq" delim) rval :test #'eq= ual) > + (cl-pushnew (concat TeX-esc "empheqbig" delim) rval :test #= 'equal))))) > (when lval > (setq tmp (assq-delete-all (car (assoc "left" tmp)) tmp)) > (setq lvals (append lval lvals)) > diff --git a/style/enumitem.el b/style/enumitem.el > index f347446a..1518a7a6 100644 > --- a/style/enumitem.el > +++ b/style/enumitem.el > @@ -38,8 +38,8 @@ > > ;;; Code: > > -;; Needed for compiling `pushnew': > -(eval-when-compile (require 'cl)) > +(eval-when-compile > + (require 'cl-lib)) > > ;; Needed for auto-parsing. > (require 'tex) > @@ -266,9 +266,9 @@ in `enumitem'-completions." > (temp (copy-alist LaTeX-enumitem-key-val-options-local)) > (opts (assq-delete-all (car (assoc key temp)) temp))) > (if val-match > - (pushnew (list key (TeX-delete-duplicate-strings (apply #'appen= d (list val) val-match))) > - opts :test #'equal) > - (pushnew (list key (list val)) opts :test #'equal)) > + (cl-pushnew (list key (TeX-delete-duplicate-strings (apply #'ap= pend (list val) val-match))) > + opts :test #'equal) > + (cl-pushnew (list key (list val)) opts :test #'equal)) > (setq LaTeX-enumitem-key-val-options-local (copy-alist opts)))) > (dolist (newalign (LaTeX-enumitem-SetLabelAlign-list)) > (let* ((key "align") > @@ -276,8 +276,8 @@ in `enumitem'-completions." > (val-match (cdr (assoc key LaTeX-enumitem-key-val-options-loca= l))) > (temp (copy-alist LaTeX-enumitem-key-val-options-local)) > (opts (assq-delete-all (car (assoc key temp)) temp))) > - (pushnew (list key (TeX-delete-duplicate-strings (apply #'append (= list val) val-match))) > - opts :test #'equal) > + (cl-pushnew (list key (TeX-delete-duplicate-strings (apply #'appen= d (list val) val-match))) > + opts :test #'equal) > (setq LaTeX-enumitem-key-val-options-local (copy-alist opts))))) > > (TeX-add-style-hook > @@ -405,13 +405,13 @@ in `enumitem'-completions." > (lambda () > (let ((enums '("enumerate"))) > (when (LaTeX-provided-package-options-member "enumitem" "inlin= e") > - (pushnew "enumerate*" enums :test #'equal)) > + (cl-pushnew "enumerate*" enums :test #'equal)) > (dolist (env-type (LaTeX-enumitem-newlist-list)) > (let ((env (car env-type)) > (type (cadr env-type))) > (when (or (string-equal type "enumerate") > (string-equal type "enumerate*")) > - (pushnew env enums :test #'equal)))) > + (cl-pushnew env enums :test #'equal)))) > (completing-read "List name: " enums))))) > > ;; "Align" is added as new value to "align" key in key-val list. > diff --git a/style/floatrow.el b/style/floatrow.el > index 5beb1096..bc358d1b 100644 > --- a/style/floatrow.el > +++ b/style/floatrow.el > @@ -58,8 +58,9 @@ > > ;;; Code: > > -;; Needed for compiling `pushnew': > -(eval-when-compile (require 'cl)) > +;; Needed for compiling `cl-pushnew': > +(eval-when-compile > + (require 'cl-lib)) > > ;; Needed for auto-parsing. > (require 'tex) > @@ -317,15 +318,15 @@ > (assq-delete-all (car (assoc key temp)) temp)))= )) > (cond ((string=3D key "precode") > (dolist (x vcode-keys) > - (pushnew (list x (TeX-delete-duplicate-strings (append (= list val) val-match))) > - opts :test #'equal))) > + (cl-pushnew (list x (TeX-delete-duplicate-strings (appen= d (list val) val-match))) > + opts :test #'equal))) > ((string=3D key "floatrowsep") > (dolist (x sep-keys) > - (pushnew (list x (TeX-delete-duplicate-strings (append (= list val) val-match))) > - opts :test #'equal))) > + (cl-pushnew (list x (TeX-delete-duplicate-strings (appen= d (list val) val-match))) > + opts :test #'equal))) > (t > - (pushnew (list key (TeX-delete-duplicate-strings (append (= list val) val-match))) > - opts :test #'equal))) > + (cl-pushnew (list key (TeX-delete-duplicate-strings (appen= d (list val) val-match))) > + opts :test #'equal))) > (setq LaTeX-floatrow-key-val-options-local (copy-alist opts)))))) > > (defun LaTeX-floatrow-arg-floatbox (optional) > diff --git a/style/fvextra.el b/style/fvextra.el > index eeb7d37a..7f49d6cc 100644 > --- a/style/fvextra.el > +++ b/style/fvextra.el > @@ -31,8 +31,9 @@ > > ;;; Code: > > -;; Needed for compiling `pushnew': > -(eval-when-compile (require 'cl)) > +;; Needed for compiling `cl-pushnew': > +(eval-when-compile > + (require 'cl-lib)) > > (defvar LaTeX-fvextra-key-val-options > '(;; 3 General options > @@ -99,8 +100,8 @@ > (dolist (x keys) > (setq tmp (assq-delete-all (car (assoc x tmp)) tmp)) > (if (string=3D x "highlightcolor") > - (pushnew (list x (mapcar #'car (funcall colorcmd))) tmp :test= #'equal) > - (pushnew (list x (append '("none") (mapcar #'car (funcall color= cmd)))) tmp :test #'equal))) > + (cl-pushnew (list x (mapcar #'car (funcall colorcmd))) tmp :t= est #'equal) > + (cl-pushnew (list x (append '("none") (mapcar #'car (funcall co= lorcmd)))) tmp :test #'equal))) > (setq LaTeX-fancyvrb-key-val-options-local > (copy-alist tmp))))) > > diff --git a/style/listings.el b/style/listings.el > index 73ddc00f..52adba34 100644 > --- a/style/listings.el > +++ b/style/listings.el > @@ -40,8 +40,9 @@ > > ;;; Code: > > -;; Needed for compiling `pushnew': > -(eval-when-compile (require 'cl)) > +;; Needed for compiling `cl-pushnew': > +(eval-when-compile > + (require 'cl-lib)) > > ;; The following are options taken from chapter 4 of the listings > ;; manual (2007/02/22 Version 1.4). > @@ -284,9 +285,9 @@ with user-defined values via the \"lstdefinestyle\" m= acro." > (key (car elt)) > (temp (copy-alist LaTeX-listings-key-val-options-local)) > (opts (assq-delete-all (car (assoc key temp)) temp))) > - (pushnew (list key (TeX-delete-duplicate-strings > - (mapcar #'car (LaTeX-listings-lstdefinestyle-list= )))) > - opts :test #'equal) > + (cl-pushnew (list key (TeX-delete-duplicate-strings > + (mapcar #'car (LaTeX-listings-lstdefinestyle-l= ist)))) > + opts :test #'equal) > (setq LaTeX-listings-key-val-options-local > (copy-alist opts)))) > > diff --git a/style/mdframed.el b/style/mdframed.el > index cd26e3fd..ed643dac 100644 > --- a/style/mdframed.el > +++ b/style/mdframed.el > @@ -37,8 +37,9 @@ > > ;;; Code: > > -;; Needed for compiling `pushnew': > -(eval-when-compile (require 'cl)) > +;; Needed for compiling `cl-pushnew': > +(eval-when-compile > + (require 'cl-lib)) > > ;; Needed for auto-parsing. > (require 'tex) > @@ -214,9 +215,9 @@ > (val (cadr (assoc "style" LaTeX-mdframed-key-val-options))) > (temp (copy-alist LaTeX-mdframed-key-val-options-local)) > (opts (assq-delete-all (car (assoc key temp)) temp))) > - (pushnew (list key (TeX-delete-duplicate-strings > - (append val (mapcar #'car (LaTeX-mdframed-mdfde= finestyle-list))))) > - opts :test #'equal) > + (cl-pushnew (list key (TeX-delete-duplicate-strings > + (append val (mapcar #'car (LaTeX-mdframed-md= fdefinestyle-list))))) > + opts :test #'equal) > (setq LaTeX-mdframed-key-val-options-local > (copy-alist opts)))) > ;; > @@ -242,7 +243,7 @@ > (tmp (copy-alist LaTeX-mdframed-key-val-options-local))) > (dolist (x keys) > (setq tmp (assq-delete-all (car (assoc x tmp)) tmp)) > - (pushnew (list x (mapcar #'car (funcall colorcmd))) tmp :test #'e= qual)) > + (cl-pushnew (list x (mapcar #'car (funcall colorcmd))) tmp :test = #'equal)) > (setq LaTeX-mdframed-key-val-options-local > (copy-alist tmp))))) > > diff --git a/style/tcolorbox.el b/style/tcolorbox.el > index 6805983b..b8e65122 100644 > --- a/style/tcolorbox.el > +++ b/style/tcolorbox.el > @@ -40,8 +40,9 @@ > > ;;; Code: > > -;; Needed for compiling `pushnew': > -(eval-when-compile (require 'cl)) > +;; Needed for compiling `cl-pushnew': > +(eval-when-compile > + (require 'cl-lib)) > > ;; Needed for auto-parsing. > (require 'tex) > @@ -476,7 +477,7 @@ e.g. \"tcolorboxlib-raster.el\"." > (tmp (copy-alist LaTeX-tcolorbox-keyval-options-local))) > (dolist (key keys) > (setq tmp (assq-delete-all (car (assoc key tmp)) tmp)) > - (pushnew > + (cl-pushnew > (list key (mapcar #'car (LaTeX-xcolor-definecolor-list))) tmp :te= st #'equal)) > (setq LaTeX-tcolorbox-keyval-options-local (copy-alist tmp))) > (setq LaTeX-tcolorbox-keyval-options-full > -- > 2.16.1 > > > > > _______________________________________________ > bug-auctex mailing list > bug-auctex@gnu.org > https://lists.gnu.org/mailman/listinfo/bug-auctex > From debbugs-submit-bounces@debbugs.gnu.org Fri Feb 16 10:05:18 2018 Received: (at 30424) by debbugs.gnu.org; 16 Feb 2018 15:05:18 +0000 Received: from localhost ([127.0.0.1]:47061 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1emhZd-0005Zd-Vr for submit@debbugs.gnu.org; Fri, 16 Feb 2018 10:05:18 -0500 Received: from mail-ot0-f173.google.com ([74.125.82.173]:45301) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1emhZc-0005ZH-SF for 30424@debbugs.gnu.org; Fri, 16 Feb 2018 10:05:17 -0500 Received: by mail-ot0-f173.google.com with SMTP id m15so2915997otf.12 for <30424@debbugs.gnu.org>; Fri, 16 Feb 2018 07:05:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=references:user-agent:from:to:cc:subject:in-reply-to:date :message-id:mime-version:content-transfer-encoding; bh=aAXpAzWomOBYXvTfInXLbFdwgg5kg4LkqkuNyV6bsZA=; b=O1Z4TEsz88sBMPJhKWlBht1rhAZ/+aCCf9QkKHVnuNaRihN+57RCCigk7onV8z73nd MCa21gdFrrTKwtXLs7rJtHa4ILBJ6PYqKAwHbr+/tQgxPu7pkdD7pUvDXkzvPfoaQsS4 3E2aNd/vvqlnlIzTGWXl/rwzIr7WrPjLczLJqFxqHGyuwd8m1BUo2L/PMh/KIEXZpmTW mqJenI9wZdOxGmB8kBScubHuK1anigAB4LPL6Qp5uOCpQHAba49qicB94YkQQhMpqzYu VStWm8ITYC8i7KRr1AfJ5xKwEciBYRkJUYSjpVLR4flbZns2QT+P77z5w+ul3r1qmIyW JmmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:references:user-agent:from:to:cc:subject :in-reply-to:date:message-id:mime-version:content-transfer-encoding; bh=aAXpAzWomOBYXvTfInXLbFdwgg5kg4LkqkuNyV6bsZA=; b=o169Ah1pBOX8j+RzYKJG82cY7LZRXYNLKwdz4JtpY4luhZUhExOnGgh+xw+7UocVsq 2Jz8J+wRep/l7SJmiis9M0mseOXNceS0gF3Bfa+dYEyb5Fwqidns+0GXMTJm7vJtYQtO q34vIzwVNddZ19KH/ZoIz1TmBd0W9Jf9hMNwzs108tGpn6lUPL+NTIPDuj32VJqFgK0f lKFu9tOs7sZhZ0wahtgjLYlNUJBc87/9s+tBXfapWblXIGpd3BquGCp5AkJgiiUkaKd3 df4Agw6dPLwjsNrgsRMTM6s5dfG8BHPbDDT/I6W6fSCN4gidfUGR+mAbc/QN6eIQvMmV 99yQ== X-Gm-Message-State: APf1xPC5gErZgNhH/pOL+4Kf/8EPAxByVjMqkVyRRfEL4UArUUCAlhqV m6rSwvai5lmfnlFAB3npavmze+k+ X-Google-Smtp-Source: AH8x226K1mFQ60r0DExXqhxl6BthL5F/4Aae2hIpb+rJkOnyMhbfZmJFIKA47Audor7ZExCVMrp3HQ== X-Received: by 10.157.42.194 with SMTP id e60mr4882485otb.227.1518793507360; Fri, 16 Feb 2018 07:05:07 -0800 (PST) Received: from mars (nat-128-62-63-249.public.utexas.edu. [128.62.63.249]) by smtp.gmail.com with ESMTPSA id s62sm463972oia.37.2018.02.16.07.05.06 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 16 Feb 2018 07:05:06 -0800 (PST) References: <87wozjo0ra.fsf@gmail.com> User-agent: mu4e 1.0; emacs 26.0.91 From: Alex Branham To: =?utf-8?Q?Mos=C3=A8?= Giordano Subject: Re: bug#30424: [patch] replace cl with cl-lib In-reply-to: Date: Fri, 16 Feb 2018 09:05:36 -0600 Message-ID: <87efll3rgf.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 30424 Cc: 30424@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) On Fri 16 Feb 2018 at 02:14, Mos=C3=A8 Giordano wrote: > Hi Alex, > > thanks for this new patch. From what I've seen this doesn't introduce > runtime dependence on cl-lib but just replaces cl macros with > corresponding cl-lib macros, is this correct? Yes, that's right. I noticed a few comments like, "FIXME use cl-lib instead of cl" when writing the flymake support and decided that it would be a pretty easy fix for me to contribute. From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 17 13:55:43 2018 Received: (at 30424-done) by debbugs.gnu.org; 17 Feb 2018 18:55:43 +0000 Received: from localhost ([127.0.0.1]:48605 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1en7eA-0003Ts-TJ for submit@debbugs.gnu.org; Sat, 17 Feb 2018 13:55:43 -0500 Received: from eggs.gnu.org ([208.118.235.92]:55918) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1en7e9-0003Te-OQ for 30424-done@debbugs.gnu.org; Sat, 17 Feb 2018 13:55:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1en7e0-0000Wy-Dk for 30424-done@debbugs.gnu.org; Sat, 17 Feb 2018 13:55:36 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,T_RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:56983) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1en7dz-0000Wg-RZ for 30424-done@debbugs.gnu.org; Sat, 17 Feb 2018 13:55:32 -0500 Received: from mail-io0-f178.google.com ([209.85.223.178]:44780) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1en7dz-00031L-Il for 30424-done@debbugs.gnu.org; Sat, 17 Feb 2018 13:55:31 -0500 Received: by mail-io0-f178.google.com with SMTP id z6so7431596iob.11 for <30424-done@debbugs.gnu.org>; Sat, 17 Feb 2018 10:55:31 -0800 (PST) X-Gm-Message-State: APf1xPCM5GmBgf3TigF3NLDtrNeJWxYaLQRZb1In+EdduwIZaPFlM//J hdiNK2kfIsnffmZ0ZHbfp82vM7DVkinlrBAxtrc= X-Google-Smtp-Source: AH8x226G5O6z00xrkrvvM4/Ss3IhRut70rDH9RkPnO1NO5BI09Go2mGIuoH2N365DkWgDZI1kTDOgLJMYJZCg2J1CP4= X-Received: by 10.107.43.203 with SMTP id r194mr13725555ior.221.1518893730814; Sat, 17 Feb 2018 10:55:30 -0800 (PST) MIME-Version: 1.0 Received: by 10.2.10.130 with HTTP; Sat, 17 Feb 2018 10:54:50 -0800 (PST) In-Reply-To: <87efll3rgf.fsf@gmail.com> References: <87wozjo0ra.fsf@gmail.com> <87efll3rgf.fsf@gmail.com> From: =?UTF-8?Q?Mos=C3=A8_Giordano?= Date: Sat, 17 Feb 2018 19:54:50 +0100 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: bug#30424: [patch] replace cl with cl-lib To: Alex Branham Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 30424-done Cc: 30424-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Hi Alex, patch installed, thanks! 2018-02-16 16:05 GMT+01:00 Alex Branham : > Yes, that's right. I noticed a few comments like, "FIXME use cl-lib > instead of cl" when writing the flymake support and decided that it > would be a pretty easy fix for me to contribute. Good idea, I think those are cookies left by Stefan :-) Bye, Mos=C3=A8 From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 18 09:38:13 2018 Received: (at 30424) by debbugs.gnu.org; 18 Feb 2018 14:38:13 +0000 Received: from localhost ([127.0.0.1]:49053 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1enQ6X-00086i-D8 for submit@debbugs.gnu.org; Sun, 18 Feb 2018 09:38:13 -0500 Received: from eggs.gnu.org ([208.118.235.92]:60837) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1enQ6V-00086T-9W for 30424@debbugs.gnu.org; Sun, 18 Feb 2018 09:38:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1enQ6O-0006IK-5r for 30424@debbugs.gnu.org; Sun, 18 Feb 2018 09:38:05 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:41384) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1enQ6O-0006IG-2J; Sun, 18 Feb 2018 09:38:04 -0500 Received: from p5b326074.dip0.t-ipconnect.de ([91.50.96.116]:51494 helo=MUTANT) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.82) (envelope-from ) id 1enQ6L-0008Vu-D8; Sun, 18 Feb 2018 09:38:01 -0500 From: Arash Esbati To: =?iso-8859-1?Q?Mos=E8?= Giordano Subject: Re: bug#30424: [patch] replace cl with cl-lib References: <87wozjo0ra.fsf@gmail.com> Date: Sun, 18 Feb 2018 15:37:19 +0100 In-Reply-To: (=?iso-8859-1?Q?=22Mos=E8?= Giordano"'s message of "Fri, 16 Feb 2018 09:14:05 +0100") Message-ID: <86371ybbz4.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 30424 Cc: Alex Branham , 30424@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Mos=E8 Giordano writes: > Hi Alex, > > thanks for this new patch. From what I've seen this doesn't introduce > runtime dependence on cl-lib but just replaces cl macros with > corresponding cl-lib macros, is this correct? Hi Mos=E8, I was wondering why we don't go for (require 'cl-lib)? Since we're supporting Emacs>=3D24 only, I think it doesn't harm to make a change here. Or am I missing something? @Alex: Many thanks for your patch. I replaced 2 pushnew's in babel.el. Best, Arash From unknown Fri Sep 12 09:56:16 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 19 Mar 2018 11:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator