From: Joakim Verona <joakim@verona.se>
Date: Mon, 20 Apr 2015 21:44:11 +0000 (+0200)
Subject: fixes due to merge
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e6e0e2d2de55a228da8ecadbd089985c72111e52;p=emacs.git

fixes due to merge
---

diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index 231bc22fa89..92124b7c945 100644
--- 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 dc59cee097d..f45a5a6d1f4 100644
--- 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))