diff options
| author | Chong Yidong | 2006-07-26 18:18:54 +0000 |
|---|---|---|
| committer | Chong Yidong | 2006-07-26 18:18:54 +0000 |
| commit | c1c3d4f760d360fbc650458c03deb07173c1d644 (patch) | |
| tree | 27b82f67915aebf24ffc55e59e70c6e51755e489 /lispref | |
| parent | 04ba1d88de793b42bace58f811cf3036cc59ca82 (diff) | |
| download | emacs-c1c3d4f760d360fbc650458c03deb07173c1d644.tar.gz emacs-c1c3d4f760d360fbc650458c03deb07173c1d644.zip | |
* commands.texi (Reading One Event): Document SECONDS argument for
read-event, read-char, and read-char-exclusive.
Diffstat (limited to 'lispref')
| -rw-r--r-- | lispref/ChangeLog | 5 | ||||
| -rw-r--r-- | lispref/commands.texi | 15 |
2 files changed, 17 insertions, 3 deletions
diff --git a/lispref/ChangeLog b/lispref/ChangeLog index 3eef44c2f20..ef6475b1016 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2006-07-26 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * commands.texi (Reading One Event): Document SECONDS argument for | ||
| 4 | read-event, read-char, and read-char-exclusive. | ||
| 5 | |||
| 1 | 2006-07-25 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2006-07-25 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * modes.texi (Multiline Font Lock): Can't use jit-lock-defer-multiline | 8 | * modes.texi (Multiline Font Lock): Can't use jit-lock-defer-multiline |
diff --git a/lispref/commands.texi b/lispref/commands.texi index e1c37efa812..3c987632a33 100644 --- a/lispref/commands.texi +++ b/lispref/commands.texi | |||
| @@ -2199,7 +2199,7 @@ single event. | |||
| 2199 | 2199 | ||
| 2200 | None of the three functions below suppresses quitting. | 2200 | None of the three functions below suppresses quitting. |
| 2201 | 2201 | ||
| 2202 | @defun read-event &optional prompt inherit-input-method | 2202 | @defun read-event &optional prompt inherit-input-method seconds |
| 2203 | This function reads and returns the next event of command input, waiting | 2203 | This function reads and returns the next event of command input, waiting |
| 2204 | if necessary until an event is available. Events can come directly from | 2204 | if necessary until an event is available. Events can come directly from |
| 2205 | the user or from a keyboard macro. | 2205 | the user or from a keyboard macro. |
| @@ -2220,6 +2220,15 @@ If @code{cursor-in-echo-area} is non-@code{nil}, then @code{read-event} | |||
| 2220 | moves the cursor temporarily to the echo area, to the end of any message | 2220 | moves the cursor temporarily to the echo area, to the end of any message |
| 2221 | displayed there. Otherwise @code{read-event} does not move the cursor. | 2221 | displayed there. Otherwise @code{read-event} does not move the cursor. |
| 2222 | 2222 | ||
| 2223 | If @code{seconds} is non-@code{nil}, it should be a number specifying | ||
| 2224 | the maximum time to wait for input, in seconds. If no input arrives | ||
| 2225 | within that time, @code{read-event} stops waiting and returns | ||
| 2226 | @code{nil}. A floating-point value for @code{seconds} means to wait | ||
| 2227 | for a fractional number of seconds. Some systems support only a whole | ||
| 2228 | number of seconds; on these systems, @code{seconds} is rounded down. | ||
| 2229 | If @code{seconds} is @code{nil}, @code{read-event} waits as long as | ||
| 2230 | necessary for input to arrive. | ||
| 2231 | |||
| 2223 | If @code{read-event} gets an event that is defined as a help character, | 2232 | If @code{read-event} gets an event that is defined as a help character, |
| 2224 | then in some cases @code{read-event} processes the event directly without | 2233 | then in some cases @code{read-event} processes the event directly without |
| 2225 | returning. @xref{Help Functions}. Certain other events, called | 2234 | returning. @xref{Help Functions}. Certain other events, called |
| @@ -2237,7 +2246,7 @@ right-arrow function key: | |||
| 2237 | @end example | 2246 | @end example |
| 2238 | @end defun | 2247 | @end defun |
| 2239 | 2248 | ||
| 2240 | @defun read-char &optional prompt inherit-input-method | 2249 | @defun read-char &optional prompt inherit-input-method seconds |
| 2241 | This function reads and returns a character of command input. If the | 2250 | This function reads and returns a character of command input. If the |
| 2242 | user generates an event which is not a character (i.e. a mouse click or | 2251 | user generates an event which is not a character (i.e. a mouse click or |
| 2243 | function key event), @code{read-char} signals an error. The arguments | 2252 | function key event), @code{read-char} signals an error. The arguments |
| @@ -2269,7 +2278,7 @@ the echo area. | |||
| 2269 | @end example | 2278 | @end example |
| 2270 | @end defun | 2279 | @end defun |
| 2271 | 2280 | ||
| 2272 | @defun read-char-exclusive &optional prompt inherit-input-method | 2281 | @defun read-char-exclusive &optional prompt inherit-input-method seconds |
| 2273 | This function reads and returns a character of command input. If the | 2282 | This function reads and returns a character of command input. If the |
| 2274 | user generates an event which is not a character, | 2283 | user generates an event which is not a character, |
| 2275 | @code{read-char-exclusive} ignores it and reads another event, until it | 2284 | @code{read-char-exclusive} ignores it and reads another event, until it |