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

[Ralf Angeli]

CVSROOT:        /cvsroot/auctex
Module name:    auctex
Changes by:     Ralf Angeli <angeli>    11/01/30 16:24:15

Index: tex.el
===================================================================
RCS file: /cvsroot/auctex/auctex/tex.el,v
retrieving revision 5.673
retrieving revision 5.674
diff -u -b -r5.673 -r5.674
--- tex.el      29 Jan 2011 15:58:09 -0000      5.673
+++ tex.el      30 Jan 2011 16:24:15 -0000      5.674
@@ -2566,10 +2566,10 @@
           (goto-char (marker-position exit-mark))
           (set-marker exit-mark nil))
          ((and TeX-insert-braces
-               ;; Do not add braces for macros defined as `("foo" 0)'
+               ;; Do not add braces if the argument is 0 or -1.
                (not (and (= (safe-length args) 1)
                          (numberp (car args))
-                         (= (car args) 0)))
+                         (<= (car args) 0)))
                (equal position (point))
                (string-match "[a-zA-Z]+" symbol)
                (not (texmathp)))
@@ -2634,11 +2634,25 @@
           (TeX-arg-string optional arg)
           (setq insert-flag t))
          ((numberp arg)
-          (unless (< arg 1)
+          (cond ((< arg 0)
+                 (when (TeX-active-mark)
+                   ;; Put both the macro and the marked region in a TeX group.
+                   (let ((beg (min (point) (mark)))
+                         (end (set-marker (make-marker) (max (point) (mark)))))
+                     (insert " ")
+                     (goto-char beg)
+                     (skip-chars-backward "^\\\\")
+                     (backward-char)
+                     (insert TeX-arg-opening-brace)
+                     (goto-char (marker-position end))
+                     (insert TeX-arg-closing-brace)
+                     (setq insert-flag t))))
+                ((= arg 0)) ; nop for clarity
+                ((> arg 0)
             (TeX-parse-argument optional t)
             (while (> arg 1)
               (TeX-parse-argument optional nil)
-              (setq arg (- arg 1)))))
+                   (setq arg (- arg 1))))))
          ((null arg)
           (insert TeX-arg-opening-brace)
           (when (and (not optional) (TeX-active-mark))