[Emacs-diffs] Changes to emacs/lisp/imenu.el

[Stefan Monnier]

Index: emacs/lisp/imenu.el
diff -c emacs/lisp/imenu.el:1.93 emacs/lisp/imenu.el:1.94
*** emacs/lisp/imenu.el:1.93    Tue May  6 11:16:27 2003
--- emacs/lisp/imenu.el Fri May 16 17:09:59 2003
***************
*** 1,6 ****
  ;;; imenu.el --- framework for mode-specific buffer indexes
  
! ;; Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
  
  ;; Author: Ake Stenhoff <address@hidden>
  ;;         Lars Lindberg <address@hidden>
--- 1,6 ----
  ;;; imenu.el --- framework for mode-specific buffer indexes
  
! ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 2003 Free Software Foundation, 
Inc.
  
  ;; Author: Ake Stenhoff <address@hidden>
  ;;         Lars Lindberg <address@hidden>
***************
*** 527,548 ****
              menulist (delq imenu--rescan-item menulist)))
      (setq tail menulist)
      (dolist (item tail)
!       (if (imenu--subalist-p item)
!         (setq keep-at-top (cons item keep-at-top)
!               menulist (delq item menulist))))
      (if imenu-sort-function
!       (setq menulist
!             (sort
!              (copy-sequence menulist)
!              imenu-sort-function)))
      (if (> (length menulist) imenu-max-items)
!       (let ((count 0))
!         (setq menulist
!               (mapcar
!                (function
!                 (lambda (menu)
!                   (cons (format "From: %s" (caar menu)) menu)))
!                (imenu--split menulist imenu-max-items)))))
      (cons title
          (nconc (nreverse keep-at-top) menulist))))
  
--- 527,543 ----
              menulist (delq imenu--rescan-item menulist)))
      (setq tail menulist)
      (dolist (item tail)
!       (when (imenu--subalist-p item)
!       (push item keep-at-top)
!       (setq menulist (delq item menulist))))
      (if 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))))
  
***************
*** 634,652 ****
        alist)
         t))
  
! (defun imenu--create-keymap-1 (title alist)
!   (let ((counter 0))
!     (list* 'keymap title
!          (mapcar
!           (lambda (item)
!             (list* (car item) (car item)
!                    (cond
!                     ((imenu--subalist-p item)
!                      (imenu--create-keymap-1 (car item) (cdr item)))
!                     (t
!                      `(lambda () (interactive)
!                         (imenu--menubar-select ',item))))))
!           alist))))
  
  (defun imenu--in-alist (str alist)
    "Check whether the string STR is contained in multi-level ALIST."
--- 629,646 ----
        alist)
         t))
  
! (defun imenu--create-keymap (title alist &optional cmd)
!   (list* 'keymap title
!        (mapcar
!         (lambda (item)
!           (list* (car item) (car item)
!                  (cond
!                   ((imenu--subalist-p item)
!                    (imenu--create-keymap (car item) (cdr item) cmd))
!                   (t
!                    `(lambda () (interactive)
!                       ,(if cmd `(,cmd ',item) (list 'quote item)))))))
!         alist)))
  
  (defun imenu--in-alist (str alist)
    "Check whether the string STR is contained in multi-level ALIST."
***************
*** 717,741 ****
         (error "This buffer cannot use 
`imenu-default-create-index-function'"))))
  
  ;; Not used and would require cl at run time
! ;;; (defun imenu--flatten-index-alist (index-alist &optional concat-names 
prefix)
! ;;;   ;; Takes a nested INDEX-ALIST and returns a flat index alist.
! ;;;   ;; If optional CONCAT-NAMES is non-nil, then a nested index has its
! ;;;   ;; name and a space concatenated to the names of the children.
! ;;;   ;; Third argument PREFIX is for internal use only.
! ;;;   (mapcan
! ;;;    (lambda (item)
! ;;;      (let* ((name (car item))
! ;;;       (pos (cdr item))
! ;;;       (new-prefix (and concat-names
! ;;;                        (if prefix
! ;;;                            (concat prefix imenu-level-separator name)
! ;;;                          name))))
! ;;;        (cond
! ;;;   ((or (markerp pos) (numberp pos))
! ;;;    (list (cons new-prefix pos)))
! ;;;   (t
! ;;;    (imenu--flatten-index-alist pos new-prefix)))))
! ;;;    index-alist))
  
  ;;;
  ;;; Generic index gathering function.
--- 711,735 ----
         (error "This buffer cannot use 
`imenu-default-create-index-function'"))))
  
  ;; Not used and would require cl at run time
! ;; (defun imenu--flatten-index-alist (index-alist &optional concat-names 
prefix)
! ;;   ;; Takes a nested INDEX-ALIST and returns a flat index alist.
! ;;   ;; If optional CONCAT-NAMES is non-nil, then a nested index has its
! ;;   ;; name and a space concatenated to the names of the children.
! ;;   ;; Third argument PREFIX is for internal use only.
! ;;   (mapcan
! ;;    (lambda (item)
! ;;      (let* ((name (car item))
! ;;        (pos (cdr item))
! ;;        (new-prefix (and concat-names
! ;;                         (if prefix
! ;;                             (concat prefix imenu-level-separator name)
! ;;                           name))))
! ;;        (cond
! ;;    ((or (markerp pos) (numberp pos))
! ;;     (list (cons new-prefix pos)))
! ;;    (t
! ;;     (imenu--flatten-index-alist pos new-prefix)))))
! ;;    index-alist))
  
  ;;;
  ;;; Generic index gathering function.
***************
*** 905,914 ****
  Returns t for rescan and otherwise an element or subelement of INDEX-ALIST."
    (setq index-alist (imenu--split-submenus index-alist))
    (let* ((menu (imenu--split-menu index-alist (or title (buffer-name))))
!        (map (imenu--create-keymap-1 (car menu)
!                                     (if (< 1 (length (cdr menu)))
!                                         (cdr menu)
!                                       (cdr (car (cdr menu)))))))
      (popup-menu map event)))
  
  (defun imenu-choose-buffer-index (&optional prompt alist)
--- 899,908 ----
  Returns t for rescan and otherwise an element or subelement of INDEX-ALIST."
    (setq index-alist (imenu--split-submenus index-alist))
    (let* ((menu (imenu--split-menu index-alist (or title (buffer-name))))
!        (map (imenu--create-keymap (car menu)
!                                   (cdr (if (< 1 (length (cdr menu)))
!                                            menu
!                                          (car (cdr menu)))))))
      (popup-menu map event)))
  
  (defun imenu-choose-buffer-index (&optional prompt alist)
***************
*** 1001,1010 ****
          (setq index-alist (imenu--split-submenus index-alist))
          (setq menu (imenu--split-menu index-alist
                                        (buffer-name)))
!         (setq menu1 (imenu--create-keymap-1 (car menu)
!                                             (if (< 1 (length (cdr menu)))
!                                                 (cdr menu)
!                                               (cdr (car (cdr menu))))))
          (setq old (lookup-key (current-local-map) [menu-bar index]))
          (setcdr old (cdr menu1)))))))
  
--- 995,1005 ----
          (setq index-alist (imenu--split-submenus index-alist))
          (setq menu (imenu--split-menu index-alist
                                        (buffer-name)))
!         (setq menu1 (imenu--create-keymap (car menu)
!                                           (cdr (if (< 1 (length (cdr menu)))
!                                                    menu
!                                                  (car (cdr menu))))
!                                           'imenu--menubar-select))
          (setq old (lookup-key (current-local-map) [menu-bar index]))
          (setcdr old (cdr menu1)))))))