From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#9199: Imenu does not work any more with C/C++ mode Date: Wed, 14 Mar 2012 21:39:07 -0400 Message-ID: References: <4E332066.9000909@alice.it> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1331775616 1641 80.91.229.3 (15 Mar 2012 01:40:16 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 15 Mar 2012 01:40:16 +0000 (UTC) Cc: 9199-done@debbugs.gnu.org To: Angelo Graziosi Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Mar 15 02:40:15 2012 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1S7zfn-000272-2J for geb-bug-gnu-emacs@m.gmane.org; Thu, 15 Mar 2012 02:40:11 +0100 Original-Received: from localhost ([::1]:41809 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7zfm-0008Kb-DT for geb-bug-gnu-emacs@m.gmane.org; Wed, 14 Mar 2012 21:40:10 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:60084) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7zff-0008DJ-Ft for bug-gnu-emacs@gnu.org; Wed, 14 Mar 2012 21:40:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S7zfd-0003QQ-DC for bug-gnu-emacs@gnu.org; Wed, 14 Mar 2012 21:40:03 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:44429) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7zfZ-0003Pd-T2; Wed, 14 Mar 2012 21:39:57 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1S808f-0004Cs-Sj; Wed, 14 Mar 2012 22:10:01 -0400 Resent-From: Stefan Monnier Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: bug-gnu-emacs@gnu.org, bug-cc-mode@gnu.org Resent-Date: Thu, 15 Mar 2012 02:10:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 9199 X-GNU-PR-Package: emacs,cc-mode X-GNU-PR-Keywords: Mail-Followup-To: 9199@debbugs.gnu.org, monnier@iro.umontreal.ca Original-Received: via spool by 9199-done@debbugs.gnu.org id=D9199.133177736716120 (code D ref 9199); Thu, 15 Mar 2012 02:10:01 +0000 Original-Received: (at 9199-done) by debbugs.gnu.org; 15 Mar 2012 02:09:27 +0000 Original-Received: from localhost ([127.0.0.1]:51259 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1S8086-0004Bu-HF for submit@debbugs.gnu.org; Wed, 14 Mar 2012 22:09:27 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.183]:43376) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1S807u-0004BV-Pe for 9199-done@debbugs.gnu.org; Wed, 14 Mar 2012 22:09:25 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AicFAKU/KE9soXdS/2dsb2JhbACBX5x7eYhwnhmGGQSbGYQJ X-IronPort-AV: E=Sophos;i="4.73,1,1325480400"; d="scan'208";a="168060637" Original-Received: from 108-161-119-82.dsl.teksavvy.com (HELO fmsmemgm.homelinux.net) ([108.161.119.82]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 14 Mar 2012 21:39:08 -0400 Original-Received: by fmsmemgm.homelinux.net (Postfix, from userid 20848) id 56B38AE2B3; Wed, 14 Mar 2012 21:39:07 -0400 (EDT) In-Reply-To: <4E332066.9000909@alice.it> (Angelo Graziosi's message of "Fri, 29 Jul 2011 23:04:38 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.94 (gnu/linux) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:57795 Archived-At: > $ cat init.el > (add-hook 'c-mode-hook > '(lambda() > (imenu-add-to-menubar "Functions") > ) > ) Running for the Useless Use of Quote Award? ;-) > $ cat test.c > int main(){} > void foo1(){} > void foo2(){} > void foo2(){} > $ emacs test.c & > Now click on 'Functions' in the menu bar, the result is as in Hmm... indeed. > If I remove init.el completely and > $ emacs test.c & > M-x imenu-add-to-menubar > Functions > Now clicking on Functions works as expected! Yup: the reason why this (and other major modes) works is that the bug only manifests itself if you call imenu-add-to-menubar more than once (and it so happens that c-mode-hook is run twice for some reason). I believe this is fixed in the trunk now thanks the the patch below, Stefan === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-03-13 23:27:56 +0000 +++ lisp/ChangeLog 2012-03-15 01:37:45 +0000 @@ -1,3 +1,9 @@ +2012-03-15 Stefan Monnier + + * imenu.el: Fix multiple inheritance breakage (bug#9199). + (imenu-add-to-menubar): Don't add a redundant index. + (imenu-update-menubar): Handle a dynamically composed keymap. + 2012-03-13 Katsumi Yamaoka * mail/sendmail.el (mail-encode-header): === modified file 'lisp/imenu.el' --- lisp/imenu.el 2012-01-19 07:21:25 +0000 +++ lisp/imenu.el 2012-03-15 01:32:35 +0000 @@ -963,13 +963,14 @@ imenu-generic-expression (not (eq imenu-create-index-function 'imenu-default-create-index-function))) + (unless (keymapp (lookup-key (current-local-map) [menu-bar index])) (let ((newmap (make-sparse-keymap))) (set-keymap-parent newmap (current-local-map)) (setq imenu--last-menubar-index-alist nil) (define-key newmap [menu-bar index] `(menu-item ,name ,(make-sparse-keymap "Imenu"))) (use-local-map newmap) - (add-hook 'menu-bar-update-hook 'imenu-update-menubar)) + (add-hook 'menu-bar-update-hook 'imenu-update-menubar))) (error "The mode `%s' does not support Imenu" (format-mode-line mode-name)))) @@ -1008,6 +1009,9 @@ (car (cdr menu)))) 'imenu--menubar-select)) (setq old (lookup-key (current-local-map) [menu-bar index])) + ;; This should never happen, but in some odd cases, potentially, + ;; lookup-key may return a dynamically composed keymap. + (if (keymapp (cadr old)) (setq old (cadr old))) (setcdr old (cdr menu1))))))) (defun imenu--menubar-select (item)