[AUCTeX-diffs] [elpa] externals/auctex 9ae66cd 33/67: Remove TeX-replace-regexp-in-string

[Tassilo Horn]

branch: externals/auctex
commit 9ae66cd34509ef9ce47f9249d887a5b6935b7203
Author: Ikumi Keita <address@hidden>
Commit: Ikumi Keita <address@hidden>

    Remove TeX-replace-regexp-in-string
    
    * tex.el (TeX-replace-regexp-in-string): Remove.
    * latex.el:
    * style/empheq.el:
    * style/floatrow.el:
    * style/tcolorbox.el:
    * style/xcolor.el:
    Use `replace-regexp-in-string' instead of
    `TeX-replace-regexp-in-string'.
---
 latex.el           |  2 +-
 style/empheq.el    |  2 +-
 style/floatrow.el  |  4 ++--
 style/tcolorbox.el |  4 ++--
 style/xcolor.el    |  4 ++--
 tex.el             | 10 ++--------
 6 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/latex.el b/latex.el
index cbd3e89..96fcf04 100644
--- a/latex.el
+++ b/latex.el
@@ -1624,7 +1624,7 @@ This is necessary since index entries may contain 
commands and stuff.")
 Split the string at commas and remove Biber file extensions."
   (let ((bibs (TeX-split-string " *, *" (TeX-match-buffer match))))
     (dolist (bib bibs)
-      (LaTeX-add-bibliographies (TeX-replace-regexp-in-string
+      (LaTeX-add-bibliographies (replace-regexp-in-string
                                 (concat "\(?:\."
                                         (mapconcat #'identity
                                                    TeX-Biber-file-extensions
diff --git a/style/empheq.el b/style/empheq.el
index 5680132..4814934 100644
--- a/style/empheq.el
+++ b/style/empheq.el
@@ -232,7 +232,7 @@ number of ampersands if possible."
       (when (looking-at "[
%]*\[")
        (forward-sexp))
       (re-search-forward "[
%]*{\([^}]+\)}")
-      (setq match (TeX-replace-regexp-in-string "[
%]" ""
+      (setq match (replace-regexp-in-string "[
%]" ""
                                                (match-string-no-properties 1)))
       (if (string-match "=" match)
          (progn
diff --git a/style/floatrow.el b/style/floatrow.el
index 4adc052..4b917b2 100644
--- a/style/floatrow.el
+++ b/style/floatrow.el
@@ -1,6 +1,6 @@
 ;;; floatrow.el --- AUCTeX style for `floatrow.sty' (v0.3b)
 
-;; Copyright (C) 2017 Free Software Foundation, Inc.
+;; Copyright (C) 2017, 2018 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <address@hidden>
 ;; Maintainer: address@hidden
@@ -434,7 +434,7 @@ entries are available under \"rawfigure*?\" and 
\"rawtable*?\"."
   "Create raw floating ENV with floatrow.sty.
 Also insert the macro \"\RawFloats\" when finished with user
 queries."
-  (let ((environment (TeX-replace-regexp-in-string "raw" "" env)))
+  (let ((environment (replace-regexp-in-string "raw" "" env)))
     (LaTeX-env-figure environment)
     (save-excursion
       ;; `LaTeX-find-matching-begin' will not work for us as we don't
diff --git a/style/tcolorbox.el b/style/tcolorbox.el
index b8e6512..2859276 100644
--- a/style/tcolorbox.el
+++ b/style/tcolorbox.el
@@ -1,6 +1,6 @@
 ;;; tcolorbox.el --- AUCTeX style for `tcolorbox.sty' (v4.00)
 
-;; Copyright (C) 2015, 2016 Free Software Foundation, Inc.
+;; Copyright (C) 2015, 2016, 2018 Free Software Foundation, Inc.
 
 ;; Author: Tassilo Horn <address@hidden>
 ;; Maintainer: address@hidden
@@ -454,7 +454,7 @@ e.g. \"tcolorboxlib-raster.el\"."
   (when (LaTeX-tcolorbox-tcbuselibrary-list)
     (let (libs)
       (dolist (x (LaTeX-tcolorbox-tcbuselibrary-list))
-       (push (TeX-replace-regexp-in-string "[ %
        ]" "" (car x)) libs))
+       (push (replace-regexp-in-string "[ %
        ]" "" (car x)) libs))
       (setq libs (mapconcat #'identity libs ","))
       (dolist (x (split-string libs "," t))
        (TeX-run-style-hooks (concat "tcolorboxlib-" x)))))
diff --git a/style/xcolor.el b/style/xcolor.el
index 771bcff..174493f 100644
--- a/style/xcolor.el
+++ b/style/xcolor.el
@@ -1,6 +1,6 @@
 ;; xcolor.el --- AUCTeX style for `xcolor.sty' (v2.12)
 
-;; Copyright (C) 2016--2017 Free Software Foundation, Inc.
+;; Copyright (C) 2016--2018 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <address@hidden>
 ;; Maintainer: address@hidden
@@ -264,7 +264,7 @@ xcolor package.")
     (let ((head (car colset))
          (tail (cadr colset))
          (cols (split-string
-                (TeX-replace-regexp-in-string "[ %
        ]" "" (nth 2 colset))
+                (replace-regexp-in-string "[ %
        ]" "" (nth 2 colset))
                 "\(,[^;]+;\|,[^;]+$\)" t)))
       (dolist (color cols)
        (LaTeX-add-xcolor-definecolors (concat head color tail))))))
diff --git a/tex.el b/tex.el
index 044dd22..e211c85 100644
--- a/tex.el
+++ b/tex.el
@@ -764,11 +764,7 @@ overlays."
             (/ outer-priority 2))
            ((and inner-priority outer-priority)
             (+ (/ (- outer-priority inner-priority) 2) inner-priority))
-           (t TeX-overlay-priority-step))))
-
-  (defun TeX-replace-regexp-in-string (regexp rep string)
-    "Compatibility function mimicking `replace-regexp-in-string' for XEmacs."
-    (replace-in-string string regexp rep)) )
+           (t TeX-overlay-priority-step)))))
 
 ;; require crm here, because we often do
 ;;
@@ -877,9 +873,7 @@ overlays."
             (/ outer-priority 2))
            ((and inner-priority outer-priority)
             (+ (/ (- outer-priority inner-priority) 2) inner-priority))
-           (t TeX-overlay-priority-step))))
-
-  (defalias #'TeX-replace-regexp-in-string #'replace-regexp-in-string) )
+           (t TeX-overlay-priority-step)))))
 
 (defun TeX-delete-dups-by-car (alist &optional keep-list)
   "Return a list of all elements in ALIST, but each car only once.