diff options
| author | YAMAMOTO Mitsuharu | 2013-05-20 12:09:22 +0900 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu | 2013-05-20 12:09:22 +0900 |
| commit | 5ba8bf358ff6e7fcaf0c9e987da9661e89c62e15 (patch) | |
| tree | 7b6c3905535a763a2405f05e92a98c1a5d836faf /src | |
| parent | 047dc96582413e3ee76a816f1d49f1c63f04d969 (diff) | |
| download | emacs-5ba8bf358ff6e7fcaf0c9e987da9661e89c62e15.tar.gz emacs-5ba8bf358ff6e7fcaf0c9e987da9661e89c62e15.zip | |
* xfns.c (check_x_display_info): Don't use XINT for terminal object.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xfns.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index e1f7a56aede..186f7812f44 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-05-20 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | ||
| 2 | |||
| 3 | * xfns.c (check_x_display_info): Don't use XINT for terminal object. | ||
| 4 | |||
| 1 | 2013-05-18 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2013-05-18 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 6 | ||
| 3 | Port --enable-gcc-warnings to clang. | 7 | Port --enable-gcc-warnings to clang. |
diff --git a/src/xfns.c b/src/xfns.c index 46cd10e5f2f..a61d2de5905 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -169,7 +169,7 @@ check_x_display_info (Lisp_Object object) | |||
| 169 | struct terminal *t = get_terminal (object, 1); | 169 | struct terminal *t = get_terminal (object, 1); |
| 170 | 170 | ||
| 171 | if (t->type != output_x_window) | 171 | if (t->type != output_x_window) |
| 172 | error ("Terminal %"pI"d is not an X display", XINT (object)); | 172 | error ("Terminal %d is not an X display", t->id); |
| 173 | 173 | ||
| 174 | dpyinfo = t->display_info.x; | 174 | dpyinfo = t->display_info.x; |
| 175 | } | 175 | } |