/[emacs]/emacs/lisp/progmodes/cc-compat.el
ViewVC logotype

Diff of /emacs/lisp/progmodes/cc-compat.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.14.2.1 by miles, Fri Apr 4 06:20:31 2003 UTC revision 1.14.2.2 by miles, Tue Oct 14 23:30:15 2003 UTC
# Line 1  Line 1 
1  ;;; cc-compat.el --- cc-mode compatibility with c-mode.el confusion  ;;; cc-compat.el --- cc-mode compatibility with c-mode.el confusion
2    
3  ;; Copyright (C) 1985,1987,1992-2001 Free Software Foundation, Inc.  ;; Copyright (C) 1985,1987,1992-2003 Free Software Foundation, Inc.
4    
5  ;; Authors:    2000- Martin Stjernholm  ;; Authors:    1998- Martin Stjernholm
6  ;;             1998-1999 Barry A. Warsaw and Martin Stjernholm  ;;             1994-1999 Barry A. Warsaw
 ;;             1994-1997 Barry A. Warsaw  
7  ;; Maintainer: bug-cc-mode@gnu.org  ;; Maintainer: bug-cc-mode@gnu.org
8  ;; Created:    August 1994, split from cc-mode.el  ;; Created:    August 1994, split from cc-mode.el
9  ;; Version:    See cc-mode.el  ;; Version:    See cc-mode.el
# Line 51  Line 50 
50                    (stringp byte-compile-dest-file))                    (stringp byte-compile-dest-file))
51               (cons (file-name-directory byte-compile-dest-file) load-path)               (cons (file-name-directory byte-compile-dest-file) load-path)
52             load-path)))             load-path)))
53      (require 'cc-bytecomp)))      (load "cc-bytecomp" nil t)))
54    
55  (cc-require 'cc-defs)  (cc-require 'cc-defs)
56  (cc-require 'cc-vars)  (cc-require 'cc-vars)
# Line 106  This is in addition to c-continued-state Line 105  This is in addition to c-continued-state
105      (if (eq (char-before) ?{)      (if (eq (char-before) ?{)
106          (forward-char -1)          (forward-char -1)
107        (goto-char (cdr langelem)))        (goto-char (cdr langelem)))
108      (let* ((curcol (save-excursion      (let* ((curcol (save-excursion
109                       (goto-char (cdr langelem))                       (goto-char (cdr langelem))
110                       (current-column)))                       (current-column)))
111            (bocm-lossage            (bocm-lossage
# Line 138  This is in addition to c-continued-state Line 137  This is in addition to c-continued-state
137  (defun cc-block-close-offset (langelem)  (defun cc-block-close-offset (langelem)
138    (save-excursion    (save-excursion
139      (let* ((here (point))      (let* ((here (point))
140             bracep             bracep
141             (curcol (progn             (curcol (progn
142                       (goto-char (cdr langelem))                       (goto-char (cdr langelem))
143                       (current-column)))                       (current-column)))
# Line 154  This is in addition to c-continued-state Line 153  This is in addition to c-continued-state
153                             (current-column))))                             (current-column))))
154        (- bocm-lossage curcol        (- bocm-lossage curcol
155           (if bracep 0 c-indent-level)))))           (if bracep 0 c-indent-level)))))
156          
157    
158  (defun cc-substatement-open-offset (langelem)  (defun cc-substatement-open-offset (langelem)
159    (+ c-continued-statement-offset c-continued-brace-offset))    (+ c-continued-statement-offset c-continued-brace-offset))
160    
161    
162  (cc-provide 'cc-compat)  (cc-provide 'cc-compat)
163    
164    ;;; arch-tag: 564dab2f-e6ad-499c-a4a3-fedec3ecc192
165  ;;; cc-compat.el ends here  ;;; cc-compat.el ends here

Legend:
Removed from v.1.14.2.1  
changed lines
  Added in v.1.14.2.2

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26