[Emacs-diffs] Changes to emacs/lisp/progmodes/cc-align.el [emacs-unicode-2]

[Miles Bader]

Index: emacs/lisp/progmodes/cc-align.el
diff -c emacs/lisp/progmodes/cc-align.el:1.20.2.1 
emacs/lisp/progmodes/cc-align.el:1.20.2.2
*** emacs/lisp/progmodes/cc-align.el:1.20.2.1   Fri Apr 16 12:50:33 2004
--- emacs/lisp/progmodes/cc-align.el    Fri Aug 27 07:00:27 2004
***************
*** 121,127 ****
      ;; like "({".
      (when c-special-brace-lists
        (let ((special-list (c-looking-at-special-brace-list)))
!       (when special-list
          (goto-char (+ (car (car special-list)) 2)))))
  
      (let ((savepos (point))
--- 121,127 ----
      ;; like "({".
      (when c-special-brace-lists
        (let ((special-list (c-looking-at-special-brace-list)))
!       (when (and special-list (< (car (car special-list)) (point)))
          (goto-char (+ (car (car special-list)) 2)))))
  
      (let ((savepos (point))
***************
*** 380,388 ****
      (back-to-indentation)
      (let* ((eol (c-point 'eol))
           (here (point))
!          (char-after-ip (progn
!                           (skip-chars-forward " \t")
!                           (char-after))))
        (if (cdr langelem) (goto-char (cdr langelem)))
  
        ;; This kludge is necessary to support both inher-cont and
--- 380,386 ----
      (back-to-indentation)
      (let* ((eol (c-point 'eol))
           (here (point))
!          (char-after-ip (char-after)))
        (if (cdr langelem) (goto-char (cdr langelem)))
  
        ;; This kludge is necessary to support both inher-cont and
***************
*** 392,404 ****
        (backward-char)
        (c-backward-syntactic-ws))
  
!       (skip-chars-forward "^:" eol)
!       (if (eq char-after-ip ?,)
!         (skip-chars-forward " \t" eol)
!       (skip-chars-forward " \t:" eol))
!       (if (or (eolp)
!             (looking-at c-comment-start-regexp))
!         (c-forward-syntactic-ws here))
        (if (< (point) here)
          (vector (current-column)))
        )))
--- 390,401 ----
        (backward-char)
        (c-backward-syntactic-ws))
  
!       (c-syntactic-re-search-forward ":" eol 'move)
!       (if (looking-at c-syntactic-eol)
!         (c-forward-syntactic-ws here)
!       (if (eq char-after-ip ?,)
!           (backward-char)
!         (skip-chars-forward " \t" eol)))
        (if (< (point) here)
          (vector (current-column)))
        )))
***************
*** 952,962 ****
  brace-list-close, brace-list-intro, statement-block-intro and all in*
  symbols, e.g. inclass and inextern-lang."
    (save-excursion
!     (goto-char (cdr langelem))
!     (back-to-indentation)
!     (if (eq (char-syntax (char-after)) ?\()
!       0
!       c-basic-offset)))
  
  (defun c-lineup-cpp-define (langelem)
    "Line up macro continuation lines according to the indentation of
--- 949,965 ----
  brace-list-close, brace-list-intro, statement-block-intro and all in*
  symbols, e.g. inclass and inextern-lang."
    (save-excursion
!     (+ (progn
!        (back-to-indentation)
!        (if (eq (char-syntax (char-after)) ?\()
!            c-basic-offset
!          0))
!        (progn
!        (goto-char (cdr langelem))
!        (back-to-indentation)
!        (if (eq (char-syntax (char-after)) ?\()
!            0
!          c-basic-offset)))))
  
  (defun c-lineup-cpp-define (langelem)
    "Line up macro continuation lines according to the indentation of