[Emacs-diffs] Changes to emacs/lisp/align.el

[John Wiegley]

Index: emacs/lisp/align.el
diff -c emacs/lisp/align.el:1.14 emacs/lisp/align.el:1.15
*** emacs/lisp/align.el:1.14    Sat Nov  6 12:04:55 2004
--- emacs/lisp/align.el Tue Mar  8 03:59:35 2005
***************
*** 466,478 ****
       (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))))))
  
      ;; With a prefix argument, comma delimiter will be aligned.  Since
      ;; perl-mode doesn't give us enough syntactic information (and we
--- 466,478 ----
       (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))))))
  
      ;; With a prefix argument, comma delimiter will be aligned.  Since
      ;; perl-mode doesn't give us enough syntactic information (and we
***************
*** 525,535 ****
       (regexp   . "\\(\\s-*\\)\\\\$")
       (modes    . align-c++-modes)
       (column   . c-backslash-column))
! ;      (valid
! ;       . ,(function
! ;       (lambda ()
! ;         (memq (caar (c-guess-basic-syntax))
! ;               '(cpp-macro cpp-macro-cont))))))
  
      (basic-line-continuation
       (regexp   . "\\(\\s-*\\)\\\\$")
--- 525,535 ----
       (regexp   . "\\(\\s-*\\)\\\\$")
       (modes    . align-c++-modes)
       (column   . c-backslash-column))
!                                       ;      (valid
!                                       ;       . ,(function
!                                       ;         (lambda ()
!                                       ;           (memq (caar 
(c-guess-basic-syntax))
!                                       ;                 '(cpp-macro 
cpp-macro-cont))))))
  
      (basic-line-continuation
       (regexp   . "\\(\\s-*\\)\\\\$")
***************
*** 578,584 ****
       (justify  . t)
       (run-if   . ,(function
                   (lambda ()
!                    (eq '- current-prefix-arg))))))
    "*A list describing all of the available alignment rules.
  The format is:
  
--- 578,589 ----
       (justify  . t)
       (run-if   . ,(function
                   (lambda ()
!                    (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: