aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lispref/os.texi20
1 files changed, 11 insertions, 9 deletions
diff --git a/lispref/os.texi b/lispref/os.texi
index acc656e7022..498cc857eab 100644
--- a/lispref/os.texi
+++ b/lispref/os.texi
@@ -54,7 +54,7 @@ can customize these actions.
54 54
55@node Startup Summary 55@node Startup Summary
56@subsection Summary: Sequence of Actions at Startup 56@subsection Summary: Sequence of Actions at Startup
57@cindex initialization 57@cindex initialization of Emacs
58@cindex startup of Emacs 58@cindex startup of Emacs
59@cindex @file{startup.el} 59@cindex @file{startup.el}
60 60
@@ -1421,12 +1421,15 @@ the timer runs only once.
1421 1421
1422@var{time} may specify an absolute or a relative time. 1422@var{time} may specify an absolute or a relative time.
1423 1423
1424Absolute times may be specified using a string with a limited variety of 1424Absolute times may be specified using a string with a limited variety
1425formats, and are taken to be times @emph{today}, even if already in the 1425of formats, and are taken to be times @emph{today}, even if already in
1426past. The recognized forms are XXXX, X:XX, or XX:XX (military time), 1426the past. The recognized forms are @samp{@var{xxxx}},
1427and XXam, XXAM, XXpm, XXPM, XX:XXam, XX:XXAM XX:XXpm, or XX:XXPM. A 1427@samp{@var{x}:@var{xx}}, or @samp{@var{xx}:@var{xx}} (military time),
1428period can be used instead of a colon to separate the hour and minute 1428and @samp{@var{xx}am}, @samp{@var{xx}AM}, @samp{@var{xx}pm},
1429parts. 1429@samp{@var{xx}PM}, @samp{@var{xx}:@var{xx}am},
1430@samp{@var{xx}:@var{xx}AM}, @samp{@var{xx}:@var{xx}pm}, or
1431@samp{@var{xx}:@var{xx}PM}. A period can be used instead of a colon
1432to separate the hour and minute parts.
1430 1433
1431To specify a relative time as a string, use numbers followed by units. 1434To specify a relative time as a string, use numbers followed by units.
1432For example: 1435For example:
@@ -1865,7 +1868,7 @@ is called with one argument, a property list that describes the sound.
1865 1868
1866@node X11 Keysyms 1869@node X11 Keysyms
1867@section Operating on X11 Keysyms 1870@section Operating on X11 Keysyms
1868@cindex x11 keysyms 1871@cindex X11 keysyms
1869 1872
1870To define system-specific X11 keysyms, set the variable 1873To define system-specific X11 keysyms, set the variable
1871@code{system-key-alist}. 1874@code{system-key-alist}.
@@ -1919,7 +1922,6 @@ how to swap the Meta and Alt modifiers within Emacs:
1919@node Batch Mode 1922@node Batch Mode
1920@section Batch Mode 1923@section Batch Mode
1921@cindex batch mode 1924@cindex batch mode
1922@cindex noninteractive use
1923 1925
1924 The command-line option @samp{-batch} causes Emacs to run 1926 The command-line option @samp{-batch} causes Emacs to run
1925noninteractively. In this mode, Emacs does not read commands from the 1927noninteractively. In this mode, Emacs does not read commands from the