diff options
| author | Glenn Morris | 2018-01-30 07:50:25 -0800 |
|---|---|---|
| committer | Glenn Morris | 2018-01-30 07:50:25 -0800 |
| commit | 084cfae0e624469ebca78b155ffe4e2c20f2b205 (patch) | |
| tree | 090f0efbf80386248f99a054e45be8206d174b15 /doc/lispref | |
| parent | 84055bda91d48dd603110b0805560cf1df205a83 (diff) | |
| parent | bc8dc37f1cd6dcede1f5f409a3aeb8fb345d642e (diff) | |
| download | emacs-084cfae0e624469ebca78b155ffe4e2c20f2b205.tar.gz emacs-084cfae0e624469ebca78b155ffe4e2c20f2b205.zip | |
Merge from origin/emacs-26
bc8dc37 (origin/emacs-26) Minor copyedits in "Distribution" chapter o...
1c7a936 Minor copyedits in "Entering" chapter of Emacs manual.
1d4498b Minor wording change in the Emacs manual
2bf49e7 Fix a typo in the Emacs manual
f3546a2 Improve the "Basic" chapter of the Emacs manual
691431e Resurrect lost text in lispref
956807b * lisp/emacs-lisp/rx.el (rx): Fix the definition of 'blank'.
7d90d2e Proofread os.texi and files.texi
490c736 Minor improvements in the "International" chapter of Emacs ma...
79252d3 Minor improvement in "Text" chapter of Emacs manual
Diffstat (limited to 'doc/lispref')
| -rw-r--r-- | doc/lispref/files.texi | 11 | ||||
| -rw-r--r-- | doc/lispref/loading.texi | 2 | ||||
| -rw-r--r-- | doc/lispref/os.texi | 17 | ||||
| -rw-r--r-- | doc/lispref/streams.texi | 6 |
4 files changed, 19 insertions, 17 deletions
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi index 021a62a56ab..6a0312bd2f3 100644 --- a/doc/lispref/files.texi +++ b/doc/lispref/files.texi | |||
| @@ -1170,14 +1170,14 @@ Sometimes file names or their parts need to be compared as strings, in | |||
| 1170 | which case it's important to know whether the underlying filesystem is | 1170 | which case it's important to know whether the underlying filesystem is |
| 1171 | case-insensitive. This function returns @code{t} if file | 1171 | case-insensitive. This function returns @code{t} if file |
| 1172 | @var{filename} is on a case-insensitive filesystem. It always returns | 1172 | @var{filename} is on a case-insensitive filesystem. It always returns |
| 1173 | @code{t} on MS-DOS and MS-Windows. On Cygwin and Mac OS X, | 1173 | @code{t} on MS-DOS and MS-Windows. On Cygwin and macOS, |
| 1174 | filesystems may or may not be case-insensitive, and the function tries | 1174 | filesystems may or may not be case-insensitive, and the function tries |
| 1175 | to determine case-sensitivity by a runtime test. If the test is | 1175 | to determine case-sensitivity by a runtime test. If the test is |
| 1176 | inconclusive, the function returns @code{t} on Cygwin and @code{nil} | 1176 | inconclusive, the function returns @code{t} on Cygwin and @code{nil} |
| 1177 | on Mac OS X. | 1177 | on macOS. |
| 1178 | 1178 | ||
| 1179 | Currently this function always returns @code{nil} on platforms other | 1179 | Currently this function always returns @code{nil} on platforms other |
| 1180 | than MS-DOS, MS-Windows, Cygwin, and Mac OS X. It does not detect | 1180 | than MS-DOS, MS-Windows, Cygwin, and macOS. It does not detect |
| 1181 | case-insensitivity of mounted filesystems, such as Samba shares or | 1181 | case-insensitivity of mounted filesystems, such as Samba shares or |
| 1182 | NFS-mounted Windows volumes. On remote hosts, it assumes @code{t} for | 1182 | NFS-mounted Windows volumes. On remote hosts, it assumes @code{t} for |
| 1183 | the @samp{smb} method. For all other connection methods, runtime | 1183 | the @samp{smb} method. For all other connection methods, runtime |
| @@ -1297,9 +1297,10 @@ The file's @acronym{GID}, likewise (@code{file-attribute-group-id}). | |||
| 1297 | The time of last access, as a list of four integers | 1297 | The time of last access, as a list of four integers |
| 1298 | @code{(@var{sec-high} @var{sec-low} @var{microsec} @var{picosec})} | 1298 | @code{(@var{sec-high} @var{sec-low} @var{microsec} @var{picosec})} |
| 1299 | (@code{file-attribute-access-time}). (This is similar to the value of | 1299 | (@code{file-attribute-access-time}). (This is similar to the value of |
| 1300 | @code{current-time}; see @ref{Time of Day}.) Note that on some | 1300 | @code{current-time}; see @ref{Time of Day}.) The value is truncated |
| 1301 | to that of the filesystem's timestamp resolution; for example, on some | ||
| 1301 | FAT-based filesystems, only the date of last access is recorded, so | 1302 | FAT-based filesystems, only the date of last access is recorded, so |
| 1302 | this time will always hold the midnight of the day of last access. | 1303 | this time will always hold the midnight of the day of the last access. |
| 1303 | 1304 | ||
| 1304 | @cindex modification time of file | 1305 | @cindex modification time of file |
| 1305 | @item | 1306 | @item |
diff --git a/doc/lispref/loading.texi b/doc/lispref/loading.texi index 0165d114a75..82c133de753 100644 --- a/doc/lispref/loading.texi +++ b/doc/lispref/loading.texi | |||
| @@ -1151,7 +1151,7 @@ extension, a.k.a.@: ``suffix''. This suffix is platform-dependent. | |||
| 1151 | 1151 | ||
| 1152 | @defvar module-file-suffix | 1152 | @defvar module-file-suffix |
| 1153 | This variable holds the system-dependent value of the file-name | 1153 | This variable holds the system-dependent value of the file-name |
| 1154 | extension of the module files. Its value is @file{.so} on Posix hosts | 1154 | extension of the module files. Its value is @file{.so} on POSIX hosts |
| 1155 | and @file{.dll} on MS-Windows. | 1155 | and @file{.dll} on MS-Windows. |
| 1156 | @end defvar | 1156 | @end defvar |
| 1157 | 1157 | ||
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi index 1a4e2db44a6..9352a929a7a 100644 --- a/doc/lispref/os.texi +++ b/doc/lispref/os.texi | |||
| @@ -257,7 +257,7 @@ options were specified. | |||
| 257 | 257 | ||
| 258 | @item | 258 | @item |
| 259 | If a daemon was requested, it calls @code{server-start}. | 259 | If a daemon was requested, it calls @code{server-start}. |
| 260 | (On Posix systems, if a background daemon was requested, it then | 260 | (On POSIX systems, if a background daemon was requested, it then |
| 261 | detaches from the controlling terminal.) @xref{Emacs | 261 | detaches from the controlling terminal.) @xref{Emacs |
| 262 | Server,,, emacs, The GNU Emacs Manual}. | 262 | Server,,, emacs, The GNU Emacs Manual}. |
| 263 | 263 | ||
| @@ -888,7 +888,7 @@ IBM's AIX. | |||
| 888 | Berkeley BSD and its variants. | 888 | Berkeley BSD and its variants. |
| 889 | 889 | ||
| 890 | @item cygwin | 890 | @item cygwin |
| 891 | Cygwin, a Posix layer on top of MS-Windows. | 891 | Cygwin, a POSIX layer on top of MS-Windows. |
| 892 | 892 | ||
| 893 | @item darwin | 893 | @item darwin |
| 894 | Darwin (macOS). | 894 | Darwin (macOS). |
| @@ -1325,13 +1325,13 @@ omitted or @code{nil}, the conversion uses Emacs's default time zone. | |||
| 1325 | If it is @code{t}, the conversion uses Universal Time. If it is | 1325 | If it is @code{t}, the conversion uses Universal Time. If it is |
| 1326 | @code{wall}, the conversion uses the system wall clock time. If it is | 1326 | @code{wall}, the conversion uses the system wall clock time. If it is |
| 1327 | a string, the conversion uses the time zone rule equivalent to setting | 1327 | a string, the conversion uses the time zone rule equivalent to setting |
| 1328 | @env{TZ} to that string. If it is an integer @var{offset}, the | 1328 | @env{TZ} to that string. If it is a list (@var{offset} @var{abbr}), where |
| 1329 | conversion uses a fixed time zone with the given offset and a numeric | ||
| 1330 | abbreviation on POSIX-compatible platforms and an unspecified abbreviation | ||
| 1331 | on MS-Windows. If it is a list (@var{offset} @var{abbr}), where | ||
| 1332 | @var{offset} is an integer number of seconds east of Universal Time | 1329 | @var{offset} is an integer number of seconds east of Universal Time |
| 1333 | and @var{abbr} is a string, the conversion uses a fixed time zone with | 1330 | and @var{abbr} is a string, the conversion uses a fixed time zone with |
| 1334 | the given offset and abbreviation. | 1331 | the given offset and abbreviation. An integer @var{offset} is treated |
| 1332 | as if it were (@var{offset} @var{abbr}), where @var{abbr} is a numeric | ||
| 1333 | abbreviation on POSIX-compatible platforms and is unspecified on | ||
| 1334 | MS-Windows. | ||
| 1335 | 1335 | ||
| 1336 | @defun current-time-zone &optional time zone | 1336 | @defun current-time-zone &optional time zone |
| 1337 | @cindex time zone, current | 1337 | @cindex time zone, current |
| @@ -1488,6 +1488,7 @@ This is a synonym for @samp{%x %X}. | |||
| 1488 | @item %C | 1488 | @item %C |
| 1489 | This stands for the century, that is, the year divided by 100, | 1489 | This stands for the century, that is, the year divided by 100, |
| 1490 | truncated toward zero. | 1490 | truncated toward zero. |
| 1491 | The default field width is 2. | ||
| 1491 | @item %d | 1492 | @item %d |
| 1492 | This stands for the day of month, zero-padded. | 1493 | This stands for the day of month, zero-padded. |
| 1493 | @item %D | 1494 | @item %D |
| @@ -2398,7 +2399,7 @@ Emacs is restarted by the session manager. | |||
| 2398 | 2399 | ||
| 2399 | Emacs is able to send @dfn{notifications} on systems that support the | 2400 | Emacs is able to send @dfn{notifications} on systems that support the |
| 2400 | freedesktop.org Desktop Notifications Specification and on MS-Windows. | 2401 | freedesktop.org Desktop Notifications Specification and on MS-Windows. |
| 2401 | In order to use this functionality on Posix hosts, Emacs must have | 2402 | In order to use this functionality on POSIX hosts, Emacs must have |
| 2402 | been compiled with D-Bus support, and the @code{notifications} library | 2403 | been compiled with D-Bus support, and the @code{notifications} library |
| 2403 | must be loaded. @xref{Top, , D-Bus,dbus,D-Bus integration in Emacs}. | 2404 | must be loaded. @xref{Top, , D-Bus,dbus,D-Bus integration in Emacs}. |
| 2404 | The following function is supported when D-Bus support is available: | 2405 | The following function is supported when D-Bus support is available: |
diff --git a/doc/lispref/streams.texi b/doc/lispref/streams.texi index a25a5bfe84a..bd7dc2d9af3 100644 --- a/doc/lispref/streams.texi +++ b/doc/lispref/streams.texi | |||
| @@ -344,7 +344,7 @@ When reading or writing from the standard input/output streams of the | |||
| 344 | Emacs process in batch mode, it is sometimes required to make sure any | 344 | Emacs process in batch mode, it is sometimes required to make sure any |
| 345 | arbitrary binary data will be read/written verbatim, and/or that no | 345 | arbitrary binary data will be read/written verbatim, and/or that no |
| 346 | translation of newlines to or from CR-LF pairs is performed. This | 346 | translation of newlines to or from CR-LF pairs is performed. This |
| 347 | issue does not exist on Posix hosts, only on MS-Windows and MS-DOS@. | 347 | issue does not exist on POSIX hosts, only on MS-Windows and MS-DOS@. |
| 348 | The following function allows you to control the I/O mode of any | 348 | The following function allows you to control the I/O mode of any |
| 349 | standard stream of the Emacs process. | 349 | standard stream of the Emacs process. |
| 350 | 350 | ||
| @@ -354,7 +354,7 @@ non-@code{nil}, switch to binary mode, otherwise switch to text mode. | |||
| 354 | The value of @var{stream} can be one of @code{stdin}, @code{stdout}, | 354 | The value of @var{stream} can be one of @code{stdin}, @code{stdout}, |
| 355 | or @code{stderr}. This function flushes any pending output data of | 355 | or @code{stderr}. This function flushes any pending output data of |
| 356 | @var{stream} as a side effect, and returns the previous value of I/O | 356 | @var{stream} as a side effect, and returns the previous value of I/O |
| 357 | mode for @var{stream}. On Posix hosts, it always returns a | 357 | mode for @var{stream}. On POSIX hosts, it always returns a |
| 358 | non-@code{nil} value and does nothing except flushing pending output. | 358 | non-@code{nil} value and does nothing except flushing pending output. |
| 359 | @end defun | 359 | @end defun |
| 360 | 360 | ||
| @@ -707,7 +707,7 @@ indent and fill the object to make it more readable for humans. | |||
| 707 | 707 | ||
| 708 | If you need to use binary I/O in batch mode, e.g., use the functions | 708 | If you need to use binary I/O in batch mode, e.g., use the functions |
| 709 | described in this section to write out arbitrary binary data or avoid | 709 | described in this section to write out arbitrary binary data or avoid |
| 710 | conversion of newlines on non-Posix hosts, see @ref{Input Functions, | 710 | conversion of newlines on non-POSIX hosts, see @ref{Input Functions, |
| 711 | set-binary-mode}. | 711 | set-binary-mode}. |
| 712 | 712 | ||
| 713 | @node Output Variables | 713 | @node Output Variables |