[Emacs-diffs] xwidget_mvp e6e0e2d: fixes due to merge

[Joakim Verona]

branch: xwidget_mvp
commit e6e0e2d2de55a228da8ecadbd089985c72111e52
Author: Joakim Verona <address@hidden>
Commit: Joakim Verona <address@hidden>

    fixes due to merge
---
 lib-src/movemail.c |    2 +-
 src/print.c        |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index 231bc22..92124b7 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 dc59cee..f45a5a6 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))