diff options
| author | Jan Djärv | 2013-03-16 15:22:37 +0100 |
|---|---|---|
| committer | Jan Djärv | 2013-03-16 15:22:37 +0100 |
| commit | 6615748ac6bcff258ef548f70bdcc1ab9f740472 (patch) | |
| tree | d038b1d2a9c8ab255a60259e03079ae22bb21c2d /src | |
| parent | 960ce48010f19dcaef060fc2f869968ac7fa757d (diff) | |
| download | emacs-6615748ac6bcff258ef548f70bdcc1ab9f740472.tar.gz emacs-6615748ac6bcff258ef548f70bdcc1ab9f740472.zip | |
* nsterm.m (ns_select): Don't return with result uninitialized.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 1 | ||||
| -rw-r--r-- | src/nsterm.m | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 06618a543e2..3a2a36c0cf7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | 2013-03-16 Jan Djärv <jan.h.d@swipnet.se> | 1 | 2013-03-16 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 2 | ||
| 3 | * nsterm.m (updateFrameSize:): Change resize increments if needed. | 3 | * nsterm.m (updateFrameSize:): Change resize increments if needed. |
| 4 | (ns_select): Don't return with result uninitialized. | ||
| 4 | 5 | ||
| 5 | * nsterm.h (EmacsSavePanel, EmacsOpenPanel): Add getFilename | 6 | * nsterm.h (EmacsSavePanel, EmacsOpenPanel): Add getFilename |
| 6 | and getDirectory. | 7 | and getDirectory. |
diff --git a/src/nsterm.m b/src/nsterm.m index be586010c81..40e506eab27 100644 --- a/src/nsterm.m +++ b/src/nsterm.m | |||
| @@ -3601,6 +3601,11 @@ ns_select (int nfds, fd_set *readfds, fd_set *writefds, | |||
| 3601 | result = t; | 3601 | result = t; |
| 3602 | } | 3602 | } |
| 3603 | } | 3603 | } |
| 3604 | else | ||
| 3605 | { | ||
| 3606 | errno = EINTR; | ||
| 3607 | result = -1; | ||
| 3608 | } | ||
| 3604 | 3609 | ||
| 3605 | return result; | 3610 | return result; |
| 3606 | } | 3611 | } |