[AUCTeX-diffs] Changes to auctex/tex-buf.el,v

[Ralf Angeli]

CVSROOT:        /cvsroot/auctex
Module name:    auctex
Changes by:     Ralf Angeli <angeli>    07/12/28 10:33:43

Index: tex-buf.el
===================================================================
RCS file: /cvsroot/auctex/auctex/tex-buf.el,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -b -r1.266 -r1.267
--- tex-buf.el  3 Nov 2007 11:27:22 -0000       1.266
+++ tex-buf.el  28 Dec 2007 10:33:42 -0000      1.267
@@ -347,7 +347,14 @@
            expansion (car (cdr entry)) ;Second element
            arguments (cdr (cdr entry)) ;Remaining elements
            string (save-match-data
-                    (cond ((TeX-function-p expansion)
+                    ;; 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))
+                                (TeX-function-p expansion))
                            (apply expansion arguments))
                           ((boundp expansion)
                            (apply (eval expansion) arguments))