diff options
| author | Glenn Morris <rgm@gnu.org> | 2008-09-30 03:42:56 +0000 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2008-09-30 03:42:56 +0000 |
| commit | 9b3568e17d740cb62e7c26ad08075f18a0bf50cc (patch) | |
| tree | 338841cd8e8dbc2e7af20e115cfc806ad4eb3557 /lisp | |
| parent | fd1c81ef8493855a34a3259f52670cfd322b3d6c (diff) | |
| download | emacs-9b3568e17d740cb62e7c26ad08075f18a0bf50cc.tar.gz | |
(which-func-imenu-joiner-function): Doc fix.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/progmodes/which-func.el | 12 |
2 files changed, 13 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f2e06d85506..ce275997a5c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,12 @@ +2008-09-30 Glenn Morris <rgm@gnu.org> + + * progmodes/which-func.el (which-func-imenu-joiner-function): Doc fix. + 2008-09-30 Daniel Colascione <danc@merrillpress.com> + * progmodes/which-func.el (which-func-imenu-joiner-function): New. + (which-function): Handle nested imenu trees. + * imenu.el (imenu--split-menu): Fix bug with shared lists that deleted some nested menu items. diff --git a/lisp/progmodes/which-func.el b/lisp/progmodes/which-func.el index fa5fbee63de..7f7717d8ce0 100644 --- a/lisp/progmodes/which-func.el +++ b/lisp/progmodes/which-func.el @@ -1,7 +1,7 @@ ;;; which-func.el --- print current function in mode line -;; Copyright (C) 1994, 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -;; Free Software Foundation, Inc. +;; Copyright (C) 1994, 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006 +;; 2007, 2008 Free Software Foundation, Inc. ;; Author: Alex Rezinsky <alexr@msil.sps.mot.com> ;; (doesn't seem to be responsive any more) @@ -153,10 +153,10 @@ Zero means compute the Imenu menu regardless of size." ;;;###autoload (put 'which-func-format 'risky-local-variable t) (defvar which-func-imenu-joiner-function #'last - "Function to call when using imenu to join together multiple -levels of nomenclature. Called with a single argument, a list of -strings giving the names of the menus we had to traverse to get -to the item. Return a single string, the new name of the item.") + "Function to join together multiple levels of imenu nomenclature. +Called with a single argument, a list of strings giving the names +of the menus we had to traverse to get to the item. Returns a +single string, the new name of the item.") (defvar which-func-cleanup-function nil "Function to transform a string before displaying it in the mode line. |