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 2a046ab12dee734a72d35775bddc8a411501e56e..9ddfe3a6a1f3c0b495c0855f1bdcaa7272fb095e 100644 (file)
--- a/lisp/progmodes/cc-compat.el
+++ b/lisp/progmodes/cc-compat.el
@@ -1,11 +1,12 @@
 ;;; cc-compat.el --- cc-mode compatibility with c-mode.el confusion
 
-;; Copyright (C) 1985,87,92,93,94,95,96,97 Free Software Foundation, Inc.
+;; Copyright (C) 1985,1987,1992-2003 Free Software Foundation, Inc.
 
-;; Author:     1994-1997 Barry A. Warsaw
-;; Maintainer: cc-mode-help@python.org
+;; Authors:    1998- Martin Stjernholm
+;;            1994-1999 Barry A. Warsaw
+;; Maintainer: bug-cc-mode@gnu.org
 ;; Created:    August 1994, split from cc-mode.el
-;; Version:    5.16
+;; Version:    See cc-mode.el
 ;; Keywords:   c languages oop
 
 ;; This file is part of GNU Emacs.
@@ -21,8 +22,8 @@
 ;; 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,
+;; 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:
@@ -36,12 +37,25 @@
 ;;
 ;; (require 'cc-compat)
 ;; (c-set-style "BOCM")
+;;
+;; This file is completely unsupported!  Although it has been patched
+;; superficially to keep pace with the rest of CC Mode, it hasn't been
+;; tested for a long time.
 
 ;;; Code:
 
 (eval-when-compile
-  (require 'cc-styles)
-  (require 'cc-engine))
+  (let ((load-path
+        (if (and (boundp 'byte-compile-dest-file)
+                 (stringp byte-compile-dest-file))
+            (cons (file-name-directory byte-compile-dest-file) load-path)
+          load-path)))
+    (load "cc-bytecomp" nil t)))
+
+(cc-require 'cc-defs)
+(cc-require 'cc-vars)
+(cc-require 'cc-styles)
+(cc-require 'cc-engine)
 
 \f
 ;; In case c-mode.el isn't loaded
@@ -114,7 +128,7 @@ This is in addition to c-continued-statement-offset.")
              ;; line
              (progn
                (if (eq (char-before) ?\))
-                   (forward-sexp -1))
+                   (c-forward-sexp -1))
                ;; Get initial indentation of the line we are on.
                (current-indentation)))))
       (- bocm-lossage curcol))))
@@ -145,5 +159,7 @@ This is in addition to c-continued-statement-offset.")
   (+ c-continued-statement-offset c-continued-brace-offset))
 
 \f
-(provide 'cc-compat)
+(cc-provide 'cc-compat)
+
+;;; arch-tag: 564dab2f-e6ad-499c-a4a3-fedec3ecc192
 ;;; cc-compat.el ends here