aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2015-12-03 18:36:03 +0200
committerEli Zaretskii2015-12-03 18:36:03 +0200
commit0cec548152811f3e650b4f09e5c523f2989fe40e (patch)
treeb04d8f92ff87f322b2d195e8853ea68205634fad
parente011b22d208f8a2b163721bd2d009b792eb7032c (diff)
downloademacs-0cec548152811f3e650b4f09e5c523f2989fe40e.tar.gz
emacs-0cec548152811f3e650b4f09e5c523f2989fe40e.zip
Document 'nacl' value for 'system-type'
* doc/lispref/os.texi (System Environment): Document the 'nacl' value of 'system-type'.
-rw-r--r--doc/lispref/os.texi5
-rw-r--r--etc/NEWS6
2 files changed, 8 insertions, 3 deletions
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index 5413437c39d..5b89e1ad581 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -902,6 +902,9 @@ Hewlett-Packard HPUX operating system.
902@item irix 902@item irix
903Silicon Graphics Irix system. 903Silicon Graphics Irix system.
904 904
905@item nacl
906Google Native Client (@acronym{NaCl}) sandboxing system.
907
905@item ms-dos 908@item ms-dos
906Microsoft's DOS@. Emacs compiled with DJGPP for MS-DOS binds 909Microsoft's DOS@. Emacs compiled with DJGPP for MS-DOS binds
907@code{system-type} to @code{ms-dos} even when you run it on MS-Windows. 910@code{system-type} to @code{ms-dos} even when you run it on MS-Windows.
@@ -911,7 +914,7 @@ AT&T Unix System V.
911 914
912@item windows-nt 915@item windows-nt
913Microsoft Windows NT, 9X and later. The value of @code{system-type} 916Microsoft Windows NT, 9X and later. The value of @code{system-type}
914is always @code{windows-nt}, e.g., even on Windows 7. 917is always @code{windows-nt}, e.g., even on Windows 10.
915 918
916@end table 919@end table
917 920
diff --git a/etc/NEWS b/etc/NEWS
index ad7d81703e0..1b44812f36a 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -181,8 +181,6 @@ for use in Emacs bug reports.
181hiding character but the default `.' can be used by let-binding the 181hiding character but the default `.' can be used by let-binding the
182variable `read-hide-char'. 182variable `read-hide-char'.
183 183
184** New possible value for `system-type': nacl.
185
186** Emacs can now load shared/dynamic libraries (modules). 184** Emacs can now load shared/dynamic libraries (modules).
187A dynamic Emacs module is a shared library that provides additional 185A dynamic Emacs module is a shared library that provides additional
188functionality for use in Emacs Lisp programs, just like a package 186functionality for use in Emacs Lisp programs, just like a package
@@ -1320,6 +1318,10 @@ standard-display-table, and encode output using locale-coding-system.
1320+++ 1318+++
1321** New var `truncate-string-ellipsis' to choose how to indicate truncation. 1319** New var `truncate-string-ellipsis' to choose how to indicate truncation.
1322 1320
1321+++
1322** New possible value for `system-type': `nacl'.
1323This is used by Google's Native Client (NaCl).
1324
1323** Miscellaneous name change 1325** Miscellaneous name change
1324 1326
1325For consistency with the usual Emacs spelling, the Lisp variable 1327For consistency with the usual Emacs spelling, the Lisp variable