[elpa] externals/auctex e0d067f 53/57: Manually cherry-pick commit bc0db60e

[Tassilo Horn]

branch: externals/auctex
commit e0d067f4f37e0f648c9090ff003582966e87998d
Author: Tassilo Horn <address@hidden>
Commit: Tassilo Horn <address@hidden>

    Manually cherry-pick commit bc0db60e
---
 tex-site.el.in | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tex-site.el.in b/tex-site.el.in
index a88f8bd..948a205 100644
--- a/tex-site.el.in
+++ b/tex-site.el.in
@@ -39,7 +39,14 @@
 ;;; Code:
 
 (if (< emacs-major-version 21)
-    (error "AUCTeX requires Emacs 21 or later"))
+    (error "AUCTeX requires Emacs 21 or later")) ;FIXME: Really?
+
+(unless (or (fboundp 'TeX-modes-set)     ;Avoid inf-looping.
+            (fboundp 'TeX-tex-mode))     ;auctex-autoloads is not loaded.
+  ;; Try and support the case where someone loads tex-site.el or
+  ;; auctex.el directly, in the old way.
+  (provide 'tex-site)        ;Avoid (re)loading tex-site from auctex-autoloads.
+  (load "auctex-autoloads" 'noerror 'nomessage))
 
 ;; Define here in order for `M-x customize-group <RET> AUCTeX <RET>'
 ;; to work if the main AUCTeX files are not loaded yet.