emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] scratch/x_emacs d496cdb 1/5: fixup! Check for existence of


From: Alexander Gramiak
Subject: [Emacs-diffs] scratch/x_emacs d496cdb 1/5: fixup! Check for existence of terminal hooks before use
Date: Tue, 16 Apr 2019 12:52:06 -0400 (EDT)

branch: scratch/x_emacs
commit d496cdb40e847c01ed4bb76e8b9352c04a7579e5
Author: Alexander Gramiak <address@hidden>
Commit: Alexander Gramiak <address@hidden>

    fixup! Check for existence of terminal hooks before use
---
 src/frame.c | 2 +-
 src/frame.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/frame.c b/src/frame.c
index 763dd50..3950a4f 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 a780ea6..72e4218 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));
 }
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]