3 files changed, 20 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f532be2d596..56e49dd666a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lispref/ChangeLog b/lispref/ChangeLog
index c2d799cee95..9de9e90ea40 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -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 --git a/src/ChangeLog b/src/ChangeLog
index 75c9f9e3759..a5b3388efdc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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>