diff lisp/modes/cc-mode.el @ 118:7d55a9ba150c r20-1b11

Import from CVS: tag r20-1b11
author cvs
date Mon, 13 Aug 2007 09:24:17 +0200
parents 9f59509498e1
children cca96a509cfe
line wrap: on
line diff
--- a/lisp/modes/cc-mode.el	Mon Aug 13 09:23:08 2007 +0200
+++ b/lisp/modes/cc-mode.el	Mon Aug 13 09:24:17 2007 +0200
@@ -6,8 +6,8 @@
 ;;          1987 Dave Detlefs and Stewart Clamen
 ;;          1985 Richard M. Stallman
 ;; Created: a long, long, time ago. adapted from the original c-mode.el
-;; Version:         4.388
-;; Last Modified:   1997/03/25 03:19:17
+;; Version:         4.390
+;; Last Modified:   1997/04/02 15:46:35
 ;; Keywords: c languages oop
 
 ;; NOTE: Read the commentary below for the right way to submit bug reports!
@@ -2448,6 +2448,7 @@
 	(c-set-style-1 vars)))
   (c-keep-region-active))
 
+;;;###autoload
 (defun c-add-style (style descrip &optional set-p)
   "Adds a style to `c-style-alist', or updates an existing one.
 STYLE is a string identifying the style to add or update.  DESCRIP is
@@ -4141,8 +4142,10 @@
 				  (setq done t))
 				 )
 			   (setq cont t)))
-		       injava-inher))
-		)
+		       injava-inher)
+		     (not (c-crosses-statement-barrier-p (cdr injava-inher)
+							 (point)))
+		     ))
 	    (cond
 	     ;; CASE 5C.1: non-hanging colon on an inher intro
 	     ((= char-after-ip ?:)
@@ -5203,7 +5206,7 @@
 
 ;; defuns for submitting bug reports
 
-(defconst c-version "4.388"
+(defconst c-version "4.390"
   "CC Mode version number.")
 (defconst c-mode-help-address
   "bug-gnu-emacs@prep.ai.mit.edu, cc-mode-help@python.org"