diff options
| author | Martin Rudalics | 2016-08-22 08:33:48 +0200 |
|---|---|---|
| committer | Martin Rudalics | 2016-08-22 08:33:48 +0200 |
| commit | dc491c3df305a73908fe8de20b7c428a5b38c846 (patch) | |
| tree | 739f411ea11d649f478a9490cef3a5c6ffddc344 /src | |
| parent | 1a1062d6e16f97effa7030cc5f297c9c57b232ad (diff) | |
| download | emacs-dc491c3df305a73908fe8de20b7c428a5b38c846.tar.gz emacs-dc491c3df305a73908fe8de20b7c428a5b38c846.zip | |
Fix (next-frame nil t) crash (Bug#24281)
* src/frame.c (candidate_frame): Check minibuf argument before
comparing it to zero (Bug#24281).
Diffstat (limited to 'src')
| -rw-r--r-- | src/frame.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/frame.c b/src/frame.c index e17c8acfc3c..2dbbb37289b 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -1310,7 +1310,7 @@ candidate_frame (Lisp_Object candidate, Lisp_Object frame, Lisp_Object minibuf) | |||
| 1310 | FRAME_FOCUS_FRAME (c))) | 1310 | FRAME_FOCUS_FRAME (c))) |
| 1311 | return candidate; | 1311 | return candidate; |
| 1312 | } | 1312 | } |
| 1313 | else if (XFASTINT (minibuf) == 0) | 1313 | else if (INTEGERP (minibuf) && XINT (minibuf) == 0) |
| 1314 | { | 1314 | { |
| 1315 | if (FRAME_VISIBLE_P (c) || FRAME_ICONIFIED_P (c)) | 1315 | if (FRAME_VISIBLE_P (c) || FRAME_ICONIFIED_P (c)) |
| 1316 | return candidate; | 1316 | return candidate; |