[AUCTeX-diffs] [elpa] externals/auctex d3d321a 05/43: Remove TeX-assoc-string

[Tassilo Horn]

branch: externals/auctex
commit d3d321a8d210b5b358af63d850444e827ba0826f
Author: Mosè Giordano <address@hidden>
Commit: Mosè Giordano <address@hidden>

    Remove TeX-assoc-string
    
    * tex.el (TeX-assoc-string): Remove alias.
    (TeX-add-style-hook):
    (TeX-unload-style):
    (TeX-run-style-hooks):
    * tex-info.el (Texinfo-nodename-de-escape):
    (Texinfo-nodename-escape): Replace `TeX-assoc-string' with `assoc-string'.
---
 tex-info.el |  4 ++--
 tex.el      | 10 +++-------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/tex-info.el b/tex-info.el
index 5d4fc08..660cf46 100644
--- a/tex-info.el
+++ b/tex-info.el
@@ -297,7 +297,7 @@ character. Return the resulting string."
     (while (and (< pos (length
                        node-name)) (string-match "@\(comma\)[[:blank:]]*{}" 
node-name pos))
       (setq node-name (concat  (substring node-name 0 (match-beginning 0))
-                              (cdr (TeX-assoc-string (match-string 1 
node-name) map))
+                              (cdr (assoc-string (match-string 1 node-name) 
map))
                               (substring node-name (match-end 0)))
            pos (1+ (match-beginning 0)))))
   node-name)
@@ -311,7 +311,7 @@ commands. Return the resulting string."
         (re (regexp-opt (mapcar 'car map))) )
     (while (and (< pos (length node-name)) (string-match re node-name pos))
       (setq node-name (concat  (substring node-name 0 (match-beginning 0))
-                              "@" (cdr (TeX-assoc-string (match-string 0 
node-name) map))
+                              "@" (cdr (assoc-string (match-string 0 
node-name) map))
                               "{}"
                               (substring node-name (match-end 0)))
            pos (1+ (match-beginning 0)))))
diff --git a/tex.el b/tex.el
index ab872b3..5927b49 100644
--- a/tex.el
+++ b/tex.el
@@ -671,10 +671,6 @@ but does nothing in Emacs."
 Also does other stuff."
     (TeX-maybe-remove-help menu)))
 
-;;;###autoload
-(defalias 'TeX-assoc-string
-  (symbol-function  (if (featurep 'xemacs) 'assoc 'assoc-string)))
-
 ;;; Documentation for Info-goto-emacs-command-node and similar
 
 (eval-after-load 'info '(dolist (elt '("TeX" "LaTeX" "ConTeXt" "Texinfo"
@@ -3020,7 +3016,7 @@ DIALECT-EXPR can also be an expression like one of the 
following:
 
 When omitted DIALECT-EXPR is equivalent to `(nor )', ie all
 dialected are allowed."
-  (let ((entry (TeX-assoc-string style TeX-style-hook-list)))
+  (let ((entry (assoc-string style TeX-style-hook-list)))
     (and dialect-expr (setq hook (vector 'TeX-style-hook hook
                                         (TeX-shdex-eval dialect-expr))))
     (cond ((null entry)
@@ -3052,7 +3048,7 @@ found in DIALECT-LIST and return the list thereof."
 the STYLE is only removed for those dialects in DIALECT-LIST.
 
 See variable `TeX-style-hook-dialect' for supported dialects."
-  (let ((style-data (TeX-assoc-string style TeX-style-hook-list)))
+  (let ((style-data (assoc-string style TeX-style-hook-list)))
     (if style-data
        (let ((hooks (and dialect-list (TeX-keep-hooks-in-dialect (cdr 
style-data) dialect-list))))
          (if hooks
@@ -3103,7 +3099,7 @@ See variable `TeX-style-hook-dialect' for supported 
dialects."
                            ;; styles in the order global, private, local
                            ;; (assuming TeX-style-path has that ordering,
                            ;; too).
-                           (reverse (cdr-safe (TeX-assoc-string style 
TeX-style-hook-list))))
+                           (reverse (cdr-safe (assoc-string style 
TeX-style-hook-list))))
                  ;; This happens in case some style added a new parser, and
                  ;; now the style isn't used anymore (user deleted
                  ;; \usepackage{style}).  Then we're left over with, e.g.,