4 files changed, 29 insertions, 12 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 7da9270555a..3432652dbe5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
-2011-09-30  Paul Eggert  <eggert@cs.ucla.edu>
+2011-10-02  Paul Eggert  <eggert@cs.ucla.edu>
 
         * alloc.c (pure_bytes_used_lisp, pure_bytes_used_non_lisp):
         (allocate_vectorlike, buffer_memory_full, struct sdata, SDATA_SIZE)
@@ -780,6 +780,21 @@
         rather than rolling our own approximation.
         (SCROLL_BAR_VEC_SIZE): Remove; not used.
 
+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).
+
+2011-10-01  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * keymap.c (Fsingle_key_description): Use make_specified_string
+        instead of build_string to build string from push_key_description.
+        (Bug#5193)
+
 2011-09-30  Paul Eggert  <eggert@cs.ucla.edu>
 
         * buffer.h (struct buffer): Use time_t, not int, for a time stamp.
@@ -857,8 +872,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>
 
@@ -895,9 +910,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.
@@ -913,7 +928,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
diff --git a/src/dired.c b/src/dired.c
index d1b4d410428..db07bc61e7d 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -401,6 +401,7 @@ determined by the variable `completion-ignored-extensions', which see.  */)
   (Lisp_Object file, Lisp_Object directory, Lisp_Object predicate)
 {
   Lisp_Object handler;
+  directory = Fexpand_file_name (directory, Qnil);
 
   /* If the directory name has special constructs in it,
      call the corresponding file handler.  */
@@ -424,6 +425,7 @@ These are all file names in directory DIRECTORY which begin with FILE.  */)
   (Lisp_Object file, Lisp_Object directory)
 {
   Lisp_Object handler;
+  directory = Fexpand_file_name (directory, Qnil);
 
   /* If the directory name has special constructs in it,
      call the corresponding file handler.  */
@@ -474,7 +476,6 @@ file_name_completion (Lisp_Object file, Lisp_Object dirname, int all_flag, int v
   bestmatch = Qnil;
   encoded_file = encoded_dir = Qnil;
   GCPRO5 (file, dirname, bestmatch, encoded_file, encoded_dir);
-  dirname = Fexpand_file_name (dirname, Qnil);
   specbind (Qdefault_directory, dirname);
 
   /* Do completion on the encoded file name
diff --git a/src/keymap.c b/src/keymap.c
index 6287f6a4a44..54134c67043 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -2292,10 +2292,11 @@ around function keys and event symbols.  */)
 
   if (INTEGERP (key))           /* Normal character */
     {
-      char tem[KEY_DESCRIPTION_SIZE];
+      char tem[KEY_DESCRIPTION_SIZE], *p;
 
-      *push_key_description (XINT (key), tem, 1) = 0;
-      return build_string (tem);
+      p = push_key_description (XINT (key), tem, 1);
+      *p = 0;
+      return make_specified_string (tem, -1, p - tem, 1);
     }
   else if (SYMBOLP (key))       /* Function key or event-symbol */
     {
diff --git a/src/minibuf.c b/src/minibuf.c
index 76443fcf214..9b905f748bb 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1859,8 +1859,8 @@ The arguments STRING and PREDICATE are as in `try-completion',
           /* First, look for a non-internal buffer in `res'.  */
           while (CONSP (bufs) && SREF (XCAR (bufs), 0) == ' ')
             bufs = XCDR (bufs);
-          if (NILP (bufs))
-            /* All bufs in `res' are internal, so don't trip them out.  */
+          if (NILP (bufs) && EQ (Flength (res), Flength (Vbuffer_alist)))
+            /* All bufs are internal, so don't trip them out.  */
             return res;
           res = bufs;
           while (CONSP (XCDR (bufs)))