branch: externals/auctex
commit 0aa32751c3694611aef5fdb1220c0c1830b59f32
Author: Arash Esbati <ar...@gnu.org>
Commit: Arash Esbati <ar...@gnu.org>
Get rid of `delete-dups'
* style/caption.el (LaTeX-caption-update-key-val-options):
* style/enumitem.el (LaTeX-enumitem-update-key-val-options):
* style/floatrow.el (LaTeX-floatrow-update-key-val-options):
* style/graphicx.el (LaTeX-includegraphics-extensions):
* style/listings.el (LaTeX-listings-update-style-key):
* style/mdframed.el (LaTeX-mdframed-update-style-key):
* style/menukeys.el (TeX-arg-menukeys-newmenumacro): Replace
`delete-dups' with `TeX-delete-duplicate-strings'.
---
style/caption.el | 6 +++---
style/enumitem.el | 10 +++++-----
style/floatrow.el | 6 +++---
style/graphicx.el | 10 +++++-----
style/listings.el | 4 ++--
style/mdframed.el | 2 +-
style/menukeys.el | 2 +-
7 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/style/caption.el b/style/caption.el
index 1a0eb7e..df6328e 100644
--- a/style/caption.el
+++ b/style/caption.el
@@ -176,9 +176,9 @@ in `caption'-completions."
(when (and (string-equal key "labelformat")
(boundp 'LaTeX-subcaption-key-val-options))
(pushnew (list "subrefformat"
- (delete-dups (apply #'append (list val)
val-match)))
+ (TeX-delete-duplicate-strings (apply #'append
(list val) val-match)))
opts :test #'equal))
- (pushnew (list key (delete-dups (apply #'append (list val)
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)))
(setq LaTeX-caption-key-val-options-local (copy-alist opts))))
@@ -192,7 +192,7 @@ 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 (delete-dups (apply #'append val val-match)))
+ (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))))))
diff --git a/style/enumitem.el b/style/enumitem.el
index 94de0e9..699dbe6 100644
--- a/style/enumitem.el
+++ b/style/enumitem.el
@@ -263,10 +263,10 @@ in `enumitem'-completions."
(val (nth 2 keyvals))
;; (key-match (car (assoc key LaTeX-enumitem-key-val-options-local)))
(val-match (cdr (assoc key LaTeX-enumitem-key-val-options-local)))
- (temp (copy-alist LaTeX-enumitem-key-val-options-local))
+ (temp (copy-alist LaTeX-enumitem-key-val-options-local))
(opts (assq-delete-all (car (assoc key temp)) temp)))
(if val-match
- (pushnew (list key (delete-dups (apply 'append (list val) 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))
(setq LaTeX-enumitem-key-val-options-local (copy-alist opts))))
@@ -276,7 +276,7 @@ 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 (delete-dups (apply 'append (list val) val-match)))
+ (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)))))
@@ -362,7 +362,7 @@ in `enumitem'-completions."
;; \setlist[<names,levels>]{<key-vals>}
'("setlist"
- [TeX-arg-eval mapconcat 'identity
+ [TeX-arg-eval mapconcat #'identity
(TeX-completing-read-multiple
"Environment(s), level(s): "
`(,@LaTeX-enumitem-newlist-list-local
@@ -375,7 +375,7 @@ in `enumitem'-completions."
;; \setlist*[<names,levels>]{<key-vals>}
'("setlist*"
- [TeX-arg-eval mapconcat 'identity
+ [TeX-arg-eval mapconcat #'identity
(TeX-completing-read-multiple
"Environment, level: "
`(,@LaTeX-enumitem-newlist-list-local
diff --git a/style/floatrow.el b/style/floatrow.el
index 422c87a..5beb109 100644
--- a/style/floatrow.el
+++ b/style/floatrow.el
@@ -317,14 +317,14 @@
(assq-delete-all (car (assoc key temp)) temp)))))
(cond ((string= key "precode")
(dolist (x vcode-keys)
- (pushnew (list x (delete-dups (append (list val) val-match)))
+ (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 (delete-dups (append (list val) val-match)))
+ (pushnew (list x (TeX-delete-duplicate-strings (append (list
val) val-match)))
opts :test #'equal)))
(t
- (pushnew (list key (delete-dups (append (list val) val-match)))
+ (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))))))
diff --git a/style/graphicx.el b/style/graphicx.el
index 6ba58e4..08dbf75 100644
--- a/style/graphicx.el
+++ b/style/graphicx.el
@@ -119,31 +119,31 @@ key-val's."
;; t if pdftex is used in dvi-mode
TeX-DVI-via-PDFTeX)
;; We're using pdflatex in pdf-mode
- (delete-dups
+ (TeX-delete-duplicate-strings
(append LaTeX-includegraphics-pdftex-extensions
temp))
;; We're generating a .dvi to process with dvips or dvipdfmx
(progn
(dolist (x '("jpe?g" "pdf" "png"))
(setq temp (delete x temp)))
- (delete-dups
+ (TeX-delete-duplicate-strings
(append LaTeX-includegraphics-dvips-extensions
temp)))))
;; Running luatex in pdf or dvi-mode:
((eq TeX-engine 'luatex)
(if TeX-PDF-mode
- (delete-dups
+ (TeX-delete-duplicate-strings
(append LaTeX-includegraphics-pdftex-extensions
temp))
(progn
(dolist (x '("jpe?g" "pdf" "png"))
(setq temp (delete x temp)))
- (delete-dups
+ (TeX-delete-duplicate-strings
(append LaTeX-includegraphics-dvips-extensions
temp)))))
;; Running xetex in any mode:
((eq TeX-engine 'xetex)
- (delete-dups (append LaTeX-includegraphics-xetex-extensions
+ (TeX-delete-duplicate-strings (append
LaTeX-includegraphics-xetex-extensions
temp)))
;; For anything else
(t
diff --git a/style/listings.el b/style/listings.el
index e04045e..73ddc00 100644
--- a/style/listings.el
+++ b/style/listings.el
@@ -284,8 +284,8 @@ 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 (delete-dups
- (mapcar 'car (LaTeX-listings-lstdefinestyle-list))))
+ (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 79a3a8b..cd26e3f 100644
--- a/style/mdframed.el
+++ b/style/mdframed.el
@@ -214,7 +214,7 @@
(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 (delete-dups
+ (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
diff --git a/style/menukeys.el b/style/menukeys.el
index 360cd4e..2ac0560 100644
--- a/style/menukeys.el
+++ b/style/menukeys.el
@@ -132,7 +132,7 @@ macro. If RENEW is non-nil, query for an already defined
macro."
(let ((macro (if renew
(completing-read
(concat "Macro: " TeX-esc)
- (delete-dups (mapcar #'car
(LaTeX-menukeys-newmenumacro-list))))
+ (TeX-delete-duplicate-strings (mapcar #'car
(LaTeX-menukeys-newmenumacro-list))))
(TeX-read-string (concat "Macro: " TeX-esc))))
(sep (completing-read
(TeX-argument-prompt optional nil "Input separator (default ,)")
