[AUCTeX-diffs] GNU AUCTeX branch, master, updated. c72f8a8fa01fc3942d606ac425325181230bedb0

[Tassilo Horn]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU AUCTeX".

The branch, master has been updated
       via  c72f8a8fa01fc3942d606ac425325181230bedb0 (commit)
      from  10de62b25842c8555cdb8cad4c85c48a401033d3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c72f8a8fa01fc3942d606ac425325181230bedb0
Author: Tassilo Horn <address@hidden>
Date:   Tue Nov 4 20:20:09 2014 +0100

    Prepare for find-file-hooks being removed from Emacs.
    
    * tex.el (VirTeX-common-initialization): Define a variable alias
    for find-file-hook on XEmacs.

diff --git a/ChangeLog b/ChangeLog
index fa10208..9734ba4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-04  Tassilo Horn  <address@hidden>
+
+       * tex.el (VirTeX-common-initialization): Define a variable alias
+       for find-file-hook on XEmacs.
+
 2014-11-04  Stefan Monnier  <address@hidden>
 
        * toolbar-x.el: Adjust copyright years.
diff --git a/tex.el b/tex.el
index cd764eb..4e392f1 100644
--- a/tex.el
+++ b/tex.el
@@ -3285,11 +3285,11 @@ The algorithm is as follows:
   (make-local-variable 'paragraph-separate)
   (set (make-local-variable 'comment-start) "%")
   (set (make-local-variable 'comment-start-skip)
-       (concat
-        "\\(\\(^\\|[^\\\n]\\)\\("
-        (regexp-quote TeX-esc)
-        (regexp-quote TeX-esc)
-        "\\)*\\)\\(%+[ \t]*\\)"))
+       (concat
+       "\\(\\(^\\|[^\\\n]\\)\\("
+       (regexp-quote TeX-esc)
+       (regexp-quote TeX-esc)
+       "\\)*\\)\\(%+[ \t]*\\)"))
   (set (make-local-variable 'comment-end-skip) "[ \t]*\\(\\s>\\|\n\\)")
   (set (make-local-variable 'comment-use-syntax) t)
   ;; `comment-padding' is defined here as an integer for compatibility
@@ -3314,10 +3314,10 @@ The algorithm is as follows:
 
   ;; Symbol completion.
   (set (make-local-variable 'TeX-complete-list)
-       (list (list "\\\\\\([a-zA-Z]*\\)"
-                   1 'TeX-symbol-list-filtered
-                   (if TeX-insert-braces "{}"))
-             (list "" TeX-complete-word)))
+       (list (list "\\\\\\([a-zA-Z]*\\)"
+                  1 'TeX-symbol-list-filtered
+                  (if TeX-insert-braces "{}"))
+            (list "" TeX-complete-word)))
 
   (funcall TeX-install-font-lock)
 
@@ -3341,16 +3341,19 @@ The algorithm is as follows:
   ;;
   ;; `TeX-update-style' has to be called before
   ;; `global-font-lock-mode', which may also be specified in
-  ;; `find-file-hooks', gets called.  Otherwise style-based
+  ;; `find-file-hook', gets called.  Otherwise style-based
   ;; fontification will break (in XEmacs).  That means, `add-hook'
   ;; cannot be called with a non-nil value of the APPEND argument.
   ;;
   ;; `(TeX-master-file nil nil t)' has to be called *before*
   ;; `TeX-update-style' as the latter will call `TeX-master-file'
   ;; without the `ask' bit set.
-  (when (and (featurep 'xemacs) (not (emacs-version>= 21 5)))
-    (make-local-hook 'find-file-hooks))
-  (add-hook 'find-file-hooks
+  (when (featurep 'xemacs)
+    (unless (boundp 'find-file-hook)
+      (defvaralias 'find-file-hook 'find-file-hooks))
+    (when (not (emacs-version>= 21 5))
+      (make-local-hook 'find-file-hook)))
+  (add-hook 'find-file-hook
            (lambda ()
              ;; Check if we are looking at a new or shared file.
              (when (or (not (file-exists-p (buffer-file-name)))
@@ -5626,7 +5629,7 @@ With optional argument ARG, also reload the style hooks."
        (save-buffer)
       (TeX-auto-write)))
   (normal-mode)
-  ;; See also addition to `find-file-hooks' in `VirTeX-common-initialization'.
+  ;; See also addition to `find-file-hook' in `VirTeX-common-initialization'.
   (when (eq TeX-master 'shared) (TeX-master-file nil nil t))
   (TeX-update-style t))
 

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog |    5 +++++
 tex.el    |   31 +++++++++++++++++--------------
 2 files changed, 22 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
GNU AUCTeX