diff options
| author | Karoly Lorentey | 2005-12-30 06:15:47 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2005-12-30 06:15:47 +0000 |
| commit | d290c5544069cc5c0f565d63ffe370ee355f630d (patch) | |
| tree | 3f8036aef98c790b94cbfe91d9a4efeeda4c79af | |
| parent | 526039df1cd827ba428597b42046fe2b28d170c7 (diff) | |
| download | emacs-d290c5544069cc5c0f565d63ffe370ee355f630d.tar.gz emacs-d290c5544069cc5c0f565d63ffe370ee355f630d.zip | |
Fix splash screen loosing input events on Emacsclient frames.
* lisp/startup.el (fancy-splash-screens): Use `overriding-local-map'
instead of `overriding-terminal-local-map' for now; the latter doesn't
work right, it looses keypresses to another terminal.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-478
| -rw-r--r-- | README.multi-tty | 6 | ||||
| -rw-r--r-- | lisp/startup.el | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/README.multi-tty b/README.multi-tty index de9b53b04e4..60050f9f775 100644 --- a/README.multi-tty +++ b/README.multi-tty | |||
| @@ -401,6 +401,12 @@ is probably not very interesting for anyone else.) | |||
| 401 | THINGS TO DO | 401 | THINGS TO DO |
| 402 | ------------ | 402 | ------------ |
| 403 | 403 | ||
| 404 | ** Let-binding `overriding-terminal-local-map' on a brand new frame | ||
| 405 | does not seem to work correctly. (See `fancy-splash-screens'.) | ||
| 406 | The keymap seems to be set up right, but events go to another | ||
| 407 | terminal. Or is it `unread-command-events' that gets Emacs | ||
| 408 | confused? Investigate. | ||
| 409 | |||
| 404 | ** `delete-frame' events are handled by `special-event-map' | 410 | ** `delete-frame' events are handled by `special-event-map' |
| 405 | immediately when read by `read_char'. This is fine but it prevents | 411 | immediately when read by `read_char'. This is fine but it prevents |
| 406 | higher-level keymaps from binding that event to get notified of the | 412 | higher-level keymaps from binding that event to get notified of the |
diff --git a/lisp/startup.el b/lisp/startup.el index 6ae2163687a..db65131844c 100644 --- a/lisp/startup.el +++ b/lisp/startup.el | |||
| @@ -1334,7 +1334,7 @@ mouse." | |||
| 1334 | (catch 'stop-splashing | 1334 | (catch 'stop-splashing |
| 1335 | (unwind-protect | 1335 | (unwind-protect |
| 1336 | (let* ((map (make-sparse-keymap)) | 1336 | (let* ((map (make-sparse-keymap)) |
| 1337 | (overriding-terminal-local-map map) | 1337 | (overriding-local-map map) |
| 1338 | ;; Catch if our frame is deleted; the delete-frame | 1338 | ;; Catch if our frame is deleted; the delete-frame |
| 1339 | ;; event is unreliable and is handled by | 1339 | ;; event is unreliable and is handled by |
| 1340 | ;; `special-event-map' anyway. | 1340 | ;; `special-event-map' anyway. |