# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1222746176 0
# Node ID f9404a9a3053f2e298952ffe11edc605b717701e
# Parent  352e7f3ed6608eb9dcad68ef1dbcabbb4f24111b
*** empty log message ***

diff -r 352e7f3ed660 -r f9404a9a3053 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Sep 30 03:42:47 2008 +0000
+++ b/lisp/ChangeLog	Tue Sep 30 03:42:56 2008 +0000
@@ -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.