emacs-diffs
[Top][All Lists]
Advanced

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

master 45abd52 2/2: Fix build breakage if Lisp_Object is not a primitive


From: Philipp Stephani
Subject: master 45abd52 2/2: Fix build breakage if Lisp_Object is not a primitive type.
Date: Sun, 10 Jan 2021 16:36:01 -0500 (EST)

branch: master
commit 45abd52f3c870ab4ee05fddfc4896d2444594c3d
Author: Philipp Stephani <phst@google.com>
Commit: Philipp Stephani <phst@google.com>

    Fix build breakage if Lisp_Object is not a primitive type.
    
    * src/minibuf.c (choose_minibuf_frame): Don't compare Lisp_Objects
    with '!='.  Use 'EQ' instead.
---
 src/minibuf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/minibuf.c b/src/minibuf.c
index c527e2b..868e481 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -141,8 +141,8 @@ choose_minibuf_frame (void)
       if (!EQ (frame, selected_frame)
           && minibuf_level > 1
          /* The frame's minibuffer can be on a different frame.  */
-         && XWINDOW ((of = XFRAME (frame))->minibuffer_window)->frame
-         != selected_frame)
+         && ! EQ (XWINDOW ((of = XFRAME (frame))->minibuffer_window)->frame,
+                  selected_frame))
         {
           if (MINI_WINDOW_P (XWINDOW (FRAME_SELECTED_WINDOW (of))))
             Fset_frame_selected_window (frame, Fframe_first_window (frame),



reply via email to

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