/[emacs]/emacs/lisp/progmodes/cc-align.el
ViewVC logotype

Diff of /emacs/lisp/progmodes/cc-align.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.18.2.2 by miles, Fri Nov 21 00:35:50 2003 UTC revision 1.18.2.3 by miles, Sat Sep 4 09:22:57 2004 UTC
# Line 121  Works with: arglist-cont-nonempty, argli Line 121  Works with: arglist-cont-nonempty, argli
121      ;; like "({".      ;; like "({".
122      (when c-special-brace-lists      (when c-special-brace-lists
123        (let ((special-list (c-looking-at-special-brace-list)))        (let ((special-list (c-looking-at-special-brace-list)))
124          (when special-list          (when (and special-list (< (car (car special-list)) (point)))
125            (goto-char (+ (car (car special-list)) 2)))))            (goto-char (+ (car (car special-list)) 2)))))
126    
127      (let ((savepos (point))      (let ((savepos (point))
# Line 380  Works with: inher-cont, member-init-cont Line 380  Works with: inher-cont, member-init-cont
380      (back-to-indentation)      (back-to-indentation)
381      (let* ((eol (c-point 'eol))      (let* ((eol (c-point 'eol))
382             (here (point))             (here (point))
383             (char-after-ip (progn             (char-after-ip (char-after)))
                             (skip-chars-forward " \t")  
                             (char-after))))  
384        (if (cdr langelem) (goto-char (cdr langelem)))        (if (cdr langelem) (goto-char (cdr langelem)))
385    
386        ;; This kludge is necessary to support both inher-cont and        ;; This kludge is necessary to support both inher-cont and
# Line 392  Works with: inher-cont, member-init-cont Line 390  Works with: inher-cont, member-init-cont
390          (backward-char)          (backward-char)
391          (c-backward-syntactic-ws))          (c-backward-syntactic-ws))
392    
393        (skip-chars-forward "^:" eol)        (c-syntactic-re-search-forward ":" eol 'move)
394        (if (eq char-after-ip ?,)        (if (looking-at c-syntactic-eol)
395            (skip-chars-forward " \t" eol)            (c-forward-syntactic-ws here)
396          (skip-chars-forward " \t:" eol))          (if (eq char-after-ip ?,)
397        (if (or (eolp)              (backward-char)
398                (looking-at c-comment-start-regexp))            (skip-chars-forward " \t" eol)))
           (c-forward-syntactic-ws here))  
399        (if (< (point) here)        (if (< (point) here)
400            (vector (current-column)))            (vector (current-column)))
401        )))        )))
# Line 952  Works with: defun-close, defun-block-int Line 949  Works with: defun-close, defun-block-int
949  brace-list-close, brace-list-intro, statement-block-intro and all in*  brace-list-close, brace-list-intro, statement-block-intro and all in*
950  symbols, e.g. inclass and inextern-lang."  symbols, e.g. inclass and inextern-lang."
951    (save-excursion    (save-excursion
952      (goto-char (cdr langelem))      (+ (progn
953      (back-to-indentation)           (back-to-indentation)
954      (if (eq (char-syntax (char-after)) ?\()           (if (eq (char-syntax (char-after)) ?\()
955          0               c-basic-offset
956        c-basic-offset)))             0))
957           (progn
958             (goto-char (cdr langelem))
959             (back-to-indentation)
960             (if (eq (char-syntax (char-after)) ?\()
961                 0
962               c-basic-offset)))))
963    
964  (defun c-lineup-cpp-define (langelem)  (defun c-lineup-cpp-define (langelem)
965    "Line up macro continuation lines according to the indentation of    "Line up macro continuation lines according to the indentation of

Legend:
Removed from v.1.18.2.2  
changed lines
  Added in v.1.18.2.3

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26