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

[Martin Stjernholm]

Index: emacs/lisp/progmodes/cc-align.el
diff -c emacs/lisp/progmodes/cc-align.el:1.24 
emacs/lisp/progmodes/cc-align.el:1.25
*** emacs/lisp/progmodes/cc-align.el:1.24       Wed Aug 11 16:22:21 2004
--- emacs/lisp/progmodes/cc-align.el    Mon May 23 00:03:59 2005
***************
*** 24,32 ****
  ;; GNU General Public License for more details.
  
  ;; You should have received a copy of the GNU General Public License
! ;; along with GNU Emacs; see the file COPYING.  If not, write to
! ;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
! ;; Boston, MA 02111-1307, USA.
  
  ;;; Commentary:
  
--- 24,32 ----
  ;; GNU General Public License for more details.
  
  ;; You should have received a copy of the GNU General Public License
! ;; along with this program; see the file COPYING.  If not, write to
! ;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
! ;; Boston, MA 02110-1301, USA.
  
  ;;; Commentary:
  
***************
*** 175,181 ****
        (let ((open-paren (elt c-syntactic-element 2))
            (paren-state (c-parse-state)))
        (while (not (eq (car paren-state) open-paren))
!         (goto-char (car paren-state))
          (setq paren-state (cdr paren-state)))))
  
      (let ((start (point)) c)
--- 175,182 ----
        (let ((open-paren (elt c-syntactic-element 2))
            (paren-state (c-parse-state)))
        (while (not (eq (car paren-state) open-paren))
!         (unless (consp (car paren-state)) ;; ignore matched braces
!           (goto-char (car paren-state)))
          (setq paren-state (cdr paren-state)))))
  
      (let ((start (point)) c)
***************
*** 1171,1176 ****
--- 1172,1178 ----
             ;;(/= (point-max)
             ;;    (save-excursion (skip-syntax-forward " ") (point))
             (zerop (forward-line 1))
+            (bolp)                     ; forward-line has funny behavior at 
eob.
             (not (looking-at "^[ \t]*$")))
        'stop
        nil)))