[AUCTeX-diffs] Changes to auctex/latex.el

[Arne Jørgensen]

Index: auctex/latex.el
diff -u auctex/latex.el:5.386 auctex/latex.el:5.387
--- auctex/latex.el:5.386       Mon Oct 10 18:52:15 2005
+++ auctex/latex.el     Wed Oct 12 13:03:57 2005
@@ -1553,6 +1553,31 @@
   ;; defined in individual style hooks
   (TeX-update-style))
 
+(defun LaTeX-arg-usepackage (optional)
+  "Insert arguments to usepackage."
+  (let ((TeX-file-extensions '("sty")))
+    (TeX-arg-input-file nil "Package")
+    (save-excursion
+      (search-backward-regexp "{\\(.*\\)}")
+      (let* ((package (match-string 1))
+            (var (intern (format "LaTeX-%s-package-options" package)))
+            (crm-separator ",")
+            (TeX-arg-opening-brace LaTeX-optop)
+            (TeX-arg-closing-brace LaTeX-optcl)
+            options)
+       (if (or (and (boundp var)
+                    (listp (symbol-value var)))
+               (fboundp var))
+           (if (functionp var)
+               (setq options (funcall var))
+             (setq options
+                   (mapconcat 'identity 
+                              (TeX-completing-read-multiple 
+                               "Options: " (mapcar 'list (symbol-value var)))
+                              ",")))
+         (setq options (read-string "Options: ")))
+       (TeX-argument-insert options t)))))
+
 (defvar TeX-global-input-files nil
   "List of the non-local TeX input files.
 
@@ -4969,7 +4994,7 @@
        [ "Number of arguments" ] [ "Default value for first argument" ] t)
      '("renewcommand*" TeX-arg-macro
        [ "Number of arguments" ] [ "Default value for first argument" ] t)
-     '("usepackage" [ "Options" ] (TeX-arg-input-file "Package"))
+     '("usepackage" LaTeX-arg-usepackage)
      '("documentclass" TeX-arg-document)))
 
   (TeX-add-style-hook "latex2e"