[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108080: Avoid leaving nil in the alist in cc-imenu-objc-function

[Leo Liu]

------------------------------------------------------------
revno: 108080
fixes bug: http://debbugs.gnu.org/12029
committer: Leo Liu <address@hidden>
branch nick: emacs-24
timestamp: Thu 2012-07-26 00:11:23 +0800
message:
  Avoid leaving nil in the alist in cc-imenu-objc-function
modified:
  lisp/ChangeLog
  lisp/progmodes/cc-menus.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-07-25 06:14:30 +0000
+++ b/lisp/ChangeLog    2012-07-25 16:11:23 +0000
@@ -1,3 +1,8 @@
+2012-07-25  Leo Liu  <address@hidden>
+
+       * progmodes/cc-menus.el (cc-imenu-objc-function): Avoid leaving nil in
+       the alist (bug#12029).
+
 2012-07-25  Chong Yidong  <address@hidden>
 
        * mouse.el (mouse-drag-track): Do not set the mark if the user

=== modified file 'lisp/progmodes/cc-menus.el'
--- a/lisp/progmodes/cc-menus.el        2012-04-11 18:09:10 +0000
+++ b/lisp/progmodes/cc-menus.el        2012-07-25 16:11:23 +0000
@@ -399,14 +399,10 @@
                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)