Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-25

Merge from emacs--cvs-trunk--0

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-459
 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-463
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-464
   Update from CVS: lisp/progmodes/make-mode.el: Fix comments.

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-465
   Update from CVS

2 files changed, 5 insertions, 1 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 9f3fcc13371..4764871fa54 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2004-07-17  Richard M. Stallman  <rms@gnu.org>
+
+        * emacsclient.c (quote_file_name): Pass COPY thru %s to output it.
+
 2004-06-01  Juanma Barranquero  <lektu@terra.es>
 
         * makefile.w32-in (obj): Add image.c.
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 0698691bf13..24dcdffff2c 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -203,7 +203,7 @@ quote_file_name (name, stream)
     }
   *q++ = 0;
 
-  fprintf (stream, copy);
+  fprintf (stream, "%s", copy);
 
   free (copy);
 }