Fix recursive load issue with reftex.el and reftex-vars.el.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 59e2a227e42498a3a1dec8370a64386bb7cba28d..d299aeead4998320f6ff188de2fa60b4dba7ab49 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,5 @@
 2013-04-23  Tassilo Horn  <tsdh@gnu.org>
 
-       * textmodes/reftex.el (reftex-compile-variables): Add autoload
-       cookie.
-
        * textmodes/reftex-vars.el (reftex-label-regexps): Call
        `reftex-compile-variables' after changes to this variable.
 

diff --git a/lisp/textmodes/reftex-vars.el b/lisp/textmodes/reftex-vars.el
index a220002286e613f88976098a200cbd802df90eb8..7343d86b06fc9f6955df7e5f20dc1900bcccc107 100644 (file)
--- a/lisp/textmodes/reftex-vars.el
+++ b/lisp/textmodes/reftex-vars.el
@@ -880,7 +880,8 @@ When changed from Lisp, make sure to call
 effective."
   :set (lambda (symbol value)
         (set symbol value)
-        (reftex-compile-variables))
+        (when (fboundp 'reftex-compile-variables)
+          (reftex-compile-variables)))
   :group 'reftex-defining-label-environments
   :type '(repeat (regexp :tag "Regular Expression")))
 

diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el
index 8b5dee5a0372cc76d6d1bef23b9c1cc1f174b449..21083fd188af18cefe9f71bf81f001271fc6a5e0 100644 (file)
--- a/lisp/textmodes/reftex.el
+++ b/lisp/textmodes/reftex.el
@@ -811,7 +811,6 @@ This enforces rescanning the buffer on next use."
      (reftex-kill-buffer (reftex-make-index-buffer-name tag)))
    (cdr (assoc 'index-tags (symbol-value reftex-docstruct-symbol)))))
 
-;;;###autoload
 (defun reftex-compile-variables ()
   ;; Compile the information in reftex-label-alist & Co.