unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Daniel Colascione <danc@merrillpress.com>
To: emacs-devel@gnu.org
Subject: [PATCH] Fix imenu bug with shared list structure
Date: Thu, 25 Sep 2008 16:53:01 -0400	[thread overview]
Message-ID: <200809251653.01990.danc@merrillpress.com> (raw)

Fixes a subtle bug caused by insufficient care being taken with shared list 
structure. It involves nested menu items being mysteriously deleted.


--- /dev/stdin	2008-09-25 16:51:54.840409301 -0400
+++ imenu.el	2008-09-25 16:51:36.000000000 -0400
@@ -483,8 +483,10 @@
 	(/ (1- pos) (max (/ total 100) 1))
       (/ (* 100 (1- pos)) (max total 1)))))
 
-;; Split LIST into sublists of max length N.
-;; Example (imenu--split '(1 2 3 4 5 6 7 8) 3)-> '((1 2 3) (4 5 6) (7 8))
+;;; Split LIST into sublists of max length N.
+;;; Example (imenu--split '(1 2 3 4 5 6 7 8) 3)-> '((1 2 3) (4 5 6) (7 8))
+;;;
+;;; The returned list DOES NOT share structure with LIST
 (defun imenu--split (list n)
   (let ((remain list)
 	(result '())
@@ -504,12 +506,17 @@
 	 (push (nreverse sublist) result))
     (nreverse result)))
 
-;;; Split the alist MENULIST into a nested alist, if it is long enough.
-;;; In any case, add TITLE to the front of the alist.
+;;; Split the alist MENULIST into a nested alist, if it is long
+;;; enough. In any case, add TITLE to the front of the alist.  If
+;;; IMENU--RESCAN-ITEM is present in MENULIST, it is moved to the
+;;; beginning of the returned alist.
+;;;
+;;; The returned alist DOES NOT share structure with MENULIST.
 (defun imenu--split-menu (menulist title)
-  (let (keep-at-top tail)
+  (let ((menulist (copy-sequence menulist))
+        keep-at-top tail)
     (if (memq imenu--rescan-item menulist)
-	(setq keep-at-top (cons imenu--rescan-item nil)
+	(setq keep-at-top (list imenu--rescan-item)
 	      menulist (delq imenu--rescan-item menulist)))
     (setq tail menulist)
     (dolist (item tail)
@@ -517,18 +524,22 @@
 	(push item keep-at-top)
 	(setq menulist (delq item menulist))))
     (if imenu-sort-function
-	(setq menulist (sort (copy-sequence menulist) imenu-sort-function)))
+	(setq menulist (sort menulist imenu-sort-function)))
     (if (> (length menulist) imenu-max-items)
 	(setq menulist
 	      (mapcar
 	       (lambda (menu)
 		 (cons (format "From: %s" (caar menu)) menu))
 	       (imenu--split menulist imenu-max-items))))
+
     (cons title
 	  (nconc (nreverse keep-at-top) menulist))))
 
 ;;; Split up each long alist that are nested within ALIST
 ;;; into nested alists.
+;;;
+;;; Return a split and sorted copy of ALIST. The returned alist DOES
+;;; NOT share structure with ALIST.
 (defun imenu--split-submenus (alist)
   (mapcar (function
 	   (lambda (elt)




             reply	other threads:[~2008-09-25 20:53 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-09-25 20:53 Daniel Colascione [this message]
2008-09-25 21:54 ` [PATCH] Fix imenu bug with shared list structure Stefan Monnier
2008-09-25 22:14   ` Daniel Colascione
2008-09-30  3:37 ` Glenn Morris

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=200809251653.01990.danc@merrillpress.com \
    --to=danc@merrillpress.com \
    --cc=emacs-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).