[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master d3ec511: Pacify Oracle Studio 12.6
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master d3ec511: Pacify Oracle Studio 12.6 |
Date: |
Sat, 11 Aug 2018 19:32:58 -0400 (EDT) |
branch: master
commit d3ec5117da3146573cad5c1f8d01ab2e58f21e92
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
Pacify Oracle Studio 12.6
* src/xfns.c (Fx_frame_restack):
* src/xterm.c (x_io_error_quitter): Omit unreachable code.
---
src/xfns.c | 14 ++++----------
src/xterm.c | 1 -
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/src/xfns.c b/src/xfns.c
index c455cfe..6ed9eca 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -5421,16 +5421,10 @@ Some window managers may refuse to restack windows. */)
struct frame *f1 = decode_live_frame (frame1);
struct frame *f2 = decode_live_frame (frame2);
- if (FRAME_OUTER_WINDOW (f1) && FRAME_OUTER_WINDOW (f2))
- {
- x_frame_restack (f1, f2, !NILP (above));
- return Qt;
- }
- else
- {
- error ("Cannot restack frames");
- return Qnil;
- }
+ if (! (FRAME_OUTER_WINDOW (f1) && FRAME_OUTER_WINDOW (f2)))
+ error ("Cannot restack frames");
+ x_frame_restack (f1, f2, !NILP (above));
+ return Qt;
}
diff --git a/src/xterm.c b/src/xterm.c
index be8e3da..7131497 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -9935,7 +9935,6 @@ x_io_error_quitter (Display *display)
snprintf (buf, sizeof buf, "Connection lost to X server '%s'",
DisplayString (display));
x_connection_closed (display, buf, true);
- assume (false);
}
/* Changing the font of the frame. */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master d3ec511: Pacify Oracle Studio 12.6,
Paul Eggert <=