fixes due to merge

diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index 231bc22fa89609ebe766f0d49b42be13273f3003..92124b7c9458ec393189d7c264b2d79a4b456d34 100644 (file)
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -174,7 +174,7 @@ main (int argc, char **argv)
   int desc;
 #endif /* not MAIL_USE_SYSTEM_LOCK */
 
-  char *spool_name = 0;
+  //  char *spool_name = 0;
 
 #ifdef MAIL_USE_POP
   bool pop_reverse_order = false;

diff --git a/src/print.c b/src/print.c
index dc59cee097d66c0092571b331030897f9bb3c10e..f45a5a6d1f476b5b454a678d88fa662d38777484 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -1729,12 +1729,12 @@ print_object (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag)
       else if (XWIDGETP (obj))
        {
          strout ("#<xwidget ", -1, -1, printcharfun);
-         PRINTCHAR ('>');
+         printchar ('>', printcharfun);
        }
       else if (XWIDGET_VIEW_P (obj))
        {
          strout ("#<xwidget-view ", -1, -1, printcharfun);
-         PRINTCHAR ('>');
+         printchar ('>', printcharfun);
        }
 #endif
       else if (WINDOWP (obj))