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

[Ralf Angeli]

CVSROOT:        /cvsroot/auctex
Module name:    auctex
Changes by:     Ralf Angeli <angeli>    08/07/27 20:09:39

Index: context.el
===================================================================
RCS file: /cvsroot/auctex/auctex/context.el,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- context.el  3 Jul 2008 21:43:36 -0000       1.67
+++ context.el  27 Jul 2008 20:09:39 -0000      1.68
@@ -1,6 +1,6 @@
 ;;; context.el --- Support for ConTeXt documents.
 
-;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006, 2008 Free Software Foundation, Inc.
 
 ;; Maintainer: Berend de Boer <address@hidden>
 ;; Keywords: tex
@@ -1486,16 +1486,20 @@
 (defun ConTeXt-expand-options ()
   "Expand options for texexec command."
   (concat
-   (and TeX-PDF-mode "--pdf ")
-   (if TeX-Omega-mode
-       (and ConTeXt-Omega-engine
+   (and TeX-PDF-mode (not TeX-XeTeX-mode) "--pdf ")
+   (cond ((and TeX-Omega-mode Context-Omega-engine)
            (format "--tex=%s " ConTeXt-Omega-engine))
-     (and ConTeXt-engine
+        (TeX-XeTeX-mode
+         "--xetex ")
+        (ConTeXt-engine
          (format "--tex=%s " ConTeXt-engine)))
    (unless (eq ConTeXt-current-interface "en")
      (format "--interface=%s " ConTeXt-current-interface))
-   (when TeX-source-specials-mode
-     (format "--passon=\"%s\" " TeX-source-specials-tex-flags))
+   (when TeX-source-correlate-mode
+     (format "--passon=\"%s\" "
+            (if (eq TeX-source-correlate-method-active 'synctex)
+                TeX-synctex-tex-flags
+              TeX-source-specials-tex-flags)))
    (unless TeX-interactive-mode
      ConTeXt-texexec-option-nonstop)))