diff options
| author | Alexander Gramiak <agrambot@gmail.com> | 2019-04-15 18:30:55 -0600 |
|---|---|---|
| committer | Alexander Gramiak <agrambot@gmail.com> | 2019-04-16 10:44:00 -0600 |
| commit | d496cdb40e847c01ed4bb76e8b9352c04a7579e5 (patch) | |
| tree | 5901b5311bbf0ef72c11a3a91a9910e500f562ba | |
| parent | 032c534ecc5dde828c2ecf0393e8c612d1003b65 (diff) | |
| download | emacs-d496cdb40e847c01ed4bb76e8b9352c04a7579e5.tar.gz | |
fixup! Check for existence of terminal hooks before use
| -rw-r--r-- | src/frame.c | 2 | ||||
| -rw-r--r-- | src/frame.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/frame.c b/src/frame.c index 763dd505bd3..3950a4f5156 100644 --- a/src/frame.c +++ b/src/frame.c @@ -1371,7 +1371,7 @@ do_switch_frame (Lisp_Object frame, int track, int for_deletion, Lisp_Object nor #else /* ! 0 */ /* Instead, apply it only to the frame we're pointing to. */ #ifdef HAVE_WINDOW_SYSTEM - if (track && FRAME_WINDOW_P (f)) + if (track && FRAME_WINDOW_P (f) && FRAME_TERMINAL (f)->get_focus_frame) { Lisp_Object focus, gfocus; diff --git a/src/frame.h b/src/frame.h index a780ea6085c..72e42181b66 100644 --- a/src/frame.h +++ b/src/frame.h @@ -1606,7 +1606,8 @@ gui_set_bitmap_icon (struct frame *f) { Lisp_Object obj = assq_no_quit (Qicon_type, f->param_alist); - if (CONSP (obj) && !NILP (XCDR (obj))) + if (CONSP (obj) && !NILP (XCDR (obj)) + && FRAME_TERMINAL (f)->set_bitmap_icon_hook) FRAME_TERMINAL (f)->set_bitmap_icon_hook (f, XCDR (obj)); } |