[AUCTeX-diffs] GNU AUCTeX branch, lexical-binding-attempt-1, updated. f7e846ab33b370a8499098a5936333da8205db9d

[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, lexical-binding-attempt-1 has been updated
       via  f7e846ab33b370a8499098a5936333da8205db9d (commit)
      from  49e0416a4bfe16b8f3a1023b6a15e044ca78fe6c (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 f7e846ab33b370a8499098a5936333da8205db9d
Author: Tassilo Horn <tsdh@gnu.org>
Date:   Sun Sep 6 10:59:36 2020 +0200

    Fix bug in command expanding where expansion happens in file name

diff --git a/tex-buf.el b/tex-buf.el
index 2a9bad2..2ece8ed 100644
--- a/tex-buf.el
+++ b/tex-buf.el
@@ -569,19 +569,19 @@ without further expansion."
            expansion (car (cdr entry)) ;Second element
            arguments (cdr (cdr entry)) ;Remaining elements
            string (save-match-data
-                    ;; Note regarding the special casing of `file':
-                    ;; `file' is prevented from being evaluated as a
-                    ;; function because inside of AUCTeX it only has
-                    ;; a meaning as a variable.  This makes sure that
-                    ;; a function definition made by an external
-                    ;; package (e.g. icicles) is not picked up.
-                    (cond ((and (not (eq expansion 'file))
+                    ;; Note regarding the special casing of `TeX-file-fn':
+                    ;; `TeX-file-fn' is prevented from being evaluated as a
+                    ;; function because inside of AUCTeX it only has a meaning
+                    ;; as a variable.  This makes sure that a function
+                    ;; definition made by an external package (e.g. icicles)
+                    ;; is not picked up.
+                    (cond ((and (not (eq expansion 'TeX-file-fn))
                                 (functionp expansion))
                            (apply expansion arguments))
                           ((boundp expansion)
                             (setq expansion-res
                                   (apply (symbol-value expansion) arguments))
-                            (when (eq expansion 'file)
+                            (when (eq expansion 'TeX-file-fn)
                               ;; Advance past the file name in order to
                               ;; prevent expanding any substring of it.
                               (setq TeX-expand-pos (+ TeX-expand-pos (length 
expansion-res))))

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

Summary of changes:
 tex-buf.el | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
GNU AUCTeX