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

[Ralf Angeli]

Index: auctex/tex.el
diff -u auctex/tex.el:5.501 auctex/tex.el:5.502
--- auctex/tex.el:5.501 Fri Apr  8 06:30:23 2005
+++ auctex/tex.el       Sun Apr 10 18:00:49 2005
@@ -631,7 +631,7 @@
   (defconst AUCTeX-version
     (eval-when-compile
       (let ((name "$Name:  $")
-           (rev "$Revision: 5.501 $"))
+           (rev "$Revision: 5.502 $"))
        (or (when (string-match "\\`[$]Name: *\\(release_\\)?\\([^ ]+\\) 
*[$]\\'"
                                name)
              (setq name (match-string 2 name))
@@ -646,7 +646,7 @@
 
 (defconst AUCTeX-date
   (eval-when-compile
-    (let ((date "$Date: 2005/04/08 06:30:23 $"))
+    (let ((date "$Date: 2005/04/10 18:00:49 $"))
       (string-match
        "\\`[$]Date: *\\([0-9]+\\)/\\([0-9]+\\)/\\([0-9]+\\)"
        date)
@@ -2051,42 +2051,46 @@
 then use square brackets instead of curly braces.
 
 See `TeX-parse-macro' for details."
-  (cond ((stringp arg)
-        (TeX-arg-string optional arg))
-       ((numberp arg)
-        (unless (< arg 1)
-          (TeX-parse-argument optional t)
-          (while (> arg 1)
-            (TeX-parse-argument optional nil)
-            (setq arg (- arg 1)))))
-       ((null arg)
-        (insert TeX-arg-opening-brace)
-        (when (and (not optional) (TeX-active-mark))
-          (exchange-point-and-mark))
-        (insert TeX-arg-closing-brace))
-       ((eq arg t)
-        (insert TeX-arg-opening-brace)
-        (if (and (not optional) (TeX-active-mark))
-            (progn
-              (exchange-point-and-mark))
-          (set-marker exit-mark (point)))
-        (insert TeX-arg-closing-brace))
-       ((symbolp arg)
-        (funcall arg optional))
-       ((listp arg)
-        (let ((head (car arg))
-              (tail (cdr arg)))
-          (cond ((stringp head)
-                 (apply 'TeX-arg-string optional arg))
-                ((symbolp head)
-                 (apply head optional tail))
-                (t (error "Unknown list argument type %s"
-                          (prin1-to-string head))))))
-       (t (error "Unknown argument type %s" (prin1-to-string arg))))
-  (when (and (not optional) (TeX-active-mark))
-    (if (featurep 'xemacs)
-       (zmacs-deactivate-region)
-      (deactivate-mark))))
+  (let (insert-flag)
+    (cond ((stringp arg)
+          (TeX-arg-string optional arg)
+          (setq insert-flag t))
+         ((numberp arg)
+          (unless (< arg 1)
+            (TeX-parse-argument optional t)
+            (while (> arg 1)
+              (TeX-parse-argument optional nil)
+              (setq arg (- arg 1)))))
+         ((null arg)
+          (insert TeX-arg-opening-brace)
+          (when (and (not optional) (TeX-active-mark))
+            (exchange-point-and-mark))
+          (insert TeX-arg-closing-brace)
+          (setq insert-flag t))
+         ((eq arg t)
+          (insert TeX-arg-opening-brace)
+          (if (and (not optional) (TeX-active-mark))
+              (progn
+                (exchange-point-and-mark))
+            (set-marker exit-mark (point)))
+          (insert TeX-arg-closing-brace)
+          (setq insert-flag t))
+         ((symbolp arg)
+          (funcall arg optional))
+         ((listp arg)
+          (let ((head (car arg))
+                (tail (cdr arg)))
+            (cond ((stringp head)
+                   (apply 'TeX-arg-string optional arg))
+                  ((symbolp head)
+                   (apply head optional tail))
+                  (t (error "Unknown list argument type %s"
+                            (prin1-to-string head))))))
+         (t (error "Unknown argument type %s" (prin1-to-string arg))))
+    (when (and insert-flag (not optional) (TeX-active-mark))
+      (if (featurep 'xemacs)
+         (zmacs-deactivate-region)
+       (deactivate-mark)))))
 
 (defun TeX-argument-insert (name optional &optional prefix)
   "Insert NAME surrounded by curly braces.