[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r118072: Accept terminal devices on MS-Windows in AP
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] trunk r118072: Accept terminal devices on MS-Windows in APIs that accept frame or display. |
Date: |
Wed, 08 Oct 2014 10:40:09 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 118072
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Wed 2014-10-08 13:39:45 +0300
message:
Accept terminal devices on MS-Windows in APIs that accept frame or display.
src/w32fns.c (check_x_display_info): Accept terminal objects as
argument, to follow what xfns.c does.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/w32fns.c w32fns.c-20091113204419-o5vbwnq5f7feedwu-945
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-10-07 20:17:09 +0000
+++ b/src/ChangeLog 2014-10-08 10:39:45 +0000
@@ -1,3 +1,8 @@
+2014-10-08 Eli Zaretskii <address@hidden>
+
+ * w32fns.c (check_x_display_info): Accept terminal objects as
+ argument, to follow what xfns.c does.
+
2014-10-07 Glenn Morris <address@hidden>
* Makefile.in ($(srcdir)/macuvs.h)
=== modified file 'src/w32fns.c'
--- a/src/w32fns.c 2014-10-03 05:31:17 +0000
+++ b/src/w32fns.c 2014-10-08 10:39:45 +0000
@@ -263,9 +263,9 @@
the first display on the list. */
struct w32_display_info *
-check_x_display_info (Lisp_Object frame)
+check_x_display_info (Lisp_Object object)
{
- if (NILP (frame))
+ if (NILP (object))
{
struct frame *sf = XFRAME (selected_frame);
@@ -274,14 +274,23 @@
else
return &one_w32_display_info;
}
- else if (STRINGP (frame))
- return x_display_info_for_name (frame);
+ else if (TERMINALP (object))
+ {
+ struct terminal *t = get_terminal (object, 1);
+
+ if (t->type != output_w32)
+ error ("Terminal %d is not a W32 display", t->id);
+
+ return t->display_info.w32;
+ }
+ else if (STRINGP (object))
+ return x_display_info_for_name (object);
else
{
struct frame *f;
- CHECK_LIVE_FRAME (frame);
- f = XFRAME (frame);
+ CHECK_LIVE_FRAME (object);
+ f = XFRAME (object);
if (! FRAME_W32_P (f))
error ("Non-W32 frame used");
return FRAME_DISPLAY_INFO (f);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r118072: Accept terminal devices on MS-Windows in APIs that accept frame or display.,
Eli Zaretskii <=