mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 12:21:25 -08:00
Code Issues Projects Releases Wiki Activity

(server-select-display): Use a dummy buffer to detect when

Browse source 
the frame is later used.
(server-select-display): New function.
(server-process-filter): Use it to detect unused temp frames.
This commit is contained in:
Stefan Monnier 2006-10-30 07:29:37 +00:00
parent 4da0d3f794
commit 7acc677bf1
2 changed files with 41 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lisp/ChangeLog
View file

@ -1,8 +1,14 @@
2006-10-30 Stefan Monnier <monnier@iro.umontreal.ca>
* server.el (server-select-display): Use a dummy buffer to detect when
the frame is later used.
(server-select-display): New function.
(server-process-filter): Use it to detect unused temp frames.
2006-10-29 Stephen Leake <stephen_leake@stephe_leake.org>
* progmodes/ada-mode.el: Change maintainer, apply
whitespace-clean, checkdoc. Minor improvements to many doc
strings.
whitespace-clean, checkdoc. Minor improvements to many doc strings.
(ada-mode-version): New function.
(ada-create-menu): Menu operations are available for all supported
compilers.
@ -18,8 +24,7 @@
* calendar/calendar.el (cal-html-cursor-month)
(cal-html-cursor-year): Add autoloads for this new package.
(calendar-mode-map): Bind cal-html-cursor-month,
cal-html-cursor-year.
(calendar-mode-map): Bind cal-html-cursor-month, cal-html-cursor-year.
2006-10-28 Anna Bigatti <bigatti@dima.unige.it>

46
lisp/server.el
View file

@ -205,12 +205,34 @@ are done with it in the server.")
(select-frame frame)))
;; If there's no frame on that display yet, create and select one.
(unless (equal (frame-parameter (selected-frame) 'display) display)
(select-frame
(make-frame-on-display
display
;; This frame may be deleted later (see server-process-filter)
;; so we want it to be as unobtrusive as possible.
'((visibility . nil)))))))
(let* ((buffer (generate-new-buffer " *server-dummy*"))
(frame (make-frame-on-display
display
;; Make it display (and remember) some dummy buffer, so
;; we can detect later if the frame is in use or not.
`((server-dummmy-buffer . ,buffer)
;; This frame may be deleted later (see
;; server-unselect-display) so we want it to be as
;; unobtrusive as possible.
(visibility . nil)))))
(select-frame frame)
(set-window-buffer (selected-window) buffer)))))
(defun server-unselect-display (frame)
;; If the temporary frame is in use (displays something real), make it
;; visible. If not (which can happen if the user's customizations call
;; pop-to-buffer etc.), delete it to avoid preserving the connection after
;; the last real frame is deleted.
(if (and (eq (frame-first-window frame)
(next-window (frame-first-window frame) 'nomini))
(eq (window-buffer (frame-first-window frame))
(frame-parameter frame 'server-dummy-buffer)))
;; The temp frame still only shows one buffer, and that is the
;; internal temp buffer.
(delete-frame frame)
(set-frame-parameter frame 'visibility t))
(kill-buffer (frame-parameter frame 'server-dummy-buffer))
(set-frame-parameter frame 'server-dummy-buffer nil))
(defun server-unquote-arg (arg)
(replace-regexp-in-string
@ -379,14 +401,10 @@ PROC is the server process. Format of STRING is \"PATH PATH PATH... \\n\"."
(unless nowait
(message "%s" (substitute-command-keys
"When done with a buffer, type \\[server-edit]")))))
;; If the temporary frame is still the selected frame, make it
;; real. If not (which can happen if the user's customizations
;; call pop-to-buffer etc.), delete it to avoid preserving the
;; connection after the last real frame is deleted.
(if tmp-frame
(if (eq (selected-frame) tmp-frame)
(set-frame-parameter tmp-frame 'visibility t)
(delete-frame tmp-frame)))))
(when (frame-live-p tmp-frame)
;; Delete tmp-frame or make it visible depending on whether it's
;; been used or not.
(server-unselect-display tmp-frame))))
;; Save for later any partial line that remains.
(when (> (length string) 0)
(process-put proc 'previous-string string)))