diff lisp/simple.el @ 1346:01c57eb70ae9

[xemacs-hg @ 2003-03-09 02:27:27 by ben] To: xemacs-patches@xemacs.org i.c: Sleep between calls to check for I/O, since these calls are non-blocking. behavior.el: Allow other keywords for forward compatibility. cl-macs.el: Rewrite to eliminate byte-compiler warning when `return' is used without `finally'. cmdloop.el: Avoid truncated error messages for `end-of-file' and the like. cmdloop.el: Avoid char-int error after syncing. files.el: Eliminate byte-compile warnings. printer.el: Fix line-width calculations. #### This used to work. Someone's changes (perhaps by Michael Sperber?) seem to have messed something up. simple.el: Use new clear-left-side functions to avoid messages ending up on the same line as other output. xemacs.mak: Add override for info/ as well when separate source/build dirs. xemacs.mak: Order sections in main build process and add comments. Add additional dependencies to try and prevent later steps from happening when failures in earlier steps have occurred. Makefile.in.in: Order sections in main build process and add comments. Add additional dependencies to try and prevent later steps from happening when failures in earlier steps have occurred. alloc.c: Don't arbitrarily clear Vconfigure_info_directory since it messes up separate build/source dirs. console.c, console.h, device-msw.c, device.c: Add accidentally omitted msprinter console and data descriptions. print.c, console-msw.c: Add clear-left-side functionality to help keep stdio/stderr output from separate sources on separate lines. Generalize the different kinds of debugging output. Add dpa(). profile.c: Add better docs on Unix/Windows differences. regex.c: Fix problems with rel-alloc compilation caused by previous patch. emacs.c: Seg fault rather than abort on Cygwin, since gdb doesn't trap aborts properly. console-gtk-impl.h, console-gtk.h, console-msw.h, console-x-impl.h, console-x.h, dialog-gtk.c, dialog-x.c, event-msw.c, frame-gtk.c, frame-x.c, frameslots.h, glyphs-gtk.c, glyphs-x.c, gui-gtk.c, gui-x.c, inline.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, scrollbar-gtk.c, scrollbar-x.c, ui-gtk.c: Delete popup-data object. Delete menubar_data field from frames, since its usage is frame-specific. Delete menubar-msw.h, gui-x.h, gui-gtk.h. Clean up handling of lwlib callback data GCPRO'ing and add missing GCPRO recomputation in widget code.
author ben
date Sun, 09 Mar 2003 02:27:46 +0000
parents 1b0339b048ce
children f561c3904bb3
line wrap: on
line diff
--- a/lisp/simple.el	Sat Mar 08 22:52:26 2003 +0000
+++ b/lisp/simple.el	Sun Mar 09 02:27:46 2003 +0000
@@ -3977,6 +3977,7 @@
 (when (and
        (not (fboundp 'display-message))
        (not (featurep 'debug)))
+  (set-device-clear-left-side nil nil)
   (send-string-to-terminal "\n"))
 
 (defvar message-stack nil
@@ -4144,8 +4145,12 @@
     (remove-message label frame)
     (let ((inhibit-read-only t))
       (erase-buffer " *Echo Area*"))
-    (if clear-stream
-	(send-string-to-terminal ?\n stdout-p))
+    ;; If outputting to the terminal, make sure we clear the left side.
+    (when (or clear-stream
+	      (and (eq 'stream (frame-type frame))
+		   (not (device-left-side-clear-p (frame-device frame)))))
+      (set-device-clear-left-side (frame-device frame) nil)
+      (send-string-to-terminal ?\n stdout-p))
     (if no-restore
 	nil			; just preparing to put another msg up
       (if message-stack
@@ -4189,12 +4194,19 @@
 
 (defun append-message (label message &optional frame stdout-p)
   (or frame (setq frame (selected-frame)))
+  ;; If outputting to the terminal, make sure output from anyone else clears
+  ;; the left side first, but don't do it ourselves, otherwise we won't be
+  ;; able to append to an existing message.
+  (if (eq 'stream (frame-type frame))
+      (set-device-clear-left-side (frame-device frame) nil))
   ;; Add a new entry to the message-stack, or modify an existing one
   (let ((top (car message-stack)))
     (if (eq label (car top))
 	(setcdr top (concat (cdr top) message))
       (push (cons label message) message-stack)))
-  (raw-append-message message frame stdout-p))
+  (raw-append-message message frame stdout-p)
+  (if (eq 'stream (frame-type frame))
+      (set-device-clear-left-side (frame-device frame) t)))
 
 ;; Really append the message to the echo area.  no fiddling with
 ;; message-stack.