Merge from mainline.

3 files changed, 16 insertions, 10 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 40fb601e061..f9ca67e703d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -23,6 +23,16 @@
 
         * fns.c (Frandom): Let EMACS_UINT be wider than unsigned long.
 
+2011-04-28  Eli Zaretskii  <eliz@gnu.org>
+
+        * doprnt.c (doprnt): Don't return value smaller than the buffer
+        size if the message was truncated.  (Bug#8545).
+
+2011-04-28  Juanma Barranquero  <lekktu@gmail.com>
+
+        * w32fns.c (Fx_change_window_property, Fx_delete_window_property)
+        (Fx_window_property): #if-0 the whole functions, not just the bodies.
+
 2011-04-27  Paul Eggert  <eggert@cs.ucla.edu>
 
         * doprnt.c (doprnt): Support "ll" length modifier, for long long.
diff --git a/src/doprnt.c b/src/doprnt.c
index a6becc7454f..63dba9f5850 100644
--- a/src/doprnt.c
+++ b/src/doprnt.c
@@ -403,7 +403,9 @@ doprnt (char *buffer, register size_t bufsize, const char *format,
         while (fmt < format_end && --bufsize > 0 && !CHAR_HEAD_P (*fmt));
         if (!CHAR_HEAD_P (*fmt))
           {
-            bufptr = save_bufptr;
+            /* Truncate, but return value that will signal to caller
+               that the buffer was too small.  */
+            *save_bufptr = 0;
             break;
           }
       }
diff --git a/src/w32fns.c b/src/w32fns.c
index 821cc671646..bdf9dce9411 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -4865,6 +4865,8 @@ If TERMINAL is omitted or nil, that stands for the selected frame's display.  */
                            Window properties
  ***********************************************************************/
 
+#if 0 /* TODO : port window properties to W32 */
+
 DEFUN ("x-change-window-property", Fx_change_window_property,
        Sx_change_window_property, 2, 6, 0,
        doc: /* Change window property PROP to VALUE on the X window of FRAME.
@@ -4884,7 +4886,6 @@ If OUTER_P is non-nil, the property is changed for the outer X window of
 FRAME.  Default is to change on the edit X window.  */)
   (Lisp_Object prop, Lisp_Object value, Lisp_Object frame, Lisp_Object type, Lisp_Object format, Lisp_Object outer_p)
 {
-#if 0 /* TODO : port window properties to W32 */
   struct frame *f = check_x_frame (frame);
   Atom prop_atom;
 
@@ -4901,8 +4902,6 @@ FRAME.  Default is to change on the edit X window.  */)
   XFlush (FRAME_W32_DISPLAY (f));
   UNBLOCK_INPUT;
 
-#endif /* TODO */
-
   return value;
 }
 
@@ -4913,8 +4912,6 @@ DEFUN ("x-delete-window-property", Fx_delete_window_property,
 FRAME nil or omitted means use the selected frame.  Value is PROP.  */)
   (Lisp_Object prop, Lisp_Object frame)
 {
-#if 0 /* TODO : port window properties to W32 */
-
   struct frame *f = check_x_frame (frame);
   Atom prop_atom;
 
@@ -4926,7 +4923,6 @@ FRAME nil or omitted means use the selected frame.  Value is PROP.  */)
   /* Make sure the property is removed when we return.  */
   XFlush (FRAME_W32_DISPLAY (f));
   UNBLOCK_INPUT;
-#endif  /* TODO */
 
   return prop;
 }
@@ -4951,8 +4947,6 @@ Value is nil if FRAME hasn't a property with name PROP or if PROP has
 no value of TYPE (always string in the MS Windows case).  */)
   (Lisp_Object prop, Lisp_Object frame)
 {
-#if 0 /* TODO : port window properties to W32 */
-
   struct frame *f = check_x_frame (frame);
   Atom prop_atom;
   int rc;
@@ -4992,10 +4986,10 @@ no value of TYPE (always string in the MS Windows case).  */)
 
   return prop_value;
 
-#endif /* TODO */
   return Qnil;
 }
 
+#endif /* TODO */
 
 
 /***********************************************************************