diff options
| author | Karoly Lorentey <[email protected]> | 2005-03-16 16:06:15 +0000 |
|---|---|---|
| committer | Karoly Lorentey <[email protected]> | 2005-03-16 16:06:15 +0000 |
| commit | 14c0ac78c48e6bdf832e370ef15ecbef6573dd06 (patch) | |
| tree | ae0aa5371351ec1a2d0bdf7c55e60b8df4b0063c /lisp/align.el | |
| parent | 38d2de214077b4e600d9f9d20d7ec81e1f1c8908 (diff) | |
| parent | a7679889e8213289331577d1d9e6d1187a20d035 (diff) | |
Merged from [email protected] (patch 37-38, 162-182)
Patches applied:
* [email protected]/emacs--cvs-trunk--0--patch-162
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-163
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-164
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-165
Merge from gnus--rel--5.10
* [email protected]/emacs--cvs-trunk--0--patch-166
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-167
Tweak obsolete function/variable warning message
* [email protected]/emacs--cvs-trunk--0--patch-168
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-169
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-170
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-171
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-172
Merge from gnus--rel--5.10
* [email protected]/emacs--cvs-trunk--0--patch-173
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-174
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-175
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-176
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-177
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-178
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-179
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-180
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-181
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-182
Update from CVS
* [email protected]/gnus--rel--5.10--patch-37
Update from CVS
* [email protected]/gnus--rel--5.10--patch-38
Update from CVS
git-archimport-id: [email protected]/emacs--multi-tty--0--patch-309
Diffstat (limited to 'lisp/align.el')
| -rw-r--r-- | lisp/align.el | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/lisp/align.el b/lisp/align.el index 5e739c8f7c..5238a75807 100644 --- a/lisp/align.el +++ b/lisp/align.el @@ -466,13 +466,13 @@ The possible settings for `align-region-separate' are: (repeat . t) (modes . align-c++-modes) (run-if . ,(function (lambda () current-prefix-arg)))) -; (valid -; . ,(function -; (lambda () -; (memq (caar (c-guess-basic-syntax)) -; '(brace-list-intro -; brace-list-entry -; brace-entry-open)))))) + ; (valid + ; . ,(function + ; (lambda () + ; (memq (caar (c-guess-basic-syntax)) + ; '(brace-list-intro + ; brace-list-entry + ; brace-entry-open)))))) ;; With a prefix argument, comma delimiter will be aligned. Since ;; perl-mode doesn't give us enough syntactic information (and we @@ -525,11 +525,11 @@ The possible settings for `align-region-separate' are: (regexp . "\\(\\s-*\\)\\\\$") (modes . align-c++-modes) (column . c-backslash-column)) -; (valid -; . ,(function -; (lambda () -; (memq (caar (c-guess-basic-syntax)) -; '(cpp-macro cpp-macro-cont)))))) + ; (valid + ; . ,(function + ; (lambda () + ; (memq (caar (c-guess-basic-syntax)) + ; '(cpp-macro cpp-macro-cont)))))) (basic-line-continuation (regexp . "\\(\\s-*\\)\\\\$") @@ -578,7 +578,12 @@ The possible settings for `align-region-separate' are: (justify . t) (run-if . ,(function (lambda () - (eq '- current-prefix-arg)))))) + (eq '- current-prefix-arg))))) + + (css-declaration + (regexp . "^\\s-*\\w+:\\(\\s-*\\).*;") + (group . (1)) + (modes . '(css-mode html-mode)))) "*A list describing all of the available alignment rules. The format is: |