# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1226788640 0
# Node ID f0b31a4484fa6f083b710ddf560ad5477eeb3b27
# Parent  22a0d4deace0c7dcc2605d42f7d9767f38de350d
*** empty log message ***

diff -r 22a0d4deace0 -r f0b31a4484fa lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Nov 15 22:33:16 2008 +0000
+++ b/lisp/ChangeLog	Sat Nov 15 22:37:20 2008 +0000
@@ -1,3 +1,14 @@
+2008-11-15  Glenn Morris  <rgm@gnu.org>
+
+	* uniquify.el (uniquify-maybe-rerationalize-w/o-cb):
+	Remove uniquify-after-kill-buffer-p dependency.
+	(uniquify-kill-buffer-function): New function.
+	(kill-buffer-hook): Use uniquify-kill-buffer-function.  (Bug#1315)
+
+	* term/ns-win.el (ns-do-applescript, ns-popup-font-panel): Declare.
+	(ns-show-manual, menu-bar-help-menu): Update for merge of ns-emacs into
+	main Emacs manual.
+
 2008-11-15  Martin Rudalics  <rudalics@gmx.at>
 
 	* window.el (quit-window): Restore delete window with second