diff options
| author | John Wiegley <johnw@newartisans.com> | 2005-03-08 03:59:54 +0000 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2005-03-08 03:59:54 +0000 |
| commit | 3ee9f6ac67306471052d0e81fc1e1c6ba9850c2f (patch) | |
| tree | aeed077d3d200945d45476ac56443a586f9fc94c | |
| parent | bfa8be14bff7a8805d37af6db447b7dbf8462fa3 (diff) | |
| download | emacs-3ee9f6ac67306471052d0e81fc1e1c6ba9850c2f.tar.gz | |
2005-03-07 Karl Chen <quarl@cs.berkeley.edu>
* align.el (align-rules-list): Added an alignment rule for CSS
declarations (applies to css-mode and html-mode buffers).
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/align.el | 31 |
2 files changed, 23 insertions, 13 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index df930a970d7..4dc60b0fb9f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2005-03-07 Karl Chen <quarl@cs.berkeley.edu> + + * align.el (align-rules-list): Added an alignment rule for CSS + declarations (applies to css-mode and html-mode buffers). + 2005-03-07 Stefan Monnier <monnier@iro.umontreal.ca> * emacs-lisp/debug.el (debug-on-entry-1): Fix handling of macros. diff --git a/lisp/align.el b/lisp/align.el index 5e739c8f7c0..5238a75807d 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: |