diff options
| author | Kenichi Handa | 2010-08-25 14:15:20 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2010-08-25 14:15:20 +0900 |
| commit | 4e603db3429957e6b26953c177f00a9c9d1c8766 (patch) | |
| tree | 8206240e3006468bff9dfda5fb3696f80fbcb9f0 /lisp/align.el | |
| parent | b60f961f6cdc1095e778ad624657bb57788512af (diff) | |
| parent | f6aa6ec68ed936800ef2c3aefa42102e60b654cb (diff) | |
| download | emacs-4e603db3429957e6b26953c177f00a9c9d1c8766.tar.gz emacs-4e603db3429957e6b26953c177f00a9c9d1c8766.zip | |
merge trunk
Diffstat (limited to 'lisp/align.el')
| -rw-r--r-- | lisp/align.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/align.el b/lisp/align.el index 9d811327021..0812d362875 100644 --- a/lisp/align.el +++ b/lisp/align.el | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | ;;; align.el --- align text to a specific column, by regexp | 1 | ;;; align.el --- align text to a specific column, by regexp |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, | 3 | ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, |
| 4 | ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 4 | ;; 2008, 2009, 2010 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | ;; Author: John Wiegley <johnw@gnu.org> | 6 | ;; Author: John Wiegley <johnw@gnu.org> |
| 7 | ;; Maintainer: FSF | 7 | ;; Maintainer: FSF |
| @@ -944,6 +944,8 @@ region, call `align-regexp' and type in that regular expression." | |||
| 944 | (list (concat "\\(\\s-*\\)" | 944 | (list (concat "\\(\\s-*\\)" |
| 945 | (read-string "Align regexp: ")) | 945 | (read-string "Align regexp: ")) |
| 946 | 1 align-default-spacing nil)))) | 946 | 1 align-default-spacing nil)))) |
| 947 | (or group (setq group 1)) | ||
| 948 | (or spacing (setq spacing align-default-spacing)) | ||
| 947 | (let ((rule | 949 | (let ((rule |
| 948 | (list (list nil (cons 'regexp regexp) | 950 | (list (list nil (cons 'regexp regexp) |
| 949 | (cons 'group (abs group)) | 951 | (cons 'group (abs group)) |