diff options
| author | Xue Fuqiao | 2013-11-18 06:30:44 +0800 |
|---|---|---|
| committer | Xue Fuqiao | 2013-11-18 06:30:44 +0800 |
| commit | de586f99e98f9ace3dc33933094046671ee7fa3c (patch) | |
| tree | 0b864454f968d494d95603c5ee4919021d35da34 | |
| parent | 56cd894e90949294d9578fd9fa45a179389f3306 (diff) | |
| download | emacs-de586f99e98f9ace3dc33933094046671ee7fa3c.tar.gz emacs-de586f99e98f9ace3dc33933094046671ee7fa3c.zip | |
Minor doc fixes.
* doc/lispref/os.texi (Time Parsing):
(Processor Run Time, Input Modes, Terminal Output): Minor fixes.
| -rw-r--r-- | doc/lispref/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/lispref/os.texi | 22 |
2 files changed, 17 insertions, 10 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 520f87f2f8b..f4fc1acfa69 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-11-17 Xue Fuqiao <xfq.free@gmail.com> | ||
| 2 | |||
| 3 | * os.texi (Time Parsing): | ||
| 4 | (Processor Run Time, Input Modes, Terminal Output): Minor fixes. | ||
| 5 | |||
| 1 | 2013-11-14 Glenn Morris <rgm@gnu.org> | 6 | 2013-11-14 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * loading.texi (Library Search): Update section. | 8 | * loading.texi (Library Search): Update section. |
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi index 9b10a437b16..0cd9e1465dc 100644 --- a/doc/lispref/os.texi +++ b/doc/lispref/os.texi | |||
| @@ -1524,7 +1524,7 @@ system. | |||
| 1524 | @defun seconds-to-time seconds | 1524 | @defun seconds-to-time seconds |
| 1525 | This function converts @var{seconds}, a floating point number of | 1525 | This function converts @var{seconds}, a floating point number of |
| 1526 | seconds since the epoch, to a time value and returns that. To perform | 1526 | seconds since the epoch, to a time value and returns that. To perform |
| 1527 | the inverse conversion, use @code{float-time}. | 1527 | the inverse conversion, use @code{float-time} (@pxref{Time of Day}). |
| 1528 | @end defun | 1528 | @end defun |
| 1529 | 1529 | ||
| 1530 | @defun format-seconds format-string seconds | 1530 | @defun format-seconds format-string seconds |
| @@ -1586,6 +1586,7 @@ most-positive-fixnum}). | |||
| 1586 | both elapsed and processor time, used by the Emacs process. | 1586 | both elapsed and processor time, used by the Emacs process. |
| 1587 | 1587 | ||
| 1588 | @deffn Command emacs-uptime &optional format | 1588 | @deffn Command emacs-uptime &optional format |
| 1589 | @cindex uptime of Emacs | ||
| 1589 | This function returns a string representing the Emacs | 1590 | This function returns a string representing the Emacs |
| 1590 | @dfn{uptime}---the elapsed wall-clock time this instance of Emacs is | 1591 | @dfn{uptime}---the elapsed wall-clock time this instance of Emacs is |
| 1591 | running. The string is formatted by @code{format-seconds} according | 1592 | running. The string is formatted by @code{format-seconds} according |
| @@ -1922,10 +1923,10 @@ functions. | |||
| 1922 | 1923 | ||
| 1923 | @defun set-input-mode interrupt flow meta &optional quit-char | 1924 | @defun set-input-mode interrupt flow meta &optional quit-char |
| 1924 | This function sets the mode for reading keyboard input. If | 1925 | This function sets the mode for reading keyboard input. If |
| 1925 | @var{interrupt} is non-null, then Emacs uses input interrupts. If it is | 1926 | @var{interrupt} is non-@code{nil}, then Emacs uses input interrupts. |
| 1926 | @code{nil}, then it uses @sc{cbreak} mode. The default setting is | 1927 | If it is @code{nil}, then it uses @sc{cbreak} mode. The default |
| 1927 | system-dependent. Some systems always use @sc{cbreak} mode regardless | 1928 | setting is system-dependent. Some systems always use @sc{cbreak} mode |
| 1928 | of what is specified. | 1929 | regardless of what is specified. |
| 1929 | 1930 | ||
| 1930 | When Emacs communicates directly with X, it ignores this argument and | 1931 | When Emacs communicates directly with X, it ignores this argument and |
| 1931 | uses interrupts if that is the way it knows how to communicate. | 1932 | uses interrupts if that is the way it knows how to communicate. |
| @@ -2075,17 +2076,17 @@ often than to actual Emacs bugs. Once you are certain which characters | |||
| 2075 | were actually output, you can determine reliably whether they correspond | 2076 | were actually output, you can determine reliably whether they correspond |
| 2076 | to the Termcap specifications in use. | 2077 | to the Termcap specifications in use. |
| 2077 | 2078 | ||
| 2078 | You close the termscript file by calling this function with an | ||
| 2079 | argument of @code{nil}. | ||
| 2080 | |||
| 2081 | See also @code{open-dribble-file} in @ref{Recording Input}. | ||
| 2082 | |||
| 2083 | @example | 2079 | @example |
| 2084 | @group | 2080 | @group |
| 2085 | (open-termscript "../junk/termscript") | 2081 | (open-termscript "../junk/termscript") |
| 2086 | @result{} nil | 2082 | @result{} nil |
| 2087 | @end group | 2083 | @end group |
| 2088 | @end example | 2084 | @end example |
| 2085 | |||
| 2086 | You close the termscript file by calling this function with an | ||
| 2087 | argument of @code{nil}. | ||
| 2088 | |||
| 2089 | See also @code{open-dribble-file} in @ref{Recording Input}. | ||
| 2089 | @end deffn | 2090 | @end deffn |
| 2090 | 2091 | ||
| 2091 | @node Sound Output | 2092 | @node Sound Output |
| @@ -2096,6 +2097,7 @@ See also @code{open-dribble-file} in @ref{Recording Input}. | |||
| 2096 | certain systems are supported; if you call @code{play-sound} on a | 2097 | certain systems are supported; if you call @code{play-sound} on a |
| 2097 | system which cannot really do the job, it gives an error. | 2098 | system which cannot really do the job, it gives an error. |
| 2098 | 2099 | ||
| 2100 | @c FIXME: Add indexes for Au and WAV? --xfq | ||
| 2099 | The sound must be stored as a file in RIFF-WAVE format (@samp{.wav}) | 2101 | The sound must be stored as a file in RIFF-WAVE format (@samp{.wav}) |
| 2100 | or Sun Audio format (@samp{.au}). | 2102 | or Sun Audio format (@samp{.au}). |
| 2101 | 2103 | ||