comparison 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
comparison
equal deleted inserted replaced
1345:3b27da507d56 1346:01c57eb70ae9
3975 ;; need this to terminate the currently-displayed message 3975 ;; need this to terminate the currently-displayed message
3976 ;; ("Loading simple ...") 3976 ;; ("Loading simple ...")
3977 (when (and 3977 (when (and
3978 (not (fboundp 'display-message)) 3978 (not (fboundp 'display-message))
3979 (not (featurep 'debug))) 3979 (not (featurep 'debug)))
3980 (set-device-clear-left-side nil nil)
3980 (send-string-to-terminal "\n")) 3981 (send-string-to-terminal "\n"))
3981 3982
3982 (defvar message-stack nil 3983 (defvar message-stack nil
3983 "An alist of label/string pairs representing active echo-area messages. 3984 "An alist of label/string pairs representing active echo-area messages.
3984 The first element in the list is currently displayed in the echo area. 3985 The first element in the list is currently displayed in the echo area.
4142 (or frame (setq frame (selected-frame))) 4143 (or frame (setq frame (selected-frame)))
4143 (let ((clear-stream (and message-stack (eq 'stream (frame-type frame))))) 4144 (let ((clear-stream (and message-stack (eq 'stream (frame-type frame)))))
4144 (remove-message label frame) 4145 (remove-message label frame)
4145 (let ((inhibit-read-only t)) 4146 (let ((inhibit-read-only t))
4146 (erase-buffer " *Echo Area*")) 4147 (erase-buffer " *Echo Area*"))
4147 (if clear-stream 4148 ;; If outputting to the terminal, make sure we clear the left side.
4148 (send-string-to-terminal ?\n stdout-p)) 4149 (when (or clear-stream
4150 (and (eq 'stream (frame-type frame))
4151 (not (device-left-side-clear-p (frame-device frame)))))
4152 (set-device-clear-left-side (frame-device frame) nil)
4153 (send-string-to-terminal ?\n stdout-p))
4149 (if no-restore 4154 (if no-restore
4150 nil ; just preparing to put another msg up 4155 nil ; just preparing to put another msg up
4151 (if message-stack 4156 (if message-stack
4152 (let ((oldmsg (cdr (car message-stack)))) 4157 (let ((oldmsg (cdr (car message-stack))))
4153 (raw-append-message oldmsg frame stdout-p) 4158 (raw-append-message oldmsg frame stdout-p)
4187 (car (car log)) (cdr (car log)))) 4192 (car (car log)) (cdr (car log))))
4188 (setq log (cdr log))))) 4193 (setq log (cdr log)))))
4189 4194
4190 (defun append-message (label message &optional frame stdout-p) 4195 (defun append-message (label message &optional frame stdout-p)
4191 (or frame (setq frame (selected-frame))) 4196 (or frame (setq frame (selected-frame)))
4197 ;; If outputting to the terminal, make sure output from anyone else clears
4198 ;; the left side first, but don't do it ourselves, otherwise we won't be
4199 ;; able to append to an existing message.
4200 (if (eq 'stream (frame-type frame))
4201 (set-device-clear-left-side (frame-device frame) nil))
4192 ;; Add a new entry to the message-stack, or modify an existing one 4202 ;; Add a new entry to the message-stack, or modify an existing one
4193 (let ((top (car message-stack))) 4203 (let ((top (car message-stack)))
4194 (if (eq label (car top)) 4204 (if (eq label (car top))
4195 (setcdr top (concat (cdr top) message)) 4205 (setcdr top (concat (cdr top) message))
4196 (push (cons label message) message-stack))) 4206 (push (cons label message) message-stack)))
4197 (raw-append-message message frame stdout-p)) 4207 (raw-append-message message frame stdout-p)
4208 (if (eq 'stream (frame-type frame))
4209 (set-device-clear-left-side (frame-device frame) t)))
4198 4210
4199 ;; Really append the message to the echo area. no fiddling with 4211 ;; Really append the message to the echo area. no fiddling with
4200 ;; message-stack. 4212 ;; message-stack.
4201 (defun raw-append-message (message &optional frame stdout-p) 4213 (defun raw-append-message (message &optional frame stdout-p)
4202 (unless (equal message "") 4214 (unless (equal message "")