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

[Martin Stjernholm]

Index: emacs/lisp/progmodes/cc-compat.el
diff -c emacs/lisp/progmodes/cc-compat.el:1.15 
emacs/lisp/progmodes/cc-compat.el:1.16
*** emacs/lisp/progmodes/cc-compat.el:1.15      Tue Feb  4 08:24:34 2003
--- emacs/lisp/progmodes/cc-compat.el   Thu Jul  3 08:30:59 2003
***************
*** 1,10 ****
  ;;; cc-compat.el --- cc-mode compatibility with c-mode.el confusion
  
! ;; Copyright (C) 1985,1987,1992-2001 Free Software Foundation, Inc.
  
! ;; Authors:    2000- Martin Stjernholm
! ;;           1998-1999 Barry A. Warsaw and Martin Stjernholm
! ;;           1994-1997 Barry A. Warsaw
  ;; Maintainer: address@hidden
  ;; Created:    August 1994, split from cc-mode.el
  ;; Version:    See cc-mode.el
--- 1,9 ----
  ;;; cc-compat.el --- cc-mode compatibility with c-mode.el confusion
  
! ;; Copyright (C) 1985,1987,1992-2003 Free Software Foundation, Inc.
  
! ;; Authors:    1998- Martin Stjernholm
! ;;           1994-1999 Barry A. Warsaw
  ;; Maintainer: address@hidden
  ;; Created:    August 1994, split from cc-mode.el
  ;; Version:    See cc-mode.el
***************
*** 51,57 ****
                  (stringp byte-compile-dest-file))
             (cons (file-name-directory byte-compile-dest-file) load-path)
           load-path)))
!     (require 'cc-bytecomp)))
  
  (cc-require 'cc-defs)
  (cc-require 'cc-vars)
--- 50,56 ----
                  (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)
***************
*** 106,112 ****
      (if (eq (char-before) ?{)
        (forward-char -1)
        (goto-char (cdr langelem)))
!     (let* ((curcol (save-excursion
                     (goto-char (cdr langelem))
                     (current-column)))
          (bocm-lossage
--- 105,111 ----
      (if (eq (char-before) ?{)
        (forward-char -1)
        (goto-char (cdr langelem)))
!     (let* ((curcol (save-excursion 
                     (goto-char (cdr langelem))
                     (current-column)))
          (bocm-lossage
***************
*** 138,144 ****
  (defun cc-block-close-offset (langelem)
    (save-excursion
      (let* ((here (point))
!          bracep
           (curcol (progn
                     (goto-char (cdr langelem))
                     (current-column)))
--- 137,143 ----
  (defun cc-block-close-offset (langelem)
    (save-excursion
      (let* ((here (point))
!          bracep 
           (curcol (progn
                     (goto-char (cdr langelem))
                     (current-column)))
***************
*** 154,160 ****
                           (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))
--- 153,159 ----
                           (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))