[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/imenu.el
From: |
Daniel Pfeiffer |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/imenu.el |
Date: |
Tue, 26 Oct 2004 17:44:02 -0400 |
Index: emacs/lisp/imenu.el
diff -c emacs/lisp/imenu.el:1.100 emacs/lisp/imenu.el:1.101
*** emacs/lisp/imenu.el:1.100 Sun Oct 10 03:17:52 2004
--- emacs/lisp/imenu.el Tue Oct 26 21:38:09 2004
***************
*** 62,67 ****
--- 62,69 ----
;;; Code:
+ (require 'newcomment)
+
(eval-when-compile (require 'cl))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
***************
*** 796,827 ****
(regexp (nth 1 pat))
(index (nth 2 pat))
(function (nth 3 pat))
! (rest (nthcdr 4 pat)))
;; Go backwards for convenience of adding items in order.
(goto-char (point-max))
(while (re-search-backward regexp nil t)
! (imenu-progress-message prev-pos nil t)
(setq beg (match-beginning index))
! ;; Add this sort of submenu only when we've found an
! ;; item for it, avoiding empty, duff menus.
! (unless (assoc menu-title index-alist)
! (push (list menu-title) index-alist))
! (if imenu-use-markers
! (setq beg (copy-marker beg)))
! (let ((item
! (if function
! (nconc (list (match-string-no-properties index)
! beg function)
! rest)
! (cons (match-string-no-properties index)
! beg)))
! ;; This is the desired submenu,
! ;; starting with its title (or nil).
! (menu (assoc menu-title index-alist)))
! ;; Insert the item unless it is already present.
! (unless (member item (cdr menu))
! (setcdr menu
! (cons item (cdr menu))))))))
(set-syntax-table old-table)))
(imenu-progress-message prev-pos 100 t)
;; Sort each submenu by position.
--- 798,834 ----
(regexp (nth 1 pat))
(index (nth 2 pat))
(function (nth 3 pat))
! (rest (nthcdr 4 pat))
! cs)
;; Go backwards for convenience of adding items in order.
(goto-char (point-max))
(while (re-search-backward regexp nil t)
! (goto-char (match-end index))
(setq beg (match-beginning index))
! (if (setq cs (save-match-data (comment-beginning)))
! (goto-char cs) ; skip this one, it's in a comment
! (goto-char beg)
! (imenu-progress-message prev-pos nil t)
! ;; Add this sort of submenu only when we've found an
! ;; item for it, avoiding empty, duff menus.
! (unless (assoc menu-title index-alist)
! (push (list menu-title) index-alist))
! (if imenu-use-markers
! (setq beg (copy-marker beg)))
! (let ((item
! (if function
! (nconc (list (match-string-no-properties index)
! beg function)
! rest)
! (cons (match-string-no-properties index)
! beg)))
! ;; This is the desired submenu,
! ;; starting with its title (or nil).
! (menu (assoc menu-title index-alist)))
! ;; Insert the item unless it is already present.
! (unless (member item (cdr menu))
! (setcdr menu
! (cons item (cdr menu)))))))))
(set-syntax-table old-table)))
(imenu-progress-message prev-pos 100 t)
;; Sort each submenu by position.