* progmodes/cc-menus.el (imenu-progress-message):

  Remove bogus cc-bytecomp-defun.
  (cc-imenu-objc-function): Don't call `imenu-progress-message'.
  Don't let-bind variable `stupid'.  (Bug#1638)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 06cadfecfaee93c71a894101fec4013964cfd4d2..ca9db4aa31f893baac4b9f5ebbeed73d54c10490 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2009-02-18  Juanma Barranquero  <lekktu@gmail.com>
+
+       * progmodes/cc-menus.el (imenu-progress-message):
+       Remove bogus cc-bytecomp-defun.
+       (cc-imenu-objc-function): Don't call `imenu-progress-message'.
+       Don't let-bind variable `stupid'.  (Bug#1638)
+
 2009-02-18  Glenn Morris  <rgm@gnu.org>
 
        * mail/rmail.el (rmail-get-new-mail-filter-spam):

diff --git a/lisp/progmodes/cc-menus.el b/lisp/progmodes/cc-menus.el
index da3997a4603e70369a4dabb53cac025b1e181cd4..b151bd0244fd533397685aab2899a183d4e8a20c 100644 (file)
--- a/lisp/progmodes/cc-menus.el
+++ b/lisp/progmodes/cc-menus.el
@@ -47,7 +47,6 @@
 (cc-bytecomp-defvar imenu-case-fold-search)
 (cc-bytecomp-defvar imenu-generic-expression)
 (cc-bytecomp-defvar imenu-create-index-function)
-(cc-bytecomp-defun imenu-progress-message)
 
 \f
 ;; imenu integration
@@ -316,7 +315,6 @@ Example:
        ;;
        (classcount 0)
        toplist
-       stupid
        str
        str2
        (intflen (length "@interface"))
@@ -330,10 +328,8 @@ Example:
             'buffer-substring-no-properties
           'buffer-substring)))
     (goto-char (point-max))
-    (imenu-progress-message stupid 0)
     ;;
     (while (re-search-backward cc-imenu-objc-generic-expression nil t)
-      (imenu-progress-message stupid)
       (setq langnum (if (match-beginning OBJC)
                        OBJC
                      (cond
@@ -385,7 +381,6 @@ Example:
                                          methodlist) toplist))
              methodlist nil))))
     ;;
-    (imenu-progress-message stupid 100)
     (if (eq (car toplist) nil)
        (setq toplist (cdr toplist)))