Merge branch 'Gtk' into Gtk-Screen

diff --cc src/Setup.sh
Simple merge

diff --cc src/configure.ac
Simple merge

diff --cc src/edwin/buffrm.scm
Simple merge

diff --cc src/edwin/bufwfs.scm
Simple merge

diff --cc src/edwin/bufwin.scm
Simple merge

diff --cc src/edwin/bufwiu.scm
Simple merge

diff --cc src/edwin/editor.scm
Simple merge

diff --cc src/edwin/edtfrm.scm
Simple merge

diff --cc src/edwin/edwin.pkg
Simple merge

diff --cc src/edwin/edwin.sf
Simple merge

diff --cc src/edwin/image.scm
Simple merge

diff --cc src/edwin/input.scm
Simple merge

diff --cc src/edwin/make.scm
Simple merge

diff --cc src/edwin/modwin.scm
Simple merge

diff --cc src/edwin/os2term.scm
Simple merge

diff --cc src/edwin/process.scm
Simple merge

diff --cc src/edwin/screen.scm
Simple merge

diff --cc src/edwin/simple.scm
Simple merge

diff --cc src/edwin/tterm.scm
Simple merge

diff --cc src/edwin/utlwin.scm
Simple merge

diff --cc src/edwin/win32.scm
Simple merge

diff --cc src/edwin/xterm.scm
Simple merge

diff --cc src/etc/create-makefiles.sh
Simple merge

diff --cc src/etc/optiondb.scm
Simple merge