# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1129760460 0
# Node ID 7e558d12fec96a9a3d1622d57c5612fd01adb387
# Parent  c32a542fb0ada8a5ac7091188d0d3efb78f120bc
*** empty log message ***

diff -r c32a542fb0ad -r 7e558d12fec9 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Oct 19 21:54:41 2005 +0000
+++ b/lisp/ChangeLog	Wed Oct 19 22:21:00 2005 +0000
@@ -1,3 +1,12 @@
+2005-10-20  Kim F. Storm  <storm@cua.dk>
+
+	* ido.el (ido-is-tramp-root): Simplify regexp matching tramp root.
+	(ido-set-current-directory): Don't add / after final @.
+	(ido-file-name-all-completions-1): Adapt to fixed tramp completion.
+	Explicitly handle ange-ftp completion oddities.
+	(ido-make-file-list): Don't rotate list at tramp root to avoid
+	triggering tramp file handler for expand-file-name via get-file-buffer.
+
 2005-10-19  Jay Belanger  <belanger@truman.edu>
 
 	* calc/calc-units.el (math-standard-units): Add units, adjust
diff -r c32a542fb0ad -r 7e558d12fec9 lispref/ChangeLog
--- a/lispref/ChangeLog	Wed Oct 19 21:54:41 2005 +0000
+++ b/lispref/ChangeLog	Wed Oct 19 22:21:00 2005 +0000
@@ -1,3 +1,7 @@
+2005-10-19  Kim F. Storm  <storm@cua.dk>
+
+	* display.texi (Showing Images): Add max-image-size integer value.
+
 2005-10-18  Chong Yidong  <cyd@stupidchicken.com>
 
 	* display.texi (Showing Images): Document max-image-size.
diff -r c32a542fb0ad -r 7e558d12fec9 src/ChangeLog
--- a/src/ChangeLog	Wed Oct 19 21:54:41 2005 +0000
+++ b/src/ChangeLog	Wed Oct 19 22:21:00 2005 +0000
@@ -1,3 +1,9 @@
+2005-10-19  Kim F. Storm  <storm@cua.dk>
+
+	* image.c (check_image_size): Handle integer Vmax_image_size value
+	directly as max pixel value.  Use default frame size for null frame.
+	(syms_of_image) <max-image-size>: Describe integer value.
+
 2005-10-19  Romain Francoise  <romain@orebokech.com>
 
 	* emacs.c (main): Update copyright year.
@@ -28,7 +34,7 @@
 2005-10-16  Masatake YAMATO  <jet@gyve.org>
 
 	* minibuf.c (Fdisplay_completion_list): Add new optional
-	argument COMMON_SUBSTRING. Bind `completion-common-substring' 
+	argument COMMON_SUBSTRING. Bind `completion-common-substring'
 	to the optional argument during running `completion-setup-hook'.
 
 2005-10-16  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>