[Qemacs-commit] qemacs qe.c x11.c

[Charlie Gordon]

CVSROOT:        /sources/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        14/02/06 00:26:26

Modified files:
        .              : qe.c x11.c 

Log message:
        fix x11 crash on yank

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/qe.c?cvsroot=qemacs&r1=1.145&r2=1.146
http://cvs.savannah.gnu.org/viewcvs/qemacs/x11.c?cvsroot=qemacs&r1=1.31&r2=1.32

Patches:
Index: qe.c
===================================================================
RCS file: /sources/qemacs/qemacs/qe.c,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -b -r1.145 -r1.146
--- qe.c        6 Feb 2014 00:22:18 -0000       1.145
+++ qe.c        6 Feb 2014 00:26:25 -0000       1.146
@@ -1484,8 +1484,12 @@
         eb_free(&qs->yank_buffers[qs->yank_current]);
     }
     snprintf(bufname, sizeof(bufname), "*kill-%d*", qs->yank_current + 1);
+    if (base) {
     b = eb_new(bufname, base->flags & BF_STYLES);
     eb_set_charset(b, base->charset, base->eol_type);
+    } else {
+        b = eb_new(bufname, 0);
+    }
     qs->yank_buffers[qs->yank_current] = b;
     return b;
 }

Index: x11.c
===================================================================
RCS file: /sources/qemacs/qemacs/x11.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- x11.c       23 Jan 2014 12:56:23 -0000      1.31
+++ x11.c       6 Feb 2014 00:26:25 -0000       1.32
@@ -1101,6 +1101,7 @@
 
     /* copy GUI selection a new yank buffer */
     b = new_yank_buffer(qs, NULL);
+    eb_set_charset(b, &charset_utf8, EOL_UNIX);
 
     nread = 0;
     for (;;) {