(grep-regexp-alist): Replace complex regexp

[gnu-emacs] / lisp / progmodes / cc-cmds.el

diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el
index 806fbade693e7b1810e1554c652377c59d9c26fd..039ef3ccebfe666bf5886702bedd8528cf631c73 100644 (file)
--- a/lisp/progmodes/cc-cmds.el
+++ b/lisp/progmodes/cc-cmds.el
@@ -1,6 +1,6 @@
 ;;; cc-cmds.el --- user level commands for CC Mode
 
-;; Copyright (C) 1985,1987,1992-2003 Free Software Foundation, Inc.
+;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Authors:    1998- Martin Stjernholm
 ;;             1992-1999 Barry A. Warsaw
@@ -25,8 +25,8 @@
 
 ;; 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.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -2441,7 +2441,8 @@ command to conveniently insert and align the necessary backslashes."
                      (delete-region (point) end)
                      (indent-to column 1)))
 
-              (= (forward-line 1) 0))))
+              (zerop (forward-line 1)))
+            (bolp)))                   ; forward-line has funny behavior at eob.
 
       ;; Make sure there are backslashes with at least one space in
       ;; front of them.
@@ -2466,7 +2467,8 @@ command to conveniently insert and align the necessary backslashes."
                   (insert ?\\)
                 (insert ?\  ?\\)))
 
-            (= (forward-line 1) 0)))))))
+            (zerop (forward-line 1)))
+          (bolp))))))                  ; forward-line has funny behavior at eob.
 
 (defun c-delete-backslashes-forward (to-mark point-pos)
   ;; This function does not do any hidden buffer changes.
@@ -2481,7 +2483,8 @@ command to conveniently insert and align the necessary backslashes."
                         (skip-chars-backward " \t" (if (>= (point) point-pos)
                                                        point-pos))
                         (point))))
-            (= (forward-line 1) 0)))))
+            (zerop (forward-line 1)))
+          (bolp))))                    ; forward-line has funny behavior at eob.
 
 
 \f