diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7ce07b3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,45 @@ +*.log +config.sub +config.cache +config.guess +configure +ltconfig +ltmain.sh +Makefile +Makefile.in +aclocal.m4 +libtool.m4 +lt*.m4 +config.status +config.h +libtool +stamp-h* +libast.spec +config.h.in +missing +mkinstalldirs +install-sh +Eterm*.tar.gz +*.sddf +Makefile +Makefile.in +.deps +.libs +lib*.la +*.da +*.lo +*.o +autom4te* +depcomp +*.orig +*.rej +*~ +doc/Eterm.1 +doc/Eterm.1.html +doc/Eterm.tcap +src/Eterm +themes/*/theme.cfg +utils/Esetroot +utils/Etbg +utils/Ettable +utils/kEsetroot diff --git a/ChangeLog b/ChangeLog index b2a70b1..2095352 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5676,3 +5676,8 @@ Tue Mar 15 23:26:05 2011 Michael Jennings (mej) Release Eterm 0.9.6. ---------------------------------------------------------------------- +Wed Mar 26 08:59:13 2014 Michael Jennings (mej) + +Patch from Pavel Sanda to fix copy/paste behavior with +some Qt-based apps (e.g., LyX). +---------------------------------------------------------------------- diff --git a/Eterm.spec b/Eterm.spec index e7b920e..26f095b 100644 --- a/Eterm.spec +++ b/Eterm.spec @@ -9,9 +9,9 @@ Summary: Enlightened terminal emulator Name: Eterm -Version: 0.9.6 -Release: 1 -#Release: 0.%(date '+%Y%m%d') +Version: 0.9.7 +#Release: 1 +Release: 0.%(date '+%Y%m%d') License: BSD Group: User Interface/X URL: http://www.eterm.org/ diff --git a/configure.ac b/configure.ac index 88d45e8..f540ec9 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ SAVE_AUTOHEADER="$AUTOHEADER" SAVE_AUTOMAKE="$AUTOMAKE" AC_INIT(src/feature.h) -AM_INIT_AUTOMAKE(Eterm, 0.9.6) +AM_INIT_AUTOMAKE(Eterm, 0.9.7) dnl# Set some basic variables DATE="`date '+%d %B %Y'`" diff --git a/src/screen.c b/src/screen.c index 1005fac..ed41535 100644 --- a/src/screen.c +++ b/src/screen.c @@ -2566,6 +2566,7 @@ selection_copy_string(Atom sel, char *str, size_t len) if (XGetSelectionOwner(Xdisplay, sel) != TermWin.vt) { libast_print_error("Can't take ownership of selection\n"); } + XFlush(Xdisplay); } else { D_SELECT(("Copying selection to cut buffer %d\n", (int) sel)); XChangeProperty(Xdisplay, Xroot, sel, XA_STRING, 8, PropModeReplace, str, len);