Merge branch 'Gtk' into Gtk-Screen.
authorMatt Birkholz <puck@birchwood-abbey.net>
Sun, 17 Jan 2016 20:41:00 +0000 (13:41 -0700)
committerMatt Birkholz <puck@birchwood-abbey.net>
Sun, 17 Jan 2016 20:41:00 +0000 (13:41 -0700)
16 files changed:
1  2 
doc/user-manual/user.texinfo
src/edwin/buffrm.scm
src/edwin/bufwfs.scm
src/edwin/bufwin.scm
src/edwin/bufwiu.scm
src/edwin/editor.scm
src/edwin/edtfrm.scm
src/edwin/edwin.pkg
src/edwin/edwin.sf
src/edwin/image.scm
src/edwin/make.scm
src/edwin/modwin.scm
src/edwin/screen.scm
src/edwin/tterm.scm
src/edwin/utlwin.scm
src/gtk/gtk-widget.scm

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 72541a5e0c70c3d4cd52d0e561dd06b8b02f6575,8d13ee660949400d7f9f30be2c3ef3ec6f1992c6..26fa813dee402844aca85be305cd4a2a6f9876ff
@@@ -611,13 -611,13 +611,18 @@@ TRANSCRIPT    messages appear in transc
    (if (not inferior-thread-changes?)
        (begin
        (set! inferior-thread-changes? #t)
 -      (signal-thread-event editor-thread #f))))
 +      (hook/signal-inferior-thread-output!))))
 +
 +(define (signal-inferior-thread-output!)
 +  (signal-thread-event editor-thread #f))
 +
 +(define hook/signal-inferior-thread-output! signal-inferior-thread-output!)
  
+ (define (inferior-thread-run-light! flags)
+   (set-car! flags #t)
+   (if (not inferior-thread-changes?)
+       (set! inferior-thread-changes? #t)))
  (define (accept-thread-output)
    (with-interrupt-mask interrupt-mask/gc-ok
      (lambda (interrupt-mask)
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge