Mercurial > emacs
comparison src/w16select.c @ 90718:f1d13e615070
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 523-544)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 168-171)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-150
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 07 Dec 2006 04:14:14 +0000 |
parents | c5406394f567 727f68fa1f38 |
children | 95d0cdf160ea |
comparison
equal
deleted
inserted
replaced
90717:06937e972ad0 | 90718:f1d13e615070 |
---|---|
588 break; | 588 break; |
589 case 3: | 589 case 3: |
590 message2 (system_error_msg, sizeof (system_error_msg) - 1, 0); | 590 message2 (system_error_msg, sizeof (system_error_msg) - 1, 0); |
591 break; | 591 break; |
592 } | 592 } |
593 sit_for (2, 0, 0, 1, 1); | 593 sit_for (make_number (2), 0, 2); |
594 } | 594 } |
595 | 595 |
596 done: | 596 done: |
597 | 597 |
598 return (ok && put_status == 0 ? string : Qnil); | 598 return (ok && put_status == 0 ? string : Qnil); |