;;; imenu.el --- Framework for mode-specific buffer indexes.
-;; Copyright (C) 1994, 1995 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
;; Author: Ake Stenhoff <etxaksf@aom.ericsson.se>
;; Lars Lindberg <lli@sypro.cap.se>
;; Created: 8 Feb 1994
;; Keywords: tools
-;;
-;; This program is free software; you can redistribute it and/or modify
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation; either version 2, or (at your option)
;; any later version.
-;;
-;; This program is distributed in the hope that it will be useful,
+
+;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
-;;
+
;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, write to the Free Software
-;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs; see the file COPYING. If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
;;; Commentary:
-;;
+
;; Purpose of this package:
;; To present a framework for mode-specific buffer indexes.
;; A buffer index is an alist of names and buffer positions.
;; [karl] - Karl Fogel kfogel@floss.life.uiuc.edu
;;; Code
+
(eval-when-compile (require 'cl))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
\(NAME . POSITION). Look at `imenu--sort-by-name' for an example.")
(defvar imenu-max-items 25
- "*Maximum number of elements in an index mouse-menu.")
+ "*Maximum number of elements in an mouse menu for Imenu.")
(defvar imenu-scanning-message "Scanning buffer for index (%3d%%)"
"*Progress message during the index scanning of the buffer.
Used for making mouse-menu titles and for flattening nested indexes
with name concatenation.")
-(defvar imenu-submenu-name-format "%s..."
- "*The format for making a submenu name.")
-
;;;###autoload
(defvar imenu-generic-expression nil
"The regex pattern to use for creating a buffer index.
The variable is buffer-local.")
+;;;###autoload
(make-variable-buffer-local 'imenu-generic-expression)
;;;; Hooks
index-unknown-alist)))))))
(imenu-progress-message prev-pos 100)
(and index-var-alist
- (push (cons (imenu-create-submenu-name "Variables") index-var-alist)
+ (push (cons "Variables" index-var-alist)
index-alist))
(and index-type-alist
- (push (cons (imenu-create-submenu-name "Types") index-type-alist)
+ (push (cons "Types" index-type-alist)
index-alist))
(and index-unknown-alist
- (push (cons (imenu-create-submenu-name "Syntax-unknown") index-unknown-alist)
+ (push (cons "Syntax-unknown" index-unknown-alist)
index-alist))
index-alist))
(/ (1- pos) (max (/ total 100) 1))
(/ (* 100 (1- pos)) (max total 1)))))
-;;;
-;;; Function for suporting general looking submenu names.
-;;; Uses `imenu-submenu-name-format' for creating the name.
-;;; NAME is the base of the new submenu name.
-;;;
-(defun imenu-create-submenu-name (name)
- (format imenu-submenu-name-format name))
-
;; 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))
(defun imenu--split (list n)
(push (nreverse sublist) result))
(nreverse result)))
-;;;
-;;; Split a menu in to several menus.
-;;;
+;;; Split the alist MENULIST into a nested alist, if it is long enough.
+;;; In any case, add TITLE to the front of the alist.
(defun imenu--split-menu (menulist title)
- (cons "Index menu"
- (mapcar
- (function
- (lambda (menu)
- (cons (format "(%s)" title) menu)))
- (imenu--split menulist imenu-max-items))))
+ (if (> (length menulist) imenu-max-items)
+ (let ((count 0))
+ (cons title
+ (mapcar
+ (function
+ (lambda (menu)
+ (cons (format "(%s-%d)" title (setq count (1+ count)))
+ menu)))
+ (imenu--split menulist imenu-max-items))))
+ (cons title menulist)))
+
+;;; Split up each long alist that are nested within ALIST
+;;; into nested alists.
+(defun imenu--split-submenus (alist)
+ (mapcar (function (lambda (elt)
+ (if (and (consp elt)
+ (stringp (car elt))
+ (listp (cdr elt)))
+ (imenu--split-menu (cdr elt) (car elt))
+ elt)))
+ alist))
;;;
;;; Find all items in this buffer that should be in the index.
(lambda (item)
(cond
((listp (cdr item))
- (append (list (incf counter) (car item) 'keymap (car item))
+ (append (list (setq counter (1+ counter))
+ (car item) 'keymap (car item))
(imenu--create-keymap-2 (cdr item) (+ counter 10) commands)))
(t
- (let ((end (if commands (list 'lambda 'nil '(interactive)
- (list 'imenu--menubar-select item))
+ (let ((end (if commands `(lambda () (interactive)
+ (imenu--menubar-select ',item))
(cons '(nil) t))))
(cons (car item)
(cons (car item) end))))
(end (match-end index)))
(setq found t)
(push
- (cons (buffer-substring beg end) beg)
+ (cons (buffer-substring-no-properties beg end) beg)
(cdr
- (or (if (not (stringp menu-title)) index-alist)
- (assoc
- (imenu-create-submenu-name menu-title)
- index-alist)
+ (or (assoc menu-title index-alist)
(car (push
- (cons
- (imenu-create-submenu-name menu-title)
- '())
+ (cons menu-title '())
index-alist))))))))))
- patterns))))
- (imenu-progress-message prev-pos 100 t)
- (delete 'dummy index-alist)))
+ patterns))))
+ (imenu-progress-message prev-pos 100 t)
+ (let ((main-element (assq nil index-alist)))
+ (nconc (delq main-element (delq 'dummy index-alist)) main-element))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;
INDEX-ALIST is the buffer index and EVENT is a mouse event.
Returns t for rescan and otherwise a position number."
+ (setq index-alist (imenu--split-submenus index-alist))
(let* ((menu (imenu--split-menu
(if imenu-sort-function
(sort
(if (< 1 (length (cdr menu)))
(cdr menu)
(cdr (cadr menu))))))
+
+ (or imenu-use-keymap-menu
+ (setq menu (list "Imenu" (delq nil menu))))
(setq position (x-popup-menu event menu))
(if imenu-use-keymap-menu
(progn
;;;###autoload
(defun imenu-add-to-menubar (name)
- "Adds an \"imenu\" entry to the menu bar for the current major mode.
+ "Adds an `imenu' entry to the menu bar for the current buffer.
NAME is a string used to name the menu bar item.
-See `imenu' for more information."
+See the command `imenu' for more information."
(interactive "sImenu menu item name: ")
- (define-key (current-local-map) [menu-bar index]
- (cons name (nconc (make-sparse-keymap "Imenu") (make-sparse-keymap))))
+ (let ((newmap (make-sparse-keymap))
+ (menu-bar (lookup-key (current-local-map) [menu-bar])))
+ (define-key newmap [menu-bar]
+ (append (make-sparse-keymap) menu-bar))
+ (define-key newmap [menu-bar index]
+ (cons name (nconc (make-sparse-keymap "Imenu")
+ (make-sparse-keymap))))
+ (use-local-map (append newmap (current-local-map))))
(add-hook 'menu-bar-update-hook 'imenu-update-menubar))
+(defvar imenu-buffer-menubar nil)
+
(defun imenu-update-menubar ()
(and (current-local-map)
(keymapp (lookup-key (current-local-map) [menu-bar index]))
(or (equal index-alist imenu--last-menubar-index-alist)
(let (menu menu1 old)
(setq imenu--last-menubar-index-alist index-alist)
+ (setq index-alist (imenu--split-submenus index-alist))
(setq menu (imenu--split-menu
(if imenu-sort-function
(sort
(defun imenu--menubar-select (item)
"Use Imenu to select the function or variable named in this menu item."
- (interactive)
- (imenu item))
+ (if (equal item '("*Rescan*" . -99))
+ (progn
+ (imenu--cleanup)
+ (setq imenu--index-alist nil)
+ (imenu-update-menubar))
+ (imenu item)))
;;;###autoload
(defun imenu (index-item)