AUCTeX: update to version 11.86

Signed-off-by: David Reitter <david.reitter@gmail.com>

aquamacs/doc/latex/changelog.tex

@@ -76,6 +76,9 @@ \subsection{Changes--- 2.0 preview 6}
 
 \item {\tt .wiki} files now open in wikipedia-mode.
 
+\item AUCTeX has ben updated to version 11.86.
+Patch by Konrad Podzceck.
+
 \item Aquamacs uses ``Python-mode'' by default now for Python source files.  Users who prefer the original Emacs python package can switch by including {\tt (require 'python)} in their {\tt Preferences.el} file.
 Code by Barry Warsaw.
 
@@ -101,8 +104,6 @@ \subsection{Changes--- 2.0 preview 6}
 %
 \subsection{Changes--- 1.x dev}
 
-\emph{Interested in trying out the Emacs 23 Cocoa version of Aquamacs?  As of Summer 2008, we're still working \emph{on} it, but we're also already working \emph{with} it. 
-\url{http://aquamacs.org/nightlies.shtml}}
 \begin{itemize}
 
 \item Auto Save files are now stored in ~/Library/Caches/Aquamacs Emacs.  This way, they survive reboots such as after system crashes (kernel panics, etc.).

aquamacs/src/site-lisp/auctex-config.el

@@ -152,38 +152,6 @@ Only checks once - subsequent calls will not result in any action."
 ;; 	    (setq count (1+ count))))
 ;;       count)))
 
-(defvar aquamacs-tex-pdf-viewer "Skim"
-  "External viewer for `aquamacs-call-viewer' and `aquamacs-latex-crossref'.
-Aquamacs defines an AUCTeX command called `Jump to PDF', 
-which calls this viewer.")
-
-
-(defun aquamacs-call-viewer (line source)
-  "Display current output file as PDF at LINE (as in file SOURCE).
-Calls `aquamacs-tex-pdf-viewer' to display the PDF file."
-  (let ((full-file-name 
-	 (expand-file-name
-	  ;; as in TeX-view
-	  ;; C-c C-c view uses %o (from TeX-expand-list), which
-	  ;; is the same.
-	  (TeX-active-master (TeX-output-extension))
-	  default-directory))
-	(full-source-name
-	 (expand-file-name 
-	  source 
-	  default-directory)))
-  (do-applescript
-  (format 
- "
- set theSink to POSIX file \"%s\" 
- set theSource to POSIX file \"%s\" 
- tell application \"%s\" 
-     activate 
-     open theSink 
-     tell front document to go to TeX line %d from theSource 
-  end tell
-" full-file-name full-source-name aquamacs-tex-pdf-viewer line))))
-
 
 (defun aquamacs-latex-crossref (ev)
   "Cross-reference in LaTeX"
@@ -337,7 +305,7 @@ Use Tools --> Install Command Line Tools to update."
 ;; This is duplicated from AUCTeX, unfortunately
 
 (aquamacs-set-defaults
- `((LaTeX-command "latex --file-line-error -synctex=1")
+ `(;; (LaTeX-command "latex --file-line-error -synctex=1")
    ;; Directories containing the sites TeX macro files and style files
    ;; AucTeX defines its own (TeX-macro-global), which serves the same function
    ;; (TeX-macro-global ,(aquamacs-latex-find-style-file-paths))

aquamacs/src/site-lisp/edit-modes/auctex/context-en.el

@@ -81,7 +81,7 @@
     "blank" "block" "bodyfont" "bodyfontenvironment" "bottom"
     "bottomtexts" "buffer" "capitals" "caption" "captions" "color"
     "colors" "columns" "combinations" "combinedlist" "descriptions"
-    "enumerations" "externalfigure" "fillinlines" "fillinrules" "float"
+    "enumerations" "externalfigures" "fillinlines" "fillinrules" "float"
     "floats" "footer" "footertexts" "footnodedefinition" "footnotes"
     "framed" "framedtexts" "head" "header" "headertexts" "headnumber"
     "heads" "headtext" "hyphenmark" "indentations" "indenting" "inmargin"
@@ -95,18 +95,27 @@
     "tolerance" "top" "toptexts" "type" "typing" "underbar" "whitespace")
   "List of the names of ConTeXt en interface  macro's that setup things.")
 
+;; referencing in ConTeXt
+(defvar ConTeXt-referencing-list-en
+  '("in" "at" "about" "pagereference" "textreference" "reference")
+  "List of ConTeXt en macro's that are used for referencing."
+)
+
 ;; lists some place macro's as well, should perhaps be under separate menu
 (defvar ConTeXt-other-macro-list-en
-  '("adaptlayout" "at" "combinepages" "copypages"
+  '("abbreviation" "adaptlayout" "at" "combinepages" "copypages"
     "externalfigure" "framed" "from" "input" "insertpages" "filterpages"
     "getbuffer" "goto"
+    "hideblocks" "keepblocks"
     "leftaligned" "midaligned"
     "obeyspaces"
-    "page" "placeexternalfigure" "placefigure" "placelogos" "placetable"
-    "protect"
+    "page"
+    "placecontent" "placeexternalfigure" "placefigure" "placelogos" "placetable"
+    "processblocks" "protect"
     "raggedcenter" "rightaligned" "rotate"
-    "scale" "showexternalfigures" "slicepages"
-    "useexternalfigure" "unprotect" "url" "usemodule")
+    "scale" "selectblocks" "showexternalfigures" "slicepages"
+    "useexternalfigure" "unprotect" "url" "useblocks" "usemodule" "useURL"
+    "version")
   "List of ConTeXt en interface macro's that are not an environment nor a setup.")
 
 (defun ConTeXt-define-command-en (what)
@@ -164,7 +173,7 @@
 
 (defun ConTeXt-en-mode-initialization ()
   "ConTeXt english interface specific initialization."
-  (mapcar 'ConTeXt-add-environments (reverse ConTeXt-environment-list-en))
+  (mapc 'ConTeXt-add-environments (reverse ConTeXt-environment-list-en))
 
   (TeX-add-symbols
    '("but" ConTeXt-arg-define-ref (TeX-arg-literal " "))

aquamacs/src/site-lisp/edit-modes/auctex/context-nl.el

@@ -147,7 +147,7 @@
 
 (defun ConTeXt-nl-mode-initialization ()
   "ConTeXt dutch interface specific initialization."
-  (mapcar 'ConTeXt-add-environments (reverse ConTeXt-environment-list-nl))
+  (mapc 'ConTeXt-add-environments (reverse ConTeXt-environment-list-nl))
 
   (TeX-add-symbols
    '("but" ConTeXt-arg-define-ref (TeX-arg-literal " "))

aquamacs/src/site-lisp/edit-modes/auctex/context.el

@@ -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 <berend@pobox.com>
 ;; Keywords: tex
@@ -76,7 +76,7 @@
 
 ;; others
 
-(setq ConTeXt-known-interfaces '("cz" "de" "en" "it" "nl" "ro" "uk"))
+(defvar ConTeXt-known-interfaces '("cz" "de" "en" "it" "nl" "ro" "uk"))
 
 (defcustom ConTeXt-default-interface "en"
   "Default interface to be used when running ConTeXt."
@@ -145,6 +145,23 @@
   (ConTeXt-arg-setup nil))
 
 
+;; Referencing ConTeXt macro's
+
+(defvar ConTeXt-referencing-list ()
+  "Calls ConTeXt-XX-other-macro-list where XX is the current interface.")
+
+(defun ConTeXt-referencing-command (what)
+  "The ConTeXt macro to call WHAT is itself, no interface specific calls."
+  what)
+
+(defun ConTeXt-insert-referencing (what)
+  "Insert the ConTeXt referencing SETUP."
+  (insert TeX-esc (ConTeXt-referencing-command what))
+  (newline)
+  (indent-according-to-mode)
+  (ConTeXt-arg-setup nil))
+
+
 ;; Other ConTeXt macro's
 
 (defvar ConTeXt-other-macro-list ()
@@ -398,6 +415,7 @@ To get a full featured `ConTeXt-section' command, insert
 				 ConTeXt-section-ref))
 
 in your .emacs file."
+  :group 'ConTeXt-macro
   :type 'hook
   :options
   '(ConTeXt-section-heading
@@ -509,7 +527,7 @@ inserted after the sectioning command."
   (setq ConTeXt-menu-changed t))
 
 ;; (defvar ConTeXt-environment-list ()
-;; 	"ConTeXt-environment-list-XX where XX is the current interface.")
+;;	"ConTeXt-environment-list-XX where XX is the current interface.")
 
 (defvar ConTeXt-environment-history nil)
 
@@ -522,7 +540,7 @@ inserted after the sectioning command."
 	 "start")
 	(t
 	 ;; this should not happen
-	 (error "Unknown interface: " ConTeXt-current-interface))))
+	 (error "Unknown interface: %s" ConTeXt-current-interface))))
 
 (defun ConTeXt-environment-stop-name ()
   "Return the \\stop translated to the language in current interface."
@@ -533,7 +551,7 @@ inserted after the sectioning command."
 	 "stop")
 	(t
 	 ;; this should not happen
-	 (error "Unknown interface: " ConTeXt-current-interface))))
+	 (error "Unknown interface: %s" ConTeXt-current-interface))))
 
 
 (defun ConTeXt-environment (arg)
@@ -733,7 +751,7 @@ An entry looks like: (\"environment\" . function)")
 (defun ConTeXt-last-unended-start ()
   "Leave point at the beginning of the last `\\start...' that is unstopped looking from the current cursor."
   (while (and (re-search-backward "\\\\start[a-zA-Z]*\\|\\\\stop[a-zA-Z]*")
-              (looking-at "\\\\stop[a-zA-Z]*"))
+	      (looking-at "\\\\stop[a-zA-Z]*"))
     (ConTeXt-last-unended-start)))
 
 (defun ConTeXt-mark-environment (&optional inner)
@@ -1246,6 +1264,17 @@ else.  There might be text before point."
   "Insert SETUP from menu."
   (ConTeXt-insert-setup setup))
 
+;; ConTeXt referencing macros
+(defvar ConTeXt-referencing-menu-name "Referencing")
+
+(defun ConTeXt-referencing-menu-entry (entry)
+  "Create an entry for the referencing menu."
+  (vector entry (list 'ConTeXt-referencing-menu entry)))
+
+(defun ConTeXt-referencing-menu (referencing)
+  "Insert REFERENCING from menu."
+  (ConTeXt-insert-referencing referencing))
+
 ;; ConTeXt other macros
 (defvar ConTeXt-other-macro-menu-name "Other macro")
 
@@ -1399,7 +1428,7 @@ else.  There might be text before point."
 	(TeX-update-style)
 	(setq ConTeXt-menu-changed nil)
 	(message "Updating section menu...")
-	(mapcar 'ConTeXt-section-enable ConTeXt-section-list)
+	(mapc 'ConTeXt-section-enable ConTeXt-section-list)
 	(message "Updating environment menu...")
 	(easy-menu-change '("ConTeXt") ConTeXt-environment-menu-name
 			  (LaTeX-split-long-menu
@@ -1420,6 +1449,11 @@ else.  There might be text before point."
 			  (LaTeX-split-long-menu
 			   (mapcar 'ConTeXt-setup-menu-entry
 				   ConTeXt-setup-list)))
+	(message "Updating referencing menu...")
+	(easy-menu-change '("ConTeXt") ConTeXt-referencing-menu-name
+			  (LaTeX-split-long-menu
+			   (mapcar 'ConTeXt-referencing-menu-entry
+				   ConTeXt-referencing-list)))
 	(message "Updating other macro's menu...")
 	(easy-menu-change '("ConTeXt") ConTeXt-other-macro-menu-name
 			  (LaTeX-split-long-menu
@@ -1452,16 +1486,16 @@ else.  There might be text before point."
 (defun ConTeXt-expand-options ()
   "Expand options for texexec command."
   (concat
-   (and TeX-PDF-mode "--pdf ")
-   (if TeX-Omega-mode
-       (and ConTeXt-Omega-engine
-	    (format "--tex=%s " ConTeXt-Omega-engine))
-     (and ConTeXt-engine
-	  (format "--tex=%s " ConTeXt-engine)))
+   (let ((engine (nth 4 (assq TeX-engine (TeX-engine-alist)))))
+     (when engine
+       (format "--engine=%s " 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)))
 
@@ -1471,9 +1505,9 @@ else.  There might be text before point."
 ;; They are mapped to interface specific variables
 
 (defvar ConTeXt-language-variable-list
-  '(ConTeXt-define-list ConTeXt-setup-list ConTeXt-other-macro-list
-           ConTeXt-project-structure-list
-           ConTeXt-section-block-list ConTeXt-section-list
+  '(ConTeXt-define-list ConTeXt-setup-list ConTeXt-referencing-list ConTeXt-other-macro-list
+	   ConTeXt-project-structure-list
+	   ConTeXt-section-block-list ConTeXt-section-list
 		       ConTeXt-text ConTeXt-item-list))
 
 (defcustom ConTeXt-clean-intermediate-suffixes