Avoid leaving nil in the alist in cc-imenu-objc-function

Fixes: debbugs:12029

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e693f1a62f6adaba8f1c08d0c9cb0fdc2f1131b0..ac1482df4e1265a65cb039a36133c090c9741a11 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-25  Leo Liu  <sdl.web@gmail.com>
+
+       * progmodes/cc-menus.el (cc-imenu-objc-function): Avoid leaving nil in
+       the alist (bug#12029).
+
 2012-07-25  Chong Yidong  <cyd@gnu.org>
 
        * mouse.el (mouse-drag-track): Do not set the mark if the user

diff --git a/lisp/progmodes/cc-menus.el b/lisp/progmodes/cc-menus.el
index a53d65f6307201cf4dc8ddea96800d415a8d4ce7..76e3002abd2b0d14cb1a79f4a668a0fe4af92cf6 100644 (file)
--- a/lisp/progmodes/cc-menus.el
+++ b/lisp/progmodes/cc-menus.el
@@ -399,14 +399,10 @@ Example:
                str2 "@protocol")))
        (setq str (cc-imenu-objc-remove-white-space str))
        (setq methodlist (cons (cons str2
-                             (match-beginning langnum))
+                                    (match-beginning langnum))
                               methodlist))
-       (setq toplist (cons nil (cons (cons str
-                                         methodlist) toplist))
+       (setq toplist (cons (cons str methodlist) toplist)
              methodlist nil))))
-    ;;
-    (if (eq (car toplist) nil)
-       (setq toplist (cdr toplist)))
 
     ;; In this buffer, there is only one or zero @{interface|implementation|protocol}.
     (if (< classcount 2)