Commit c27c178c authored by Glenn Morris's avatar Glenn Morris
Browse files

Daniel Colascione <danc at merrillpress.com>

(imenu--split-menu): Fix bug with shared lists that deleted some
nested menu items.
parent 4043c194
2008-09-30 Daniel Colascione <danc@merrillpress.com>
* imenu.el (imenu--split-menu): Fix bug with shared lists that deleted
some nested menu items.
2008-09-30 Jay Belanger <jay.p.belanger@gmail.com> 2008-09-30 Jay Belanger <jay.p.belanger@gmail.com>
* calc/calc-units.el (math-standard-units): Add entries used to * calc/calc-units.el (math-standard-units): Add entries used to
......
...@@ -483,6 +483,8 @@ element recalculates the buffer's index alist.") ...@@ -483,6 +483,8 @@ element recalculates the buffer's index alist.")
;; Split LIST into sublists of max length N. ;; 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)) ;; 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) (defun imenu--split (list n)
(let ((remain list) (let ((remain list)
(result '()) (result '())
...@@ -504,10 +506,15 @@ element recalculates the buffer's index alist.") ...@@ -504,10 +506,15 @@ element recalculates the buffer's index alist.")
;;; Split the alist MENULIST into a nested alist, if it is long enough. ;;; Split the alist MENULIST into a nested alist, if it is long enough.
;;; In any case, add TITLE to the front of the alist. ;;; 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) (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) (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))) menulist (delq imenu--rescan-item menulist)))
(setq tail menulist) (setq tail menulist)
(dolist (item tail) (dolist (item tail)
...@@ -515,7 +522,7 @@ element recalculates the buffer's index alist.") ...@@ -515,7 +522,7 @@ element recalculates the buffer's index alist.")
(push item keep-at-top) (push item keep-at-top)
(setq menulist (delq item menulist)))) (setq menulist (delq item menulist))))
(if imenu-sort-function (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) (if (> (length menulist) imenu-max-items)
(setq menulist (setq menulist
(mapcar (mapcar
...@@ -527,6 +534,9 @@ element recalculates the buffer's index alist.") ...@@ -527,6 +534,9 @@ element recalculates the buffer's index alist.")
;;; Split up each long alist that are nested within ALIST ;;; Split up each long alist that are nested within ALIST
;;; into nested alists. ;;; 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) (defun imenu--split-submenus (alist)
(mapcar (function (mapcar (function
(lambda (elt) (lambda (elt)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment