comparison lisp/packages/gnuserv.el @ 2:ac2d302a0011 r19-15b2

Import from CVS: tag r19-15b2
author cvs
date Mon, 13 Aug 2007 08:46:35 +0200
parents 376386a54a3c
children bcdc7deadc19
comparison
equal deleted inserted replaced
1:c0c6a60d29db 2:ac2d302a0011
35 ; by newline 35 ; by newline
36 ; 36 ;
37 ; Arup Mukherjee <arup+@cmu.edu> May/1994 37 ; Arup Mukherjee <arup+@cmu.edu> May/1994
38 ; Updated for XEmacs 19.10, and others: 38 ; Updated for XEmacs 19.10, and others:
39 ; - use find-file-other-screen if present 39 ; - use find-file-other-screen if present
40 ; - new variable gnuserv-frame can be set to a frame or screen which is 40 ; - new variable gnuserv-frame can be set to a frame or screen which
41 ; is used for all edited files. 41 ; is used for all edited files.
42 ; - check to see if server.el is already loaded and complain if it is, since 42 ; - check to see if server.el is already loaded and complain if it is, since
43 ; gnuserv.el can't coexist with server.el 43 ; gnuserv.el can't coexist with server.el
44 ; - rename server-start to gnuserv-start, although server-start remains as 44 ; - rename server-start to gnuserv-start, although server-start remains as
45 ; an alias. This allows gnuserv-start to be autoloaded from gnuserv.el 45 ; an alias. This allows gnuserv-start to be autoloaded from gnuserv.el
220 (eval form)) 220 (eval form))
221 221
222 222
223 (defun server-make-window-visible () 223 (defun server-make-window-visible ()
224 "Try to make this window even more visible." 224 "Try to make this window even more visible."
225 (and (boundp 'window-system) 225 (and (or (and (boundp 'window-system)
226 (boundp 'window-system-version) 226 (boundp 'window-system-version)
227 (eq window-system 'x) 227 (eq window-system 'x)
228 (eq window-system-version 11) 228 (eq window-system-version 11))
229 (and (fboundp 'console-type)
230 (eq 'x (console-type))))
229 (cond ((fboundp 'raise-frame) 231 (cond ((fboundp 'raise-frame)
230 (raise-frame (selected-frame))) 232 (raise-frame (selected-frame)))
231 ((fboundp 'deiconify-screen) 233 ((fboundp 'deiconify-screen)
232 (deiconify-screen (selected-screen)) 234 (deiconify-screen (selected-screen))
233 (raise-screen (selected-screen))) 235 (raise-screen (selected-screen)))
494 (not server-process) 496 (not server-process)
495 (memq (process-status server-process) '(signal exit))) 497 (memq (process-status server-process) '(signal exit)))
496 (server-start nil) 498 (server-start nil)
497 (if server-buffer-clients 499 (if server-buffer-clients
498 (progn (server-switch-buffer (server-done)) 500 (progn (server-switch-buffer (server-done))
499 (cond ((or ;(not window-system) #### someone examine! 501 (cond ((fboundp 'console-type) ;; XEmacs 19.14+
502 (or (and (equal (console-type) 'x)
503 gnuserv-frame
504 (frame-live-p gnuserv-frame))
505 (condition-case ()
506 (delete-frame (selected-frame) nil)
507 (error
508 (message "Not deleting last visible frame...")))))
509 ((or (not window-system)
500 (and gnuserv-frame 510 (and gnuserv-frame
501 (or (and (fboundp 'frame-live-p) 511 (or (and (fboundp 'frame-live-p)
502 (frame-live-p gnuserv-frame)) 512 (frame-live-p gnuserv-frame))
503 (and (fboundp 'live-screen-p) 513 (and (fboundp 'live-screen-p)
504 (live-screen-p gnuserv-frame)) 514 (live-screen-p gnuserv-frame))