From: Aaron Jensen <aaronjensen@gmail.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: 26995@debbugs.gnu.org
Subject: bug#26995: 26.0.50; emacsclient --tty FILE flashes previous frame's buffer before loading FILE
Date: Sat, 10 Feb 2018 08:56:56 -0800 [thread overview]
Message-ID: <CAHyO48yCacN_z3raPmj4Q=RxQHJ3f9MYuPDGcCTJ7HvnqjSWHA@mail.gmail.com> (raw)
In-Reply-To: <83k1vl2kug.fsf@gnu.org>
[-- Attachment #1: Type: text/plain, Size: 206 bytes --]
From: Eli Zaretskii (mailto:eliz@gnu.org)
> Thanks, this LGTM. Please add ChangeLog-style commit log message for
> the changes, and I will then push this to the master branch.
Thank you, attached.
Aaron
[-- Attachment #2: 0001-Show-initial-buffer-immediately-upon-frame-creation-.patch --]
[-- Type: application/octet-stream, Size: 5716 bytes --]
From bc8882a33bba37a37af6bfe435ea48b04eab6782 Mon Sep 17 00:00:00 2001
From: Aaron Jensen <aaronjensen@gmail.com>
Date: Sun, 4 Feb 2018 22:52:48 -0800
Subject: [PATCH] Show initial buffer immediately upon frame creation from
server
* lisp/server.el (server-execute): Accept lambda for creating frame
rather than frame. Ensure newly created tty frame initially shows the
correct buffer.
(server-process-filter): Pass a lambda to server-execute to create
frame.
---
lisp/server.el | 85 ++++++++++++++++++++++++++++++++--------------------------
1 file changed, 47 insertions(+), 38 deletions(-)
diff --git a/lisp/server.el b/lisp/server.el
index ac0d701851..f7766a0253 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -1229,28 +1229,29 @@ server-execute-continuation
(or files commands)
(setq use-current-frame t))
- (setq frame
- (cond
- ((and use-current-frame
- (or (eq use-current-frame 'always)
- ;; We can't use the Emacs daemon's
- ;; terminal frame.
- (not (and (daemonp)
- (null (cdr (frame-list)))
- (eq (selected-frame)
- terminal-frame)))))
- (setq tty-name nil tty-type nil)
- (if display (server-select-display display)))
- ((or (and (eq system-type 'windows-nt)
- (daemonp)
- (setq display "w32"))
- (eq tty-name 'window-system))
- (server-create-window-system-frame display nowait proc
- parent-id
- frame-parameters))
- ;; When resuming on a tty, tty-name is nil.
- (tty-name
- (server-create-tty-frame tty-name tty-type proc))))
+ (setq create-frame
+ (lambda ()
+ (cond
+ ((and use-current-frame
+ (or (eq use-current-frame 'always)
+ ;; We can't use the Emacs daemon's
+ ;; terminal frame.
+ (not (and (daemonp)
+ (null (cdr (frame-list)))
+ (eq (selected-frame)
+ terminal-frame)))))
+ (setq tty-name nil tty-type nil)
+ (if display (server-select-display display)))
+ ((or (and (eq system-type 'windows-nt)
+ (daemonp)
+ (setq display "w32"))
+ (eq tty-name 'window-system))
+ (server-create-window-system-frame display nowait proc
+ parent-id
+ frame-parameters))
+ ;; When resuming on a tty, tty-name is nil.
+ (tty-name
+ (server-create-tty-frame tty-name tty-type proc)))))
(process-put
proc 'continuation
@@ -1262,7 +1263,7 @@ server-execute-continuation
(if (and dir (file-directory-p dir))
dir default-directory)))
(server-execute proc files nowait commands
- dontkill frame tty-name)))))
+ dontkill create-frame tty-name)))))
(when (or frame files)
(server-goto-toplevel proc))
@@ -1271,7 +1272,7 @@ server-execute-continuation
;; condition-case
(error (server-return-error proc err))))
-(defun server-execute (proc files nowait commands dontkill frame tty-name)
+(defun server-execute (proc files nowait commands dontkill create-frame tty-name)
;; This is run from timers and process-filters, i.e. "asynchronously".
;; But w.r.t the user, this is not really asynchronous since the timer
;; is run after 0s and the process-filter is run in response to the
@@ -1281,21 +1282,29 @@ server-execute
;; including code that needs to wait.
(with-local-quit
(condition-case err
- (let ((buffers (server-visit-files files proc nowait)))
- (mapc 'funcall (nreverse commands))
+ (let* ((buffers (server-visit-files files proc nowait))
+ ;; If we were told only to open a new client, obey
+ ;; `initial-buffer-choice' if it specifies a file
+ ;; or a function.
+ (initial-buffer (unless (or files commands)
+ (let ((buf
+ (cond ((stringp initial-buffer-choice)
+ (find-file-noselect initial-buffer-choice))
+ ((functionp initial-buffer-choice)
+ (funcall initial-buffer-choice)))))
+ (if (buffer-live-p buf) buf (get-buffer-create "*scratch*")))))
+ ;; Set current buffer so that newly created tty frames
+ ;; show the correct buffer initially.
+ (frame (with-current-buffer (or (car buffers)
+ initial-buffer
+ (current-buffer))
+ (prog1
+ (funcall create-frame)
+ ;; Switch to initial buffer in case the frame was reused.
+ (when initial-buffer
+ (switch-to-buffer initial-buffer 'norecord))))))
- ;; If we were told only to open a new client, obey
- ;; `initial-buffer-choice' if it specifies a file
- ;; or a function.
- (unless (or files commands)
- (let ((buf
- (cond ((stringp initial-buffer-choice)
- (find-file-noselect initial-buffer-choice))
- ((functionp initial-buffer-choice)
- (funcall initial-buffer-choice)))))
- (switch-to-buffer
- (if (buffer-live-p buf) buf (get-buffer-create "*scratch*"))
- 'norecord)))
+ (mapc 'funcall (nreverse commands))
;; Delete the client if necessary.
(cond
--
2.15.1
next prev parent reply other threads:[~2018-02-10 16:56 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-19 14:28 bug#26995: 26.0.50; emacsclient --tty FILE flashes previous frame's buffer before loading FILE Aaron Jensen
2017-05-19 15:30 ` Eli Zaretskii
2017-05-19 15:44 ` Aaron Jensen
2017-05-19 17:27 ` Eli Zaretskii
2018-02-05 6:56 ` Aaron Jensen
2018-02-09 21:06 ` Aaron Jensen
2018-02-10 10:35 ` Eli Zaretskii
2018-02-10 16:56 ` Aaron Jensen [this message]
2018-02-16 15:45 ` Eli Zaretskii
2019-11-01 13:56 ` Eli Zaretskii
2019-11-01 16:27 ` Aaron Jensen
2019-11-01 17:00 ` Eli Zaretskii
2019-11-07 17:15 ` Eli Zaretskii
2022-04-17 19:50 ` Lars Ingebrigtsen
2022-04-17 22:55 ` Aaron Jensen
2022-04-18 9:07 ` Lars Ingebrigtsen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAHyO48yCacN_z3raPmj4Q=RxQHJ3f9MYuPDGcCTJ7HvnqjSWHA@mail.gmail.com' \
--to=aaronjensen@gmail.com \
--cc=26995@debbugs.gnu.org \
--cc=eliz@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).