changeset 95263:e0eb4e6f3741

*** empty log message ***
author Kenichi Handa <handa@m17n.org>
date Fri, 23 May 2008 12:53:22 +0000
parents 1e646032185f
children 9a5c3aa85e90
files lisp/ChangeLog
diffstat 1 files changed, 16 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Fri May 23 12:51:12 2008 +0000
+++ b/lisp/ChangeLog	Fri May 23 12:53:22 2008 +0000
@@ -1,3 +1,13 @@
+2008-05-23  Kenichi Handa  <handa@m17n.org>
+
+	* international/mule-conf.el: Don't define the charset `emacs'
+	here, just put :docstring, :short-name, and :long-name.
+
+2008-05-22  Kenichi Handa  <handa@m17n.org>
+
+	* international/mule-diag.el (font-show-log): Limit each listing
+	to 20 items.
+
 2008-05-23  Nick Roberts  <nickrob@snap.net.nz>
 
 	* progmodes/gdb-ui.el (gdb-enable-debug): New function.
@@ -12,16 +22,18 @@
 	Exclude more '*loaddefs' files.
 	(compile-always): Simplify '.elc' deletion.
 
+>>>>>>> 1.13801
 2008-05-23  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* vc-bzr.el (vc-bzr-annotate-time): Reduce memory allocation.
 	(vc-bzr-revision-completion-table): Handle `boundaries' argument.
 
-	* minibuffer.el (completion-boundaries): Change calling convention, so
-	`string' has the same semantics as in try-completion and all-completions.
+	* minibuffer.el (completion-boundaries): Change calling
+	convention, so `string' has the same semantics as in
+	try-completion and all-completions.
 	(completion-table-with-context, completion--embedded-envvar-table)
-	(completion--file-name-table, completion-pcm--find-all-completions):
-	Adjust code accordingly.
+	(completion--file-name-table)
+	(completion-pcm--find-all-completions): Adjust code accordingly.
 
 2008-05-22  Chong Yidong  <cyd@stupidchicken.com>