HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert consecutive FSF copyright years to ranges.
[bpt/emacs.git]
/
lisp
/
align.el
diff --git
a/lisp/align.el
b/lisp/align.el
index
0917e7d
..
83e27da
100644
(file)
--- a/
lisp/align.el
+++ b/
lisp/align.el
@@
-1,7
+1,6
@@
;;; align.el --- align text to a specific column, by regexp
;;; align.el --- align text to a specific column, by regexp
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2011 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
;; Maintainer: FSF
;; Author: John Wiegley <johnw@gnu.org>
;; Maintainer: FSF
@@
-140,8
+139,8
@@
"An integer that represents the default amount of padding to use.
If `align-to-tab-stop' is non-nil, this will represent the number of
tab stops to use for alignment, rather than the number of spaces.
"An integer that represents the default amount of padding to use.
If `align-to-tab-stop' is non-nil, this will represent the number of
tab stops to use for alignment, rather than the number of spaces.
-Each alignment rule can optionally override both this variable
. See
-`align-
mode-a
list'."
+Each alignment rule can optionally override both this variable
and
+`align-
to-tab-stop'. See `align-rules-
list'."
:type 'integer
:group 'align)
:type 'integer
:group 'align)
@@
-157,8
+156,8
@@
Since each alignment rule can possibly have its own set of alignment
sections (whenever `align-region-separate' is non-nil, and not a
string), this heuristic is used to determine how far before and after
point we should search in looking for a region separator. Larger
sections (whenever `align-region-separate' is non-nil, and not a
string), this heuristic is used to determine how far before and after
point we should search in looking for a region separator. Larger
-values can mean slower perform
in large files, although smaller values
-may cause unexpected behavior at times."
+values can mean slower perform
ance in large files, although smaller
+
values
may cause unexpected behavior at times."
:type 'integer
:group 'align)
:type 'integer
:group 'align)
@@
-926,7
+925,7
@@
align them so that the opening parentheses would line up:
Joe (123) 456-7890
There is no predefined rule to handle this, but you could easily do it
Joe (123) 456-7890
There is no predefined rule to handle this, but you could easily do it
-using a REGEXP like \"(\". All you would have to do is to mark the
+using a REGEXP like \"(\".
All you would have to do is to mark the
region, call `align-regexp' and type in that regular expression."
(interactive
(append
region, call `align-regexp' and type in that regular expression."
(interactive
(append
@@
-944,6
+943,8
@@
region, call `align-regexp' and type in that regular expression."
(list (concat "\\(\\s-*\\)"
(read-string "Align regexp: "))
1 align-default-spacing nil))))
(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))
(let ((rule
(list (list nil (cons 'regexp regexp)
(cons 'group (abs group))
@@
-1603,5
+1604,4
@@
aligner would have dealt with are."
(run-hooks 'align-load-hook)
(run-hooks 'align-load-hook)
-;; arch-tag: ef79cccf-1db8-4888-a8a1-d7ce2d1532f7
;;; align.el ends here
;;; align.el ends here