[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99991: Minor align-regexp fix.

[Glenn Morris]

------------------------------------------------------------
revno: 99991
committer: Glenn Morris <address@hidden>
branch nick: emacs-23
timestamp: Fri 2010-08-20 00:33:06 -0700
message:
  Minor align-regexp fix.
  
  * lisp/align.el (align-regexp): Make group and spacing arguments use
  the interactive defaults when non-interactive.  (Bug#6698)
modified:
  lisp/ChangeLog
  lisp/align.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-08-20 07:11:35 +0000
+++ b/lisp/ChangeLog    2010-08-20 07:33:06 +0000
@@ -1,5 +1,8 @@
 2010-08-20  Glenn Morris  <address@hidden>
 
+       * align.el (align-regexp): Make group and spacing arguments
+       use the interactive defaults when non-interactive.  (Bug#6698)
+
        * mail/rmail.el (rmail-forward): Replace mail-text-start with its
        expansion, so as not to need sendmail.
        (mail-text-start): Remove declaration.

=== modified file 'lisp/align.el'
--- a/lisp/align.el     2010-07-30 00:50:13 +0000
+++ b/lisp/align.el     2010-08-20 07:33:06 +0000
@@ -1,7 +1,7 @@
 ;;; align.el --- align text to a specific column, by regexp
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;;   2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <address@hidden>
 ;; Maintainer: FSF
@@ -944,6 +944,8 @@
       (list (concat "\\(\\s-*\\)"
                    (read-string "Align regexp: "))
            1 align-default-spacing nil))))
+  (or group (setq group 1))
+  (or spacing (setq spacing align-default-spacing))
   (let ((rule
         (list (list nil (cons 'regexp regexp)
                     (cons 'group (abs group))