* [imenu.el] Attempt to fix broken imenu--generic-function
@ 2018-07-17 20:34 Filipp Gunbin
2018-07-17 20:55 ` Drew Adams
0 siblings, 1 reply; 8+ messages in thread
From: Filipp Gunbin @ 2018-07-17 20:34 UTC (permalink / raw)
To: drew.adams; +Cc: emacs-devel
Drew, I'm sorry, your commit 77166e0da2d58f2f6436989b7059d913be5b3439
broke imenu. Do you have objections for this fix?
diff --git a/lisp/imenu.el b/lisp/imenu.el
index edca51e3ad..7285b10574 100644
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -832,15 +832,14 @@ imenu--generic-function
(dolist (item index-alist)
(when (listp item)
(setcdr item (sort (cdr item) 'imenu--sort-by-position))))
- (let ((main-element (assq nil index-alist)))
- (nconc (delq main-element (delq 'dummy index-alist))
- (cdr main-element)))
;; Remove any empty menus. That can happen because of skipping
;; things inside comments or strings.
- (when (consp (car index-alist))
- (setq index-alist (cl-delete-if-not
- (lambda (it) (cdr it))
- index-alist)))))
+ (setq index-alist (cl-delete-if
+ (lambda (it) (and (consp it) (null (cdr it))))
+ index-alist))
+ (let ((main-element (assq nil index-alist)))
+ (nconc (delq main-element (delq 'dummy index-alist))
+ (cdr main-element)))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;
^ permalink raw reply related [flat|nested] 8+ messages in thread* RE: [imenu.el] Attempt to fix broken imenu--generic-function
2018-07-17 20:34 [imenu.el] Attempt to fix broken imenu--generic-function Filipp Gunbin
@ 2018-07-17 20:55 ` Drew Adams
2018-07-17 22:14 ` Filipp Gunbin
0 siblings, 1 reply; 8+ messages in thread
From: Drew Adams @ 2018-07-17 20:55 UTC (permalink / raw)
To: Filipp Gunbin; +Cc: emacs-devel
> Drew, I'm sorry, your commit 77166e0da2d58f2f6436989b7059d913be5b3439
> broke imenu. Do you have objections for this fix?
Sorry, but I have no idea what you're talking about.
I haven't committed anything.
Is this about some Emacs bug? If so, what bug #?
Can you please specify what was broken, how/why, etc.?
Thx.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [imenu.el] Attempt to fix broken imenu--generic-function
2018-07-17 20:55 ` Drew Adams
@ 2018-07-17 22:14 ` Filipp Gunbin
2018-07-17 23:18 ` Drew Adams
[not found] ` <<03bf24b4-7040-451d-9a98-e02315b33f91@default>
0 siblings, 2 replies; 8+ messages in thread
From: Filipp Gunbin @ 2018-07-17 22:14 UTC (permalink / raw)
To: Drew Adams; +Cc: emacs-devel
On 17/07/2018 13:55 -0700, Drew Adams wrote:
>> Drew, I'm sorry, your commit 77166e0da2d58f2f6436989b7059d913be5b3439
>> broke imenu. Do you have objections for this fix?
>
> Sorry, but I have no idea what you're talking about.
> I haven't committed anything.
>
> Is this about some Emacs bug? If so, what bug #?
>
> Can you please specify what was broken, how/why, etc.?
>
> Thx.
Yes, it's in emacs master (emacs-devel list is in CC). I gave commit
hash (77166e0da2d58f2f6436989b7059d913be5b3439).
Below is the relevant diff of your change.
What is broken: result of nconc is no longer returned from the function.
And, it's unclear why test `(consp (car index-alist))' before filtering
empty menus - by this time main-element is already "spliced" into the
index-alist, so index-alist element may be a usual element (INDEX-NAME
. INDEX-POSITION) or nested index alist (INDEX-NAME . INDEX-ALIST). So
the test appears obscure.
That results in imenu errors.
My fix attempts to preseve the behavior you added, while fixing that.
I'm not attaching the diff again, it's in the previous message.
commit 77166e0da2d58f2f6436989b7059d913be5b3439
Author: Drew Adams <drew.adams@oracle.com>
Date: Sat Jul 7 19:20:45 2018 +0300
Fix 2 minor bugs in 'imenu--generic-function'
* lisp/imenu.el (imenu--generic-function): Move point to START
before checking whether the current item is inside a comment
or a string. Remove any empty menus that could have been
added before returning. (Bug#32024)
diff --git a/lisp/imenu.el b/lisp/imenu.el
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -828,9 +830,15 @@
(set-syntax-table old-table)))
;; Sort each submenu by position.
;; This is in case one submenu gets items from two different regexps.
(dolist (item index-alist)
(when (listp item)
(setcdr item (sort (cdr item) 'imenu--sort-by-position))))
(let ((main-element (assq nil index-alist)))
(nconc (delq main-element (delq 'dummy index-alist))
- (cdr main-element)))))
+ (cdr main-element)))
+ ;; Remove any empty menus. That can happen because of skipping
+ ;; things inside comments or strings.
+ (when (consp (car index-alist))
+ (setq index-alist (cl-delete-if-not
+ (lambda (it) (cdr it))
+ index-alist)))))
^ permalink raw reply [flat|nested] 8+ messages in thread* RE: [imenu.el] Attempt to fix broken imenu--generic-function
2018-07-17 22:14 ` Filipp Gunbin
@ 2018-07-17 23:18 ` Drew Adams
2018-07-18 2:38 ` Eli Zaretskii
2018-07-18 13:12 ` Filipp Gunbin
[not found] ` <<03bf24b4-7040-451d-9a98-e02315b33f91@default>
1 sibling, 2 replies; 8+ messages in thread
From: Drew Adams @ 2018-07-17 23:18 UTC (permalink / raw)
To: Filipp Gunbin; +Cc: emacs-devel
> > Is this about some Emacs bug? If so, what bug #?
> > Can you please specify what was broken, how/why, etc.?
>
I didn't commit it, but yes, it's for bug #32024. (Shouldn't
the commit log say that?)
> What is broken: result of nconc is no longer returned from the function.
Right you are. The fix looks good; thx.
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [imenu.el] Attempt to fix broken imenu--generic-function
2018-07-17 23:18 ` Drew Adams
@ 2018-07-18 2:38 ` Eli Zaretskii
2018-07-18 13:12 ` Filipp Gunbin
1 sibling, 0 replies; 8+ messages in thread
From: Eli Zaretskii @ 2018-07-18 2:38 UTC (permalink / raw)
To: Drew Adams; +Cc: fgunbin, emacs-devel
> Date: Tue, 17 Jul 2018 16:18:29 -0700 (PDT)
> From: Drew Adams <drew.adams@oracle.com>
> Cc: emacs-devel@gnu.org
>
> > > Is this about some Emacs bug? If so, what bug #?
> > > Can you please specify what was broken, how/why, etc.?
> >
> I didn't commit it, but yes, it's for bug #32024. (Shouldn't
> the commit log say that?)
It does, doesn't it?
commit 77166e0da2d58f2f6436989b7059d913be5b3439
Author: Drew Adams <drew.adams@oracle.com>
Date: Sat Jul 7 19:20:45 2018 +0300
Fix 2 minor bugs in 'imenu--generic-function'
* lisp/imenu.el (imenu--generic-function): Move point to START
before checking whether the current item is inside a comment
or a string. Remove any empty menus that could have been
added before returning. (Bug#32024)
^^^^^^^^^
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [imenu.el] Attempt to fix broken imenu--generic-function
2018-07-17 23:18 ` Drew Adams
2018-07-18 2:38 ` Eli Zaretskii
@ 2018-07-18 13:12 ` Filipp Gunbin
1 sibling, 0 replies; 8+ messages in thread
From: Filipp Gunbin @ 2018-07-18 13:12 UTC (permalink / raw)
To: Drew Adams; +Cc: emacs-devel
On 17/07/2018 16:18 -0700, Drew Adams wrote:
>> What is broken: result of nconc is no longer returned from the function.
>
> Right you are. The fix looks good; thx.
Thanks, installed.
^ permalink raw reply [flat|nested] 8+ messages in thread
[parent not found: <<03bf24b4-7040-451d-9a98-e02315b33f91@default>]
end of thread, other threads:[~2018-07-18 13:12 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-07-17 20:34 [imenu.el] Attempt to fix broken imenu--generic-function Filipp Gunbin
2018-07-17 20:55 ` Drew Adams
2018-07-17 22:14 ` Filipp Gunbin
2018-07-17 23:18 ` Drew Adams
2018-07-18 2:38 ` Eli Zaretskii
2018-07-18 13:12 ` Filipp Gunbin
[not found] ` <<03bf24b4-7040-451d-9a98-e02315b33f91@default>
[not found] ` <<83a7qp6zg5.fsf@gnu.org>
2018-07-18 4:36 ` Drew Adams
2018-07-18 5:01 ` Eli Zaretskii
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).