--- a/lisp/cc-mode/cc-mode.el	Mon Aug 13 09:56:30 2007 +0200
+++ b/lisp/cc-mode/cc-mode.el	Mon Aug 13 09:57:07 2007 +0200
@@ -7,7 +7,7 @@
 ;;             1985 Richard M. Stallman
 ;; Maintainer: cc-mode-help@python.org
 ;; Created:    a long, long, time ago. adapted from the original c-mode.el
-;; Version:    5.17
+;; Version:    5.18
 ;; Keywords:   c languages oop
 
 ;; NOTE: Read the commentary below for the right way to submit bug reports!
@@ -234,7 +234,8 @@
  	c-class-key c-ObjC-class-key
 	c-baseclass-key nil
 	c-access-key c-ObjC-access-key
-	c-method-key c-ObjC-method-key)
+	c-method-key c-ObjC-method-key
+	imenu-create-index-function 'cc-imenu-objc-function)
   (run-hooks 'c-mode-common-hook)
   (run-hooks 'objc-mode-hook)
   (c-update-modeline))
@@ -289,7 +290,7 @@
 ;;;###autoload
 (defun idl-mode ()
   "Major mode for editing CORBA's IDL code.
-To submit a problem report, enter `\\[c-submit-bug-report]' from an
+To submit a problem report, enter `\\[c-submit-bug-report]' from a
 idl-mode buffer.  This automatically sets up a mail buffer with
 version information already added.  You just need to add a description
 of the problem, including a reproducible test case, and send the
@@ -326,7 +327,7 @@
 
 
 ;; defuns for submitting bug reports
-(defconst c-version "5.17"
+(defconst c-version "5.18"
   "CC Mode version number.")
 
 (defconst c-mode-help-address