[AUCTeX-devel] [elpa] externals/auctex 4837aba 26/69: Merge branch 'master' into simplify-TeX-parse-error

[Tassilo Horn]

branch: externals/auctex
commit 4837aba8d2ef65806a082270a0907a90815eb9bd
Merge: fd46872 3a16f59
Author: Tassilo Horn <address@hidden>
Commit: Tassilo Horn <address@hidden>

    Merge branch 'master' into simplify-TeX-parse-error
---
 ChangeLog |    5 +++++
 tex.el    |    6 +-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 01ff6dc..9b70f3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-08  Tassilo Horn  <address@hidden>
+
+       * tex.el (TeX-assoc-string): Remove docstring from defalias since
+       that's not supported with XEmacs.
+
 2014-08-25  Florent Rougon  <address@hidden>  (tiny change)
 
        * tex-buf.el (TeX-command-expand): Fix possible endless loop in
diff --git a/tex.el b/tex.el
index cf56f90..f3316d5 100644
--- a/tex.el
+++ b/tex.el
@@ -597,11 +597,7 @@ Also does other stuff."
 
 ;;;###autoload
 (defalias 'TeX-assoc-string
-  (symbol-function  (if (featurep 'xemacs) 'assoc 'assoc-string))
-  (concat "Compatibility alias that points to
-  function `assoc' with XEMACS and to function `assoc-string'
-  with GNU EMACS. See function `"
-         (if (featurep 'xemacs) "assoc" "assoc-string") "'." ))
+  (symbol-function  (if (featurep 'xemacs) 'assoc 'assoc-string)))
 
 ;;; Documentation for Info-goto-emacs-command-node and similar