branch: externals/auctex
commit 0c9b98aeeeb612c04824140627cb5e86a763dcf9
Author: Mosè Giordano <m...@gnu.org>
Commit: Mosè Giordano <m...@gnu.org>
Fix compatibility with XEmacs in tex-info.el
* tex-info.el: Update copyright years.
(Texinfo-nodename-de-escape, Texinfo-nodename-escape): Use
`TeX-assoc-string' in place of `assoc-string'.
---
ChangeLog | 6 ++++++
tex-info.el | 6 +++---
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d8bfe7c..11d8201 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-11-09 Mos� Giordano <m...@gnu.org>
+
+ * tex-info.el: Update copyright years.
+ (Texinfo-nodename-de-escape, Texinfo-nodename-escape): Use
+ `TeX-assoc-string' in place of `assoc-string'.
+
2015-11-08 Mos� Giordano <m...@gnu.org>
* tex-info.el (TeX-texinfo-mode): Set `TeX-output-extension'.
diff --git a/tex-info.el b/tex-info.el
index 3a7b698..0433b0a 100644
--- a/tex-info.el
+++ b/tex-info.el
@@ -1,6 +1,6 @@
;;; tex-info.el --- Support for editing Texinfo source.
-;; Copyright (C) 1993, 1994, 1997, 2000, 2001, 2004, 2005, 2006, 2011, 2014
+;; Copyright (C) 1993, 1994, 1997, 2000, 2001, 2004, 2005, 2006, 2011-2015
;; Free Software Foundation, Inc.
;; Maintainer: auctex-de...@gnu.org
@@ -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 (assoc-string (match-string 1 node-name)
map))
+ (cdr (TeX-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 (assoc-string (match-string 0
node-name) map))
+ "@" (cdr (TeX-assoc-string (match-string 0
node-name) map))
"{}"
(substring node-name (match-end 0)))
pos (1+ (match-beginning 0)))))
