Romain Francoise's and Ami Fischman's bugfixes.

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

diff --git a/lisp/progmodes/cc-compat.el b/lisp/progmodes/cc-compat.el
index c0b167faaba6ba76a9b7425039109855846a5961..9ddfe3a6a1f3c0b495c0855f1bdcaa7272fb095e 100644 (file)
--- a/lisp/progmodes/cc-compat.el
+++ b/lisp/progmodes/cc-compat.el
@@ -1,10 +1,9 @@
 ;;; cc-compat.el --- cc-mode compatibility with c-mode.el confusion
 
-;; Copyright (C) 1985,1987,1992-2001 Free Software Foundation, Inc.
+;; Copyright (C) 1985,1987,1992-2003 Free Software Foundation, Inc.
 
-;; Authors:    2000- Martin Stjernholm
-;;            1998-1999 Barry A. Warsaw and Martin Stjernholm
-;;            1994-1997 Barry A. Warsaw
+;; Authors:    1998- Martin Stjernholm
+;;            1994-1999 Barry A. Warsaw
 ;; Maintainer: bug-cc-mode@gnu.org
 ;; Created:    August 1994, split from cc-mode.el
 ;; Version:    See cc-mode.el
@@ -51,7 +50,7 @@
                  (stringp byte-compile-dest-file))
             (cons (file-name-directory byte-compile-dest-file) load-path)
           load-path)))
-    (require 'cc-bytecomp)))
+    (load "cc-bytecomp" nil t)))
 
 (cc-require 'cc-defs)
 (cc-require 'cc-vars)
@@ -106,7 +105,7 @@ This is in addition to c-continued-statement-offset.")
     (if (eq (char-before) ?{)
        (forward-char -1)
       (goto-char (cdr langelem)))
-    (let* ((curcol (save-excursion
+    (let* ((curcol (save-excursion 
                     (goto-char (cdr langelem))
                     (current-column)))
          (bocm-lossage
@@ -138,7 +137,7 @@ This is in addition to c-continued-statement-offset.")
 (defun cc-block-close-offset (langelem)
   (save-excursion
     (let* ((here (point))
-          bracep
+          bracep 
           (curcol (progn
                     (goto-char (cdr langelem))
                     (current-column)))
@@ -154,11 +153,13 @@ This is in addition to c-continued-statement-offset.")
                           (current-column))))
       (- bocm-lossage curcol
         (if bracep 0 c-indent-level)))))
-
+      
 
 (defun cc-substatement-open-offset (langelem)
   (+ c-continued-statement-offset c-continued-brace-offset))
 
 \f
 (cc-provide 'cc-compat)
+
+;;; arch-tag: 564dab2f-e6ad-499c-a4a3-fedec3ecc192
 ;;; cc-compat.el ends here