diff options
| author | Martin Rudalics | 2013-09-02 14:22:21 +0200 |
|---|---|---|
| committer | Martin Rudalics | 2013-09-02 14:22:21 +0200 |
| commit | 8b09823660104a1698c2c8ab902042d2d39b0ebf (patch) | |
| tree | f21198e16d2a487dc0ef1bbc9952fb16fa878d75 /src/frame.c | |
| parent | fc85e20be1f86f396f08b24ae8e82eb68f5306bd (diff) | |
| download | emacs-8b09823660104a1698c2c8ab902042d2d39b0ebf.tar.gz emacs-8b09823660104a1698c2c8ab902042d2d39b0ebf.zip | |
In check_minibuf_window don't abort if no window was found (Bug#15247).
* frame.c (check_minibuf_window): Don't abort if no window was
found (Bug#15247).
Diffstat (limited to 'src/frame.c')
| -rw-r--r-- | src/frame.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/frame.c b/src/frame.c index 5ee421bb9bf..e33426c2a44 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -1137,9 +1137,8 @@ check_minibuf_window (Lisp_Object frame, int select) | |||
| 1137 | } | 1137 | } |
| 1138 | } | 1138 | } |
| 1139 | 1139 | ||
| 1140 | if (!WINDOWP (window)) | 1140 | /* Don't abort if no window was found (Bug#15247). */ |
| 1141 | emacs_abort (); | 1141 | if (WINDOWP (window)) |
| 1142 | else | ||
| 1143 | { | 1142 | { |
| 1144 | /* Use set_window_buffer instead of Fset_window_buffer (see | 1143 | /* Use set_window_buffer instead of Fset_window_buffer (see |
| 1145 | discussion of bug#11984, bug#12025, bug#12026). */ | 1144 | discussion of bug#11984, bug#12025, bug#12026). */ |