X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/6862d61353f4126dd8288339afb0d114c130f091..e9cda8277618ce4e2644e852539474b7b67f09e3:/lisp/progmodes/cc-compat.el diff --git a/lisp/progmodes/cc-compat.el b/lisp/progmodes/cc-compat.el index 44ab7acbca..9ddfe3a6a1 100644 --- 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-2000 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 @@ -23,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: @@ -38,19 +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 (let ((load-path - (if (and (boundp 'byte-compile-current-file) - (stringp byte-compile-current-file)) - (cons (file-name-directory byte-compile-current-file) - 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-defs" nil t))) -(require 'cc-styles) -(require 'cc-engine) + (load "cc-bytecomp" nil t))) + +(cc-require 'cc-defs) +(cc-require 'cc-vars) +(cc-require 'cc-styles) +(cc-require 'cc-engine) ;; In case c-mode.el isn't loaded @@ -154,5 +159,7 @@ This is in addition to c-continued-statement-offset.") (+ c-continued-statement-offset c-continued-brace-offset)) -(provide 'cc-compat) +(cc-provide 'cc-compat) + +;;; arch-tag: 564dab2f-e6ad-499c-a4a3-fedec3ecc192 ;;; cc-compat.el ends here