1 files changed, 9 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index fc9a839a25b..bc9ffc8f3fe 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2011-10-02  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * dired.c (file_name_completion): Don't expand file name.
+        (Ffile_name_completion, Ffile_name_all_completions): Expand file name
+        before checking file name handler.
+
         * minibuf.c (Finternal_complete_buffer): Only show internal buffers if
         they've been requested explicitly (bug#9591).
 
@@ -86,8 +90,8 @@
         * xdisp.c (handle_invisible_prop): If invisible text ends on a
         newline, reseat the iterator instead of bidi-iterating there one
         character at a time.  (Bug#9610)
-        (BUFFER_POS_REACHED_P, move_it_in_display_line_to): Bail out when
-        past TO_CHARPOS if the bidi iterator is at base embedding level.
+        (BUFFER_POS_REACHED_P, move_it_in_display_line_to): Bail when past
+        TO_CHARPOS if the bidi iterator is at base embedding level.
 
 2011-09-27  Andreas Schwab  <schwab@linux-m68k.org>
 
@@ -124,9 +128,9 @@
         value is now t.  Doc fix.
 
         * indent.c (Fvertical_motion): Compute and apply the overshoot
-        logic also when moving up, not only when moving down.  Fix the
+        logic when moving up, not only when moving down.  Fix the
         confusing name and values of the it_overshoot_expected variable;
-        logic changed accordingly.  (Bug#9254) (Bug#9549)
+        logic changes accordingly.  (Bug#9254) (Bug#9549)
 
         * xdisp.c (pos_visible_p): Produce correct pixel coordinates when
         CHARPOS is covered by a display string which includes newlines.
@@ -142,7 +146,7 @@
 
 2011-09-24  Jim Meyering  <meyering@redhat.com>
 
-        Do not ignore write error for any output size.
+        do not ignore write error for any output size
         The previous change was incomplete.
         While it makes emacs --batch detect the vast majority of stdout
         write failures, errors were still ignored whenever the output size is