changeset 109940:5f6bc820aec9

Minor align-regexp fix. * lisp/align.el (align-regexp): Make group and spacing arguments use the interactive defaults when non-interactive. (Bug#6698)
author Glenn Morris <rgm@gnu.org>
date Fri, 20 Aug 2010 00:33:06 -0700
parents 7f388ce0e51e
children 4ad36c49d812
files lisp/ChangeLog lisp/align.el
diffstat 2 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Fri Aug 20 00:11:35 2010 -0700
+++ b/lisp/ChangeLog	Fri Aug 20 00:33:06 2010 -0700
@@ -1,5 +1,8 @@
 2010-08-20  Glenn Morris  <rgm@gnu.org>
 
+	* 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.
--- a/lisp/align.el	Fri Aug 20 00:11:35 2010 -0700
+++ b/lisp/align.el	Fri Aug 20 00:33:06 2010 -0700
@@ -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 <johnw@gnu.org>
 ;; 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))