From unknown Fri Sep 05 11:50:27 2025 X-Loop: help-debbugs@gnu.org Subject: bug#30640: [patch] replace last cl Resent-From: Alex Branham Original-Sender: "Debbugs-submit" Resent-CC: bug-auctex@gnu.org Resent-Date: Wed, 28 Feb 2018 00:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 30640 X-GNU-PR-Package: auctex X-GNU-PR-Keywords: patch To: 30640@debbugs.gnu.org X-Debbugs-Original-To: "" Received: via spool by submit@debbugs.gnu.org id=B.15197788294134 (code B ref -1); Wed, 28 Feb 2018 00:48:02 +0000 Received: (at submit) by debbugs.gnu.org; 28 Feb 2018 00:47:09 +0000 Received: from localhost ([127.0.0.1]:36237 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eqptl-00014c-7G for submit@debbugs.gnu.org; Tue, 27 Feb 2018 19:47:09 -0500 Received: from eggs.gnu.org ([208.118.235.92]:57265) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eqptj-00014B-FZ for submit@debbugs.gnu.org; Tue, 27 Feb 2018 19:47:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eqptc-0003HE-7m for submit@debbugs.gnu.org; Tue, 27 Feb 2018 19:47:01 -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,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:42799) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eqptc-0003Gm-3u for submit@debbugs.gnu.org; Tue, 27 Feb 2018 19:47:00 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48233) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eqpta-0008Kx-Do for bug-auctex@gnu.org; Tue, 27 Feb 2018 19:46:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eqptX-00039z-40 for bug-auctex@gnu.org; Tue, 27 Feb 2018 19:46:58 -0500 Received: from mail-oi0-x233.google.com ([2607:f8b0:4003:c06::233]:45162) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eqptW-00039o-Pa for bug-auctex@gnu.org; Tue, 27 Feb 2018 19:46:55 -0500 Received: by mail-oi0-x233.google.com with SMTP id j79so535408oib.12 for ; Tue, 27 Feb 2018 16:46:54 -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=itSOnGK1mkrCyN3dOD+HUibN89LFuaZ9Z6i8rJ4vyVE=; b=TnfeXM6owFDdwRt58FlWGlWPvdM+zVmWuz6AA0jp66rEHVrC5fu8RktwF1DyfmWkIR CihuTf13osD31xM9SaLvu3CzvF7IwAxwcG/oQ1aZah7MulahmfixtoDP93Y4Ybk6PDh1 LXViBgNye8ehLibch2NdLKyl1JzboXRYFcPvyKXyyE1aXKy3JKNwtaeFtqrb7QOidS7d Yy6LCSzoZ/yR95HThTn9SfO752Hj4qGO3oNHtgmzhxYE3Elq20qa9JbJcQNc3t2MNghT DUds/s3u6lhCs+hwF+1LkyRcknxBRfIngYnJIlsBUxMJcOhpOweodI+MK8eDrYk8jcj6 P5Gg== 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=itSOnGK1mkrCyN3dOD+HUibN89LFuaZ9Z6i8rJ4vyVE=; b=tBiaQjLxT0EyvENeUTieHhmoFgT4yadD1HZAUk7eeNW3fqTA94HeB6akuSDN6dTUPn aCPbexvNYb/iNgS0h3g4sLwwYZV8f+BF4RQupubARe81V6iGaY3ggRvTQU+JVN2mc6eI vtXISyL6bGcKkKu6xM/NcUfjbaE3TYJnraahd4nnitaGvZhD8LRMfz9GrBYXFknq9oRf I2TnetPMDHAcWUlGq/+waAs+RSSTYoilM3FsGwY09mITemfeDjUiMk2/mwBH3/UzoO9E CWFFD96HblvdlGkd84SP0EmE8dLS9UqDbbkvMUje27byDAZr71ossVneZWzbDGOwb1C+ JK1g== X-Gm-Message-State: AElRT7G5PABhMKD1FECh84Mx+tvQhM35pV2oIiAqiYNuqKxGYkuFwcuE YJTCxkMSOZI0suwRxS+kiK9uM848 X-Google-Smtp-Source: AG47ELvXJVd4PuH8x3rLQuGZMo8EB1Xs6/zdkOeEZkZqrNoOcmTEU5TCQrw24F9U4sUC4K61OSQkmA== X-Received: by 10.202.54.87 with SMTP id d84mr2245807oia.297.1519778813634; Tue, 27 Feb 2018 16:46:53 -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 j196sm249308oih.3.2018.02.27.16.46.51 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 27 Feb 2018 16:46:52 -0800 (PST) User-agent: mu4e 1.0; emacs 26.0.91 From: Alex Branham Date: Tue, 27 Feb 2018 18:47:33 -0600 Message-ID: <877eqy7xei.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-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 I think this takes case of the last (require 'cl) statement. Thanks, Alex ------------------------------------------------------------ >From 0befaa759ff22e9a8518c17095439fe11952e60b Mon Sep 17 00:00:00 2001 From: Alex Branham Date: Tue, 27 Feb 2018 18:45:03 -0600 Subject: [PATCH] * tex.el: replace (last?) 'cl with 'cl-lib --- tex.el | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/tex.el b/tex.el index 8863a886..b7891a14 100644 --- a/tex.el +++ b/tex.el @@ -1,6 +1,6 @@ ;;; tex.el --- Support for TeX documents. -;; Copyright (C) 1985-1987, 1991, 1993-2017 Free Software Foundation, Inc. +;; Copyright (C) 1985-1987, 1991, 1993-2018 Free Software Foundation, Inc. ;; Maintainer: auctex-devel@gnu.org ;; Keywords: tex @@ -34,7 +34,7 @@ (require 'custom) (require 'tex-site) (eval-when-compile - (require 'cl)) + (require 'cl-lib)) (defgroup TeX-file nil "Files used by AUCTeX." @@ -2710,11 +2710,11 @@ are returned." (dolist (subdir subdirs) (setq path (file-name-as-directory (concat item subdir))) (when (file-exists-p path) - (pushnew path input-dir-list :test #'equal))) + (cl-pushnew path input-dir-list :test #'equal))) (setq path (file-name-as-directory item)) (when (file-exists-p path) - (pushnew path input-dir-list :test #'equal)))) - ;; No duplication in result is assured since `pushnew' is + (cl-pushnew path input-dir-list :test #'equal)))) + ;; No duplication in result is assured since `cl-pushnew' is ;; used above. Should we introduce an option for speed just ;; to accumulate all the results without care for ;; duplicates? @@ -3131,6 +3131,7 @@ FORCE is not nil." (defcustom TeX-complete-word 'ispell-complete-word "*Function to call for completing non-macros in `tex-mode'." + :type 'function :group 'TeX-macro) (defcustom TeX-complete-expert-commands nil @@ -4521,7 +4522,7 @@ EXTENSIONS defaults to `TeX-file-extensions'." "$TEXMFDIST") "latex")) (when (file-readable-p dir) - (pushnew dir list :test #'equal))) + (cl-pushnew dir list :test #'equal))) (nreverse list))) (defcustom TeX-tree-roots (TeX-tree-roots) @@ -6404,7 +6405,7 @@ NAME may be a package, a command, or a document." (when (memq major-mode (nth 1 elt)) (let ((completions (funcall (nth 2 elt)))) (unless (null completions) - (pushnew (cons completions (nth 0 elt)) docs :test #'equal))))) + (cl-pushnew (cons completions (nth 0 elt)) docs :test #'equal))))) (if (null docs) (progn (if (executable-find "texdoc") @@ -6528,7 +6529,7 @@ of the car of `ispell-tex-skip-alists'. This only happens if (let ((raws (car ispell-tex-skip-alists)) (envs (cadr ispell-tex-skip-alists))) (dolist (x skip) - (pushnew x raws :test #'equal)) + (cl-pushnew x raws :test #'equal)) (setq ispell-tex-skip-alists (list raws envs))))) (defun TeX-ispell-skip-setcdr (skip) @@ -6541,7 +6542,7 @@ of the cdr of `ispell-tex-skip-alists'. This only happens if (let ((raws (car ispell-tex-skip-alists)) (envs (cadr ispell-tex-skip-alists))) (dolist (x skip) - (pushnew x envs :test #'equal)) + (cl-pushnew x envs :test #'equal)) (setq ispell-tex-skip-alists (list raws envs))))) (defun TeX-ispell-tex-arg-end (&optional arg1 arg2 arg3) -- 2.16.2 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-tex.el-replace-last-cl-with-cl-lib.patch >From 0befaa759ff22e9a8518c17095439fe11952e60b Mon Sep 17 00:00:00 2001 From: Alex Branham Date: Tue, 27 Feb 2018 18:45:03 -0600 Subject: [PATCH] * tex.el: replace (last?) 'cl with 'cl-lib --- tex.el | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/tex.el b/tex.el index 8863a886..b7891a14 100644 --- a/tex.el +++ b/tex.el @@ -1,6 +1,6 @@ ;;; tex.el --- Support for TeX documents. -;; Copyright (C) 1985-1987, 1991, 1993-2017 Free Software Foundation, Inc. +;; Copyright (C) 1985-1987, 1991, 1993-2018 Free Software Foundation, Inc. ;; Maintainer: auctex-devel@gnu.org ;; Keywords: tex @@ -34,7 +34,7 @@ (require 'custom) (require 'tex-site) (eval-when-compile - (require 'cl)) + (require 'cl-lib)) (defgroup TeX-file nil "Files used by AUCTeX." @@ -2710,11 +2710,11 @@ are returned." (dolist (subdir subdirs) (setq path (file-name-as-directory (concat item subdir))) (when (file-exists-p path) - (pushnew path input-dir-list :test #'equal))) + (cl-pushnew path input-dir-list :test #'equal))) (setq path (file-name-as-directory item)) (when (file-exists-p path) - (pushnew path input-dir-list :test #'equal)))) - ;; No duplication in result is assured since `pushnew' is + (cl-pushnew path input-dir-list :test #'equal)))) + ;; No duplication in result is assured since `cl-pushnew' is ;; used above. Should we introduce an option for speed just ;; to accumulate all the results without care for ;; duplicates? @@ -3131,6 +3131,7 @@ FORCE is not nil." (defcustom TeX-complete-word 'ispell-complete-word "*Function to call for completing non-macros in `tex-mode'." + :type 'function :group 'TeX-macro) (defcustom TeX-complete-expert-commands nil @@ -4521,7 +4522,7 @@ EXTENSIONS defaults to `TeX-file-extensions'." "$TEXMFDIST") "latex")) (when (file-readable-p dir) - (pushnew dir list :test #'equal))) + (cl-pushnew dir list :test #'equal))) (nreverse list))) (defcustom TeX-tree-roots (TeX-tree-roots) @@ -6404,7 +6405,7 @@ NAME may be a package, a command, or a document." (when (memq major-mode (nth 1 elt)) (let ((completions (funcall (nth 2 elt)))) (unless (null completions) - (pushnew (cons completions (nth 0 elt)) docs :test #'equal))))) + (cl-pushnew (cons completions (nth 0 elt)) docs :test #'equal))))) (if (null docs) (progn (if (executable-find "texdoc") @@ -6528,7 +6529,7 @@ of the car of `ispell-tex-skip-alists'. This only happens if (let ((raws (car ispell-tex-skip-alists)) (envs (cadr ispell-tex-skip-alists))) (dolist (x skip) - (pushnew x raws :test #'equal)) + (cl-pushnew x raws :test #'equal)) (setq ispell-tex-skip-alists (list raws envs))))) (defun TeX-ispell-skip-setcdr (skip) @@ -6541,7 +6542,7 @@ of the cdr of `ispell-tex-skip-alists'. This only happens if (let ((raws (car ispell-tex-skip-alists)) (envs (cadr ispell-tex-skip-alists))) (dolist (x skip) - (pushnew x envs :test #'equal)) + (cl-pushnew x envs :test #'equal)) (setq ispell-tex-skip-alists (list raws envs))))) (defun TeX-ispell-tex-arg-end (&optional arg1 arg2 arg3) -- 2.16.2 --=-=-=-- From unknown Fri Sep 05 11:50:27 2025 X-Loop: help-debbugs@gnu.org Subject: bug#30640: [patch] replace last cl Resent-From: =?UTF-8?Q?Mos=C3=A8?= Giordano Original-Sender: "Debbugs-submit" Resent-CC: bug-auctex@gnu.org Resent-Date: Thu, 01 Mar 2018 15:37:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 30640 X-GNU-PR-Package: auctex X-GNU-PR-Keywords: patch To: Alex Branham Cc: 30640@debbugs.gnu.org Received: via spool by 30640-submit@debbugs.gnu.org id=B30640.151991856110218 (code B ref 30640); Thu, 01 Mar 2018 15:37:01 +0000 Received: (at 30640) by debbugs.gnu.org; 1 Mar 2018 15:36:01 +0000 Received: from localhost ([127.0.0.1]:39466 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1erQFV-0002eg-Bw for submit@debbugs.gnu.org; Thu, 01 Mar 2018 10:36:01 -0500 Received: from eggs.gnu.org ([208.118.235.92]:60818) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1erQFT-0002eU-SA for 30640@debbugs.gnu.org; Thu, 01 Mar 2018 10:36:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1erQFL-0007Fj-En for 30640@debbugs.gnu.org; Thu, 01 Mar 2018 10:35:54 -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.0 required=5.0 tests=BAYES_40,T_RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:54837) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erQFL-0007FY-9C for 30640@debbugs.gnu.org; Thu, 01 Mar 2018 10:35:51 -0500 Received: from mail-ua0-f174.google.com ([209.85.217.174]:41220) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1erQFK-000391-JR for 30640@debbugs.gnu.org; Thu, 01 Mar 2018 10:35:50 -0500 Received: by mail-ua0-f174.google.com with SMTP id u99so4123479uau.8 for <30640@debbugs.gnu.org>; Thu, 01 Mar 2018 07:35:50 -0800 (PST) X-Gm-Message-State: APf1xPB/XbzOCYZ6K0qgXHUErA1QVVO/AVlNrAV/m/FxDOuImxKHvaME SxL0uZX10eFC65K5Brniej7qd3jnV4FUD8izP8o= X-Google-Smtp-Source: AG47ELuIGtkbiYDL3WliYoqBb/wQdSwDcsh/u4w5VaYSd5OihhamSADvYEta26Z4sXm5MWNvPd8JTm5BzqEtmZpNZes= X-Received: by 10.159.57.95 with SMTP id i31mr1546840uag.44.1519918550110; Thu, 01 Mar 2018 07:35:50 -0800 (PST) MIME-Version: 1.0 Received: by 10.31.49.208 with HTTP; Thu, 1 Mar 2018 07:35:09 -0800 (PST) In-Reply-To: <877eqy7xei.fsf@gmail.com> References: <877eqy7xei.fsf@gmail.com> From: =?UTF-8?Q?Mos=C3=A8?= Giordano Date: Thu, 1 Mar 2018 16:35:09 +0100 X-Gmail-Original-Message-ID: Message-ID: 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-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, 2018-02-28 1:47 GMT+01:00 Alex Branham : > I think this takes case of the last (require 'cl) statement. thanks again for working on this! However, I can't compile AUCTeX with your patch: latex.el:6542:8:Error: Wrong type argument: sequencep, beg-col Could you please have a look at this? Thanks, Mos=C3=A8 From unknown Fri Sep 05 11:50:27 2025 X-Loop: help-debbugs@gnu.org Subject: bug#30640: [patch] replace last cl Resent-From: Alex Branham Original-Sender: "Debbugs-submit" Resent-CC: bug-auctex@gnu.org Resent-Date: Thu, 01 Mar 2018 15:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 30640 X-GNU-PR-Package: auctex X-GNU-PR-Keywords: patch To: =?UTF-8?Q?Mos=C3=A8?= Giordano Cc: 30640@debbugs.gnu.org Received: via spool by 30640-submit@debbugs.gnu.org id=B30640.151991901510896 (code B ref 30640); Thu, 01 Mar 2018 15:44:02 +0000 Received: (at 30640) by debbugs.gnu.org; 1 Mar 2018 15:43:35 +0000 Received: from localhost ([127.0.0.1]:39478 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1erQMo-0002pg-Lm for submit@debbugs.gnu.org; Thu, 01 Mar 2018 10:43:35 -0500 Received: from mail-oi0-f46.google.com ([209.85.218.46]:34803) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1erQMm-0002pT-EK for 30640@debbugs.gnu.org; Thu, 01 Mar 2018 10:43:33 -0500 Received: by mail-oi0-f46.google.com with SMTP id c83so4801553oib.1 for <30640@debbugs.gnu.org>; Thu, 01 Mar 2018 07:43:32 -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; bh=bK3X2/oHv3bk77XUBwkPIZhsqFsfAwBUZKp3jXSUqSg=; b=ryfuJJrVT1Rq+ijIwgxw5VStD3RI0GFe2ec34b7NX66wr/9uNjk3LxWri2G55kDIGJ qsY3oC+iwd/BA764xXxxf7XeHltQ+AUUySlhYbCVrMk2E/Pw8JlzGhGgKgV20ULBhOUu si9gMmldVBPtfVPiv2MurCQbfJVpIi83T9aEtWCWD511m9eKU5Wjrtn/G4M7OfHJMQ5B LvGiOz2Nfohszy+fuKA+clLaWvYHMzQIAeINNSAmzgr7PoZP7Bu/Qh/HvpKK7Dg6Hd0J fHGYVgLfmuTC6s44umVUjyvJS0QCiXO++Be6d+uspymdNM9mw0P2ZzwpUbKH4rcnpglA 4R0g== 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; bh=bK3X2/oHv3bk77XUBwkPIZhsqFsfAwBUZKp3jXSUqSg=; b=JgpX+x0EbWIzjr5sO/vuEKm3LdZmww56Y7/qwhTtoTCN0/lji79gwBJX8UV8EE8hlz sWnZrCr1WGBeyemvIRf5lAQ14Dlxq7NWls9qK9kh+ZWPCEZspOaZ4szuygqBtakME6HC RKTG6Rr/KDUjPmfY0+oR0LlkAfY0t4flk/84YFQfbUNJnuUTUT7GIJqhIrfgobu8yM1Y mm9gw6/Lr0kuCXgqkXB/3jz5/NUIvIUEWFoeCIHb6JeaPzJUtAkDfVh9a1KJweqyR1JH 2t8cC8xa6U51ZFntjQ8BFroEtiImE1GZuSzql7cnQ3T01zNWNLmAjJ3ZLHwe4oRG4AYE lQ+Q== X-Gm-Message-State: APf1xPDFiigU6wGe5tW7gyczYzLf8ezeDQfCfd8BOExVIuTNVGXFHiRs mMQjyjhzVU5f9feINRZAMe2yxS5D X-Google-Smtp-Source: AG47ELsEGBMXkwpfOCPjd0Emh45hj6ALeVy9pnmqjXfOpTSof5j9FRs6nh/HAIprVN1iWSVH4UUDcg== X-Received: by 10.202.170.200 with SMTP id t191mr1527869oie.275.1519919006318; Thu, 01 Mar 2018 07:43:26 -0800 (PST) Received: from earth (cpe-70-114-192-208.austin.res.rr.com. [70.114.192.208]) by smtp.gmail.com with ESMTPSA id b60sm2242717otc.14.2018.03.01.07.43.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 Mar 2018 07:43:25 -0800 (PST) References: <877eqy7xei.fsf@gmail.com> User-agent: mu4e 1.0; emacs 26.0.91 From: Alex Branham In-reply-to: Date: Thu, 01 Mar 2018 09:43:24 -0600 Message-ID: <87606f94yr.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -0.0 (/) 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 (/) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On Thu 01 Mar 2018 at 09:35, Mos=C3=A8 Giordano wrote: > Hi Alex, > > 2018-02-28 1:47 GMT+01:00 Alex Branham : >> I think this takes case of the last (require 'cl) statement. > > thanks again for working on this! However, I can't compile AUCTeX > with your patch: > > latex.el:6542:8:Error: Wrong type argument: sequencep, beg-col > > Could you please have a look at this? Whoops! I didn't think about checking the other files for cl functions. Since this removes the last cl function, the byte-compiler didn't know about the cl functions anymore. There was one lurking in latex.el that we must've missed before. ------------------------------------------------------------ >From 390cab172b779741ed64e382cf7c9abc60dfebe5 Mon Sep 17 00:00:00 2001 From: Alex Branham Date: Thu, 1 Mar 2018 09:40:03 -0600 Subject: [PATCH] Remove cl from AuCTeX * tex.el: replace last 'cl with 'cl-lib * latex.el: replace cl function with cl-lib function --- latex.el | 58 +++++++++++++++++++++++++++++----------------------------- tex.el | 19 ++++++++++--------- 2 files changed, 39 insertions(+), 38 deletions(-) diff --git a/latex.el b/latex.el index 7354c23b..5c4a6383 100644 --- a/latex.el +++ b/latex.el @@ -6542,35 +6542,35 @@ function would return non-nil and `(match-string 1)= ' would return =20 (defun LaTeX-indent-tabular () "Return indent column for the current tabular-like line." - (destructuring-bind - (beg-pos . beg-col) - (LaTeX-env-beginning-pos-col) - (let ((tabular-like-end-regex - (format "\\\\end{%s}" - (regexp-opt - (let (out) - (mapc (lambda (x) - (when (eq (cadr x) 'LaTeX-indent-tabular) - (push (car x) out))) - LaTeX-indent-environment-list) - out))))) - (cond ((looking-at tabular-like-end-regex) - beg-col) - - ((looking-at "\\\\\\\\") - (+ 2 beg-col)) - - ((looking-at "&") - (LaTeX-hanging-ampersand-position)) - - (t - (+ 2 - (let ((any-col (save-excursion - (when (re-search-backward "\\\\\\\\\\|[^\\]&" beg-pos t) - (current-column))))) - (if (and any-col (=3D ?& (char-before (match-end 0)))) - (1+ any-col) - beg-col)))))))) + (cl-destructuring-bind + (beg-pos . beg-col) + (LaTeX-env-beginning-pos-col) + (let ((tabular-like-end-regex + (format "\\\\end{%s}" + (regexp-opt + (let (out) + (mapc (lambda (x) + (when (eq (cadr x) 'LaTeX-indent-tabular) + (push (car x) out))) + LaTeX-indent-environment-list) + out))))) + (cond ((looking-at tabular-like-end-regex) + beg-col) + + ((looking-at "\\\\\\\\") + (+ 2 beg-col)) + + ((looking-at "&") + (LaTeX-hanging-ampersand-position)) + + (t + (+ 2 + (let ((any-col (save-excursion + (when (re-search-backward "\\\\\\\\\\|[^\\]&" beg-pos t) + (current-column))))) + (if (and any-col (=3D ?& (char-before (match-end 0)))) + (1+ any-col) + beg-col)))))))) =20 (provide 'latex) =20 diff --git a/tex.el b/tex.el index 8863a886..b7891a14 100644 --- a/tex.el +++ b/tex.el @@ -1,6 +1,6 @@ ;;; tex.el --- Support for TeX documents. =20 -;; Copyright (C) 1985-1987, 1991, 1993-2017 Free Software Foundation, Inc. +;; Copyright (C) 1985-1987, 1991, 1993-2018 Free Software Foundation, Inc. =20 ;; Maintainer: auctex-devel@gnu.org ;; Keywords: tex @@ -34,7 +34,7 @@ (require 'custom) (require 'tex-site) (eval-when-compile - (require 'cl)) + (require 'cl-lib)) =20 (defgroup TeX-file nil "Files used by AUCTeX." @@ -2710,11 +2710,11 @@ are returned." (dolist (subdir subdirs) (setq path (file-name-as-directory (concat item subdir))) (when (file-exists-p path) - (pushnew path input-dir-list :test #'equal))) + (cl-pushnew path input-dir-list :test #'equal))) (setq path (file-name-as-directory item)) (when (file-exists-p path) - (pushnew path input-dir-list :test #'equal)))) - ;; No duplication in result is assured since `pushnew' is + (cl-pushnew path input-dir-list :test #'equal)))) + ;; No duplication in result is assured since `cl-pushnew' is ;; used above. Should we introduce an option for speed just ;; to accumulate all the results without care for ;; duplicates? @@ -3131,6 +3131,7 @@ FORCE is not nil." =20 (defcustom TeX-complete-word 'ispell-complete-word "*Function to call for completing non-macros in `tex-mode'." + :type 'function :group 'TeX-macro) =20 (defcustom TeX-complete-expert-commands nil @@ -4521,7 +4522,7 @@ EXTENSIONS defaults to `TeX-file-extensions'." "$TEXMFDIST") "latex")) (when (file-readable-p dir) - (pushnew dir list :test #'equal))) + (cl-pushnew dir list :test #'equal))) (nreverse list))) =20 (defcustom TeX-tree-roots (TeX-tree-roots) @@ -6404,7 +6405,7 @@ NAME may be a package, a command, or a document." (when (memq major-mode (nth 1 elt)) (let ((completions (funcall (nth 2 elt)))) (unless (null completions) - (pushnew (cons completions (nth 0 elt)) docs :test #'equal))))) + (cl-pushnew (cons completions (nth 0 elt)) docs :test #'equal)= )))) (if (null docs) (progn (if (executable-find "texdoc") @@ -6528,7 +6529,7 @@ of the car of `ispell-tex-skip-alists'. This only ha= ppens if (let ((raws (car ispell-tex-skip-alists)) (envs (cadr ispell-tex-skip-alists))) (dolist (x skip) - (pushnew x raws :test #'equal)) + (cl-pushnew x raws :test #'equal)) (setq ispell-tex-skip-alists (list raws envs))))) =20 (defun TeX-ispell-skip-setcdr (skip) @@ -6541,7 +6542,7 @@ of the cdr of `ispell-tex-skip-alists'. This only ha= ppens if (let ((raws (car ispell-tex-skip-alists)) (envs (cadr ispell-tex-skip-alists))) (dolist (x skip) - (pushnew x envs :test #'equal)) + (cl-pushnew x envs :test #'equal)) (setq ispell-tex-skip-alists (list raws envs))))) =20 (defun TeX-ispell-tex-arg-end (&optional arg1 arg2 arg3) --=20 2.16.2 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Remove-cl-from-AuCTeX.patch >From 390cab172b779741ed64e382cf7c9abc60dfebe5 Mon Sep 17 00:00:00 2001 From: Alex Branham Date: Thu, 1 Mar 2018 09:40:03 -0600 Subject: [PATCH] Remove cl from AuCTeX * tex.el: replace last 'cl with 'cl-lib * latex.el: replace cl function with cl-lib function --- latex.el | 58 +++++++++++++++++++++++++++++----------------------------- tex.el | 19 ++++++++++--------- 2 files changed, 39 insertions(+), 38 deletions(-) diff --git a/latex.el b/latex.el index 7354c23b..5c4a6383 100644 --- a/latex.el +++ b/latex.el @@ -6542,35 +6542,35 @@ function would return non-nil and `(match-string 1)' would return (defun LaTeX-indent-tabular () "Return indent column for the current tabular-like line." - (destructuring-bind - (beg-pos . beg-col) - (LaTeX-env-beginning-pos-col) - (let ((tabular-like-end-regex - (format "\\\\end{%s}" - (regexp-opt - (let (out) - (mapc (lambda (x) - (when (eq (cadr x) 'LaTeX-indent-tabular) - (push (car x) out))) - LaTeX-indent-environment-list) - out))))) - (cond ((looking-at tabular-like-end-regex) - beg-col) - - ((looking-at "\\\\\\\\") - (+ 2 beg-col)) - - ((looking-at "&") - (LaTeX-hanging-ampersand-position)) - - (t - (+ 2 - (let ((any-col (save-excursion - (when (re-search-backward "\\\\\\\\\\|[^\\]&" beg-pos t) - (current-column))))) - (if (and any-col (= ?& (char-before (match-end 0)))) - (1+ any-col) - beg-col)))))))) + (cl-destructuring-bind + (beg-pos . beg-col) + (LaTeX-env-beginning-pos-col) + (let ((tabular-like-end-regex + (format "\\\\end{%s}" + (regexp-opt + (let (out) + (mapc (lambda (x) + (when (eq (cadr x) 'LaTeX-indent-tabular) + (push (car x) out))) + LaTeX-indent-environment-list) + out))))) + (cond ((looking-at tabular-like-end-regex) + beg-col) + + ((looking-at "\\\\\\\\") + (+ 2 beg-col)) + + ((looking-at "&") + (LaTeX-hanging-ampersand-position)) + + (t + (+ 2 + (let ((any-col (save-excursion + (when (re-search-backward "\\\\\\\\\\|[^\\]&" beg-pos t) + (current-column))))) + (if (and any-col (= ?& (char-before (match-end 0)))) + (1+ any-col) + beg-col)))))))) (provide 'latex) diff --git a/tex.el b/tex.el index 8863a886..b7891a14 100644 --- a/tex.el +++ b/tex.el @@ -1,6 +1,6 @@ ;;; tex.el --- Support for TeX documents. -;; Copyright (C) 1985-1987, 1991, 1993-2017 Free Software Foundation, Inc. +;; Copyright (C) 1985-1987, 1991, 1993-2018 Free Software Foundation, Inc. ;; Maintainer: auctex-devel@gnu.org ;; Keywords: tex @@ -34,7 +34,7 @@ (require 'custom) (require 'tex-site) (eval-when-compile - (require 'cl)) + (require 'cl-lib)) (defgroup TeX-file nil "Files used by AUCTeX." @@ -2710,11 +2710,11 @@ are returned." (dolist (subdir subdirs) (setq path (file-name-as-directory (concat item subdir))) (when (file-exists-p path) - (pushnew path input-dir-list :test #'equal))) + (cl-pushnew path input-dir-list :test #'equal))) (setq path (file-name-as-directory item)) (when (file-exists-p path) - (pushnew path input-dir-list :test #'equal)))) - ;; No duplication in result is assured since `pushnew' is + (cl-pushnew path input-dir-list :test #'equal)))) + ;; No duplication in result is assured since `cl-pushnew' is ;; used above. Should we introduce an option for speed just ;; to accumulate all the results without care for ;; duplicates? @@ -3131,6 +3131,7 @@ FORCE is not nil." (defcustom TeX-complete-word 'ispell-complete-word "*Function to call for completing non-macros in `tex-mode'." + :type 'function :group 'TeX-macro) (defcustom TeX-complete-expert-commands nil @@ -4521,7 +4522,7 @@ EXTENSIONS defaults to `TeX-file-extensions'." "$TEXMFDIST") "latex")) (when (file-readable-p dir) - (pushnew dir list :test #'equal))) + (cl-pushnew dir list :test #'equal))) (nreverse list))) (defcustom TeX-tree-roots (TeX-tree-roots) @@ -6404,7 +6405,7 @@ NAME may be a package, a command, or a document." (when (memq major-mode (nth 1 elt)) (let ((completions (funcall (nth 2 elt)))) (unless (null completions) - (pushnew (cons completions (nth 0 elt)) docs :test #'equal))))) + (cl-pushnew (cons completions (nth 0 elt)) docs :test #'equal))))) (if (null docs) (progn (if (executable-find "texdoc") @@ -6528,7 +6529,7 @@ of the car of `ispell-tex-skip-alists'. This only happens if (let ((raws (car ispell-tex-skip-alists)) (envs (cadr ispell-tex-skip-alists))) (dolist (x skip) - (pushnew x raws :test #'equal)) + (cl-pushnew x raws :test #'equal)) (setq ispell-tex-skip-alists (list raws envs))))) (defun TeX-ispell-skip-setcdr (skip) @@ -6541,7 +6542,7 @@ of the cdr of `ispell-tex-skip-alists'. This only happens if (let ((raws (car ispell-tex-skip-alists)) (envs (cadr ispell-tex-skip-alists))) (dolist (x skip) - (pushnew x envs :test #'equal)) + (cl-pushnew x envs :test #'equal)) (setq ispell-tex-skip-alists (list raws envs))))) (defun TeX-ispell-tex-arg-end (&optional arg1 arg2 arg3) -- 2.16.2 --=-=-=-- From unknown Fri Sep 05 11:50:27 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Alex Branham Subject: bug#30640: closed (Re: bug#30640: [patch] replace last cl) Message-ID: References: <877eqy7xei.fsf@gmail.com> X-Gnu-PR-Message: they-closed 30640 X-Gnu-PR-Package: auctex X-Gnu-PR-Keywords: patch Reply-To: 30640@debbugs.gnu.org Date: Thu, 01 Mar 2018 15:50:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1519919402-11486-1" This is a multi-part message in MIME format... ------------=_1519919402-11486-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #30640: [patch] replace last cl which was filed against the auctex package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 30640@debbugs.gnu.org. --=20 30640: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D30640 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1519919402-11486-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 30640-done) by debbugs.gnu.org; 1 Mar 2018 15:49:07 +0000 Received: from localhost ([127.0.0.1]:39486 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1erQSA-0002y9-UV for submit@debbugs.gnu.org; Thu, 01 Mar 2018 10:49:07 -0500 Received: from eggs.gnu.org ([208.118.235.92]:36914) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1erQS7-0002xf-Vt for 30640-done@debbugs.gnu.org; Thu, 01 Mar 2018 10:49:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1erQRy-00062F-1U for 30640-done@debbugs.gnu.org; Thu, 01 Mar 2018 10:48:58 -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.0 required=5.0 tests=BAYES_20,T_RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:55101) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erQRx-00061o-US for 30640-done@debbugs.gnu.org; Thu, 01 Mar 2018 10:48:53 -0500 Received: from mail-vk0-f53.google.com ([209.85.213.53]:33636) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1erQRx-0004dC-IU for 30640-done@debbugs.gnu.org; Thu, 01 Mar 2018 10:48:53 -0500 Received: by mail-vk0-f53.google.com with SMTP id z130so3959832vkd.0 for <30640-done@debbugs.gnu.org>; Thu, 01 Mar 2018 07:48:53 -0800 (PST) X-Gm-Message-State: APf1xPCkHk1BhVhqWx0f+ATeE8SHOufN8RhNaMvrHbY9pxHIC8mufcqn v2rUc/SLjEw2lJD9JOdbBKgnxzJ05fOL285L51o= X-Google-Smtp-Source: AG47ELvtowKo/dY1PQuld1fthU8mFQvHMccVdLPgIxZgfOzgBWPwqVTSJRKrZ+L21fPa2Rap2S+C/3LW/vTz9AhtYkU= X-Received: by 10.31.64.135 with SMTP id n129mr1649199vka.0.1519919332937; Thu, 01 Mar 2018 07:48:52 -0800 (PST) MIME-Version: 1.0 Received: by 10.31.49.208 with HTTP; Thu, 1 Mar 2018 07:48:12 -0800 (PST) In-Reply-To: <87606f94yr.fsf@gmail.com> References: <877eqy7xei.fsf@gmail.com> <87606f94yr.fsf@gmail.com> From: =?UTF-8?Q?Mos=C3=A8_Giordano?= Date: Thu, 1 Mar 2018 16:48:12 +0100 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: bug#30640: [patch] replace last cl 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: 30640-done Cc: 30640-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 (-----) 2018-03-01 16:43 GMT+01:00 Alex Branham : > Whoops! I didn't think about checking the other files for cl functions. > Since this removes the last cl function, the byte-compiler didn't know > about the cl functions anymore. There was one lurking in latex.el that > we must've missed before. Now make && make check is successful! Patch applied, thanks. Bye, Mos=C3=A8 ------------=_1519919402-11486-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 28 Feb 2018 00:47:09 +0000 Received: from localhost ([127.0.0.1]:36237 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eqptl-00014c-7G for submit@debbugs.gnu.org; Tue, 27 Feb 2018 19:47:09 -0500 Received: from eggs.gnu.org ([208.118.235.92]:57265) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eqptj-00014B-FZ for submit@debbugs.gnu.org; Tue, 27 Feb 2018 19:47:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eqptc-0003HE-7m for submit@debbugs.gnu.org; Tue, 27 Feb 2018 19:47:01 -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,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:42799) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eqptc-0003Gm-3u for submit@debbugs.gnu.org; Tue, 27 Feb 2018 19:47:00 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48233) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eqpta-0008Kx-Do for bug-auctex@gnu.org; Tue, 27 Feb 2018 19:46:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eqptX-00039z-40 for bug-auctex@gnu.org; Tue, 27 Feb 2018 19:46:58 -0500 Received: from mail-oi0-x233.google.com ([2607:f8b0:4003:c06::233]:45162) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eqptW-00039o-Pa for bug-auctex@gnu.org; Tue, 27 Feb 2018 19:46:55 -0500 Received: by mail-oi0-x233.google.com with SMTP id j79so535408oib.12 for ; Tue, 27 Feb 2018 16:46:54 -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=itSOnGK1mkrCyN3dOD+HUibN89LFuaZ9Z6i8rJ4vyVE=; b=TnfeXM6owFDdwRt58FlWGlWPvdM+zVmWuz6AA0jp66rEHVrC5fu8RktwF1DyfmWkIR CihuTf13osD31xM9SaLvu3CzvF7IwAxwcG/oQ1aZah7MulahmfixtoDP93Y4Ybk6PDh1 LXViBgNye8ehLibch2NdLKyl1JzboXRYFcPvyKXyyE1aXKy3JKNwtaeFtqrb7QOidS7d Yy6LCSzoZ/yR95HThTn9SfO752Hj4qGO3oNHtgmzhxYE3Elq20qa9JbJcQNc3t2MNghT DUds/s3u6lhCs+hwF+1LkyRcknxBRfIngYnJIlsBUxMJcOhpOweodI+MK8eDrYk8jcj6 P5Gg== 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=itSOnGK1mkrCyN3dOD+HUibN89LFuaZ9Z6i8rJ4vyVE=; b=tBiaQjLxT0EyvENeUTieHhmoFgT4yadD1HZAUk7eeNW3fqTA94HeB6akuSDN6dTUPn aCPbexvNYb/iNgS0h3g4sLwwYZV8f+BF4RQupubARe81V6iGaY3ggRvTQU+JVN2mc6eI vtXISyL6bGcKkKu6xM/NcUfjbaE3TYJnraahd4nnitaGvZhD8LRMfz9GrBYXFknq9oRf I2TnetPMDHAcWUlGq/+waAs+RSSTYoilM3FsGwY09mITemfeDjUiMk2/mwBH3/UzoO9E CWFFD96HblvdlGkd84SP0EmE8dLS9UqDbbkvMUje27byDAZr71ossVneZWzbDGOwb1C+ JK1g== X-Gm-Message-State: AElRT7G5PABhMKD1FECh84Mx+tvQhM35pV2oIiAqiYNuqKxGYkuFwcuE YJTCxkMSOZI0suwRxS+kiK9uM848 X-Google-Smtp-Source: AG47ELvXJVd4PuH8x3rLQuGZMo8EB1Xs6/zdkOeEZkZqrNoOcmTEU5TCQrw24F9U4sUC4K61OSQkmA== X-Received: by 10.202.54.87 with SMTP id d84mr2245807oia.297.1519778813634; Tue, 27 Feb 2018 16:46:53 -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 j196sm249308oih.3.2018.02.27.16.46.51 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 27 Feb 2018 16:46:52 -0800 (PST) User-agent: mu4e 1.0; emacs 26.0.91 From: Alex Branham To: "" Subject: [patch] replace last cl Date: Tue, 27 Feb 2018 18:47:33 -0600 Message-ID: <877eqy7xei.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 I think this takes case of the last (require 'cl) statement. Thanks, Alex ------------------------------------------------------------ >From 0befaa759ff22e9a8518c17095439fe11952e60b Mon Sep 17 00:00:00 2001 From: Alex Branham Date: Tue, 27 Feb 2018 18:45:03 -0600 Subject: [PATCH] * tex.el: replace (last?) 'cl with 'cl-lib --- tex.el | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/tex.el b/tex.el index 8863a886..b7891a14 100644 --- a/tex.el +++ b/tex.el @@ -1,6 +1,6 @@ ;;; tex.el --- Support for TeX documents. -;; Copyright (C) 1985-1987, 1991, 1993-2017 Free Software Foundation, Inc. +;; Copyright (C) 1985-1987, 1991, 1993-2018 Free Software Foundation, Inc. ;; Maintainer: auctex-devel@gnu.org ;; Keywords: tex @@ -34,7 +34,7 @@ (require 'custom) (require 'tex-site) (eval-when-compile - (require 'cl)) + (require 'cl-lib)) (defgroup TeX-file nil "Files used by AUCTeX." @@ -2710,11 +2710,11 @@ are returned." (dolist (subdir subdirs) (setq path (file-name-as-directory (concat item subdir))) (when (file-exists-p path) - (pushnew path input-dir-list :test #'equal))) + (cl-pushnew path input-dir-list :test #'equal))) (setq path (file-name-as-directory item)) (when (file-exists-p path) - (pushnew path input-dir-list :test #'equal)))) - ;; No duplication in result is assured since `pushnew' is + (cl-pushnew path input-dir-list :test #'equal)))) + ;; No duplication in result is assured since `cl-pushnew' is ;; used above. Should we introduce an option for speed just ;; to accumulate all the results without care for ;; duplicates? @@ -3131,6 +3131,7 @@ FORCE is not nil." (defcustom TeX-complete-word 'ispell-complete-word "*Function to call for completing non-macros in `tex-mode'." + :type 'function :group 'TeX-macro) (defcustom TeX-complete-expert-commands nil @@ -4521,7 +4522,7 @@ EXTENSIONS defaults to `TeX-file-extensions'." "$TEXMFDIST") "latex")) (when (file-readable-p dir) - (pushnew dir list :test #'equal))) + (cl-pushnew dir list :test #'equal))) (nreverse list))) (defcustom TeX-tree-roots (TeX-tree-roots) @@ -6404,7 +6405,7 @@ NAME may be a package, a command, or a document." (when (memq major-mode (nth 1 elt)) (let ((completions (funcall (nth 2 elt)))) (unless (null completions) - (pushnew (cons completions (nth 0 elt)) docs :test #'equal))))) + (cl-pushnew (cons completions (nth 0 elt)) docs :test #'equal))))) (if (null docs) (progn (if (executable-find "texdoc") @@ -6528,7 +6529,7 @@ of the car of `ispell-tex-skip-alists'. This only happens if (let ((raws (car ispell-tex-skip-alists)) (envs (cadr ispell-tex-skip-alists))) (dolist (x skip) - (pushnew x raws :test #'equal)) + (cl-pushnew x raws :test #'equal)) (setq ispell-tex-skip-alists (list raws envs))))) (defun TeX-ispell-skip-setcdr (skip) @@ -6541,7 +6542,7 @@ of the cdr of `ispell-tex-skip-alists'. This only happens if (let ((raws (car ispell-tex-skip-alists)) (envs (cadr ispell-tex-skip-alists))) (dolist (x skip) - (pushnew x envs :test #'equal)) + (cl-pushnew x envs :test #'equal)) (setq ispell-tex-skip-alists (list raws envs))))) (defun TeX-ispell-tex-arg-end (&optional arg1 arg2 arg3) -- 2.16.2 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-tex.el-replace-last-cl-with-cl-lib.patch >From 0befaa759ff22e9a8518c17095439fe11952e60b Mon Sep 17 00:00:00 2001 From: Alex Branham Date: Tue, 27 Feb 2018 18:45:03 -0600 Subject: [PATCH] * tex.el: replace (last?) 'cl with 'cl-lib --- tex.el | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/tex.el b/tex.el index 8863a886..b7891a14 100644 --- a/tex.el +++ b/tex.el @@ -1,6 +1,6 @@ ;;; tex.el --- Support for TeX documents. -;; Copyright (C) 1985-1987, 1991, 1993-2017 Free Software Foundation, Inc. +;; Copyright (C) 1985-1987, 1991, 1993-2018 Free Software Foundation, Inc. ;; Maintainer: auctex-devel@gnu.org ;; Keywords: tex @@ -34,7 +34,7 @@ (require 'custom) (require 'tex-site) (eval-when-compile - (require 'cl)) + (require 'cl-lib)) (defgroup TeX-file nil "Files used by AUCTeX." @@ -2710,11 +2710,11 @@ are returned." (dolist (subdir subdirs) (setq path (file-name-as-directory (concat item subdir))) (when (file-exists-p path) - (pushnew path input-dir-list :test #'equal))) + (cl-pushnew path input-dir-list :test #'equal))) (setq path (file-name-as-directory item)) (when (file-exists-p path) - (pushnew path input-dir-list :test #'equal)))) - ;; No duplication in result is assured since `pushnew' is + (cl-pushnew path input-dir-list :test #'equal)))) + ;; No duplication in result is assured since `cl-pushnew' is ;; used above. Should we introduce an option for speed just ;; to accumulate all the results without care for ;; duplicates? @@ -3131,6 +3131,7 @@ FORCE is not nil." (defcustom TeX-complete-word 'ispell-complete-word "*Function to call for completing non-macros in `tex-mode'." + :type 'function :group 'TeX-macro) (defcustom TeX-complete-expert-commands nil @@ -4521,7 +4522,7 @@ EXTENSIONS defaults to `TeX-file-extensions'." "$TEXMFDIST") "latex")) (when (file-readable-p dir) - (pushnew dir list :test #'equal))) + (cl-pushnew dir list :test #'equal))) (nreverse list))) (defcustom TeX-tree-roots (TeX-tree-roots) @@ -6404,7 +6405,7 @@ NAME may be a package, a command, or a document." (when (memq major-mode (nth 1 elt)) (let ((completions (funcall (nth 2 elt)))) (unless (null completions) - (pushnew (cons completions (nth 0 elt)) docs :test #'equal))))) + (cl-pushnew (cons completions (nth 0 elt)) docs :test #'equal))))) (if (null docs) (progn (if (executable-find "texdoc") @@ -6528,7 +6529,7 @@ of the car of `ispell-tex-skip-alists'. This only happens if (let ((raws (car ispell-tex-skip-alists)) (envs (cadr ispell-tex-skip-alists))) (dolist (x skip) - (pushnew x raws :test #'equal)) + (cl-pushnew x raws :test #'equal)) (setq ispell-tex-skip-alists (list raws envs))))) (defun TeX-ispell-skip-setcdr (skip) @@ -6541,7 +6542,7 @@ of the cdr of `ispell-tex-skip-alists'. This only happens if (let ((raws (car ispell-tex-skip-alists)) (envs (cadr ispell-tex-skip-alists))) (dolist (x skip) - (pushnew x envs :test #'equal)) + (cl-pushnew x envs :test #'equal)) (setq ispell-tex-skip-alists (list raws envs))))) (defun TeX-ispell-tex-arg-end (&optional arg1 arg2 arg3) -- 2.16.2 --=-=-=-- ------------=_1519919402-11486-1--