aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl Berry2007-04-01 18:11:15 +0000
committerKarl Berry2007-04-01 18:11:15 +0000
commit15bcde049f2044769a3df1fc6fc7c72aaddf80e0 (patch)
treee6dc46d2d7b2b516b5e43cc0bbcf8f4530878ee8
parent3b98edbd02454b618ec950646958669685f28dd1 (diff)
downloademacs-15bcde049f2044769a3df1fc6fc7c72aaddf80e0.tar.gz
emacs-15bcde049f2044769a3df1fc6fc7c72aaddf80e0.zip
wording matters
-rw-r--r--lispref/ChangeLog7
-rw-r--r--lispref/commands.texi8
-rw-r--r--lispref/keymaps.texi4
-rw-r--r--lispref/loading.texi35
-rw-r--r--lispref/processes.texi2
5 files changed, 32 insertions, 24 deletions
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index fd858670eff..0021fe9294f 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,10 @@
12007-04-01 Karl Berry <karl@gnu.org>
2
3 * processes.texi (Low-Level Network): typo.
4 * loading.texi (Hooks for Loading): avoid double "the".
5 * keymaps.texi (Key Sequences): no double "and".
6 (Changing Key Bindings): shorten to improve line break.
7
12007-03-31 Glenn Morris <rgm@gnu.org> 82007-03-31 Glenn Morris <rgm@gnu.org>
2 9
3 * os.texi (Timers): Fix description of run-at-time TIME formats. 10 * os.texi (Timers): Fix description of run-at-time TIME formats.
diff --git a/lispref/commands.texi b/lispref/commands.texi
index e6a995cca42..1d2a649ab68 100644
--- a/lispref/commands.texi
+++ b/lispref/commands.texi
@@ -1605,19 +1605,19 @@ command in the @code{special-event-map} (@pxref{Active Keymaps}).
1605The command is called with no arguments, and the specific signal event is 1605The command is called with no arguments, and the specific signal event is
1606available in @code{last-input-event}. For example: 1606available in @code{last-input-event}. For example:
1607 1607
1608@example 1608@smallexample
1609(defun sigusr-handler () 1609(defun sigusr-handler ()
1610 (interactive) 1610 (interactive)
1611 (message "Caught signal %S" last-input-event)) 1611 (message "Caught signal %S" last-input-event))
1612 1612
1613(define-key special-event-map [sigusr1] 'sigusr-handler) 1613(define-key special-event-map [sigusr1] 'sigusr-handler)
1614@end example 1614@end smallexample
1615 1615
1616To test the signal handler, you can make Emacs send a signal to itself: 1616To test the signal handler, you can make Emacs send a signal to itself:
1617 1617
1618@example 1618@smallexample
1619(signal-process (emacs-pid) 'sigusr1) 1619(signal-process (emacs-pid) 'sigusr1)
1620@end example 1620@end smallexample
1621@end table 1621@end table
1622 1622
1623 If one of these events arrives in the middle of a key sequence---that 1623 If one of these events arrives in the middle of a key sequence---that
diff --git a/lispref/keymaps.texi b/lispref/keymaps.texi
index 431e23f20e8..344ffa9a2da 100644
--- a/lispref/keymaps.texi
+++ b/lispref/keymaps.texi
@@ -53,7 +53,7 @@ vector. Unless otherwise stated, any Emacs Lisp function that accepts
53a key sequence as an argument can handle both representations. 53a key sequence as an argument can handle both representations.
54 54
55 In the string representation, alphanumeric characters ordinarily 55 In the string representation, alphanumeric characters ordinarily
56stand for themselves; for example, @code{"a"} represents @kbd{a} and 56stand for themselves; for example, @code{"a"} represents @kbd{a}
57and @code{"2"} represents @kbd{2}. Control character events are 57and @code{"2"} represents @kbd{2}. Control character events are
58prefixed by the substring @code{"\C-"}, and meta characters by 58prefixed by the substring @code{"\C-"}, and meta characters by
59@code{"\M-"}; for example, @code{"\C-x"} represents the key @kbd{C-x}. 59@code{"\M-"}; for example, @code{"\C-x"} represents the key @kbd{C-x}.
@@ -1278,7 +1278,7 @@ bindings in a keymap makes no difference for keyboard input, but it
1278does matter for menu keymaps (@pxref{Menu Keymaps}). 1278does matter for menu keymaps (@pxref{Menu Keymaps}).
1279@end defun 1279@end defun
1280 1280
1281 Here is an example that creates a sparse keymap and makes a number of 1281 This example creates a sparse keymap and makes a number of
1282bindings in it: 1282bindings in it:
1283 1283
1284@smallexample 1284@smallexample
diff --git a/lispref/loading.texi b/lispref/loading.texi
index d9bf0af8e50..0d30567eb8e 100644
--- a/lispref/loading.texi
+++ b/lispref/loading.texi
@@ -64,22 +64,23 @@ forms in it, and closes the file.
64 64
65To find the file, @code{load} first looks for a file named 65To find the file, @code{load} first looks for a file named
66@file{@var{filename}.elc}, that is, for a file whose name is 66@file{@var{filename}.elc}, that is, for a file whose name is
67@var{filename} with @samp{.elc} appended. If such a file exists, it is 67@var{filename} with the extension @samp{.elc} appended. If such a
68loaded. If there is no file by that name, then @code{load} looks for a 68file exists, it is loaded. If there is no file by that name, then
69file named @file{@var{filename}.el}. If that file exists, it is loaded. 69@code{load} looks for a file named @file{@var{filename}.el}. If that
70Finally, if neither of those names is found, @code{load} looks for a 70file exists, it is loaded. Finally, if neither of those names is
71file named @var{filename} with nothing appended, and loads it if it 71found, @code{load} looks for a file named @var{filename} with nothing
72exists. (The @code{load} function is not clever about looking at 72appended, and loads it if it exists. (The @code{load} function is not
73@var{filename}. In the perverse case of a file named @file{foo.el.el}, 73clever about looking at @var{filename}. In the perverse case of a
74evaluation of @code{(load "foo.el")} will indeed find it.) 74file named @file{foo.el.el}, evaluation of @code{(load "foo.el")} will
75 75indeed find it.)
76If Auto Compression mode is enabled, as it is by default, then 76
77if @code{load} can not find a file, it searches for a compressed 77If Auto Compression mode is enabled, as it is by default, then if
78version of the file before trying other file names. It decompresses 78@code{load} can not find a file, it searches for a compressed version
79and loads it if it exists. It looks for compressed versions by 79of the file before trying other file names. It decompresses and loads
80appending the suffixes in @code{jka-compr-load-suffixes} to the file 80it if it exists. It looks for compressed versions by appending each
81name. The value of this variable must be a list of strings. Its 81of the suffixes in @code{jka-compr-load-suffixes} to the file name.
82standard value is @code{(".gz")}. 82The value of this variable must be a list of strings. Its standard
83value is @code{(".gz")}.
83 84
84If the optional argument @var{nosuffix} is non-@code{nil}, then 85If the optional argument @var{nosuffix} is non-@code{nil}, then
85@code{load} does not try the suffixes @samp{.elc} and @samp{.el}. In 86@code{load} does not try the suffixes @samp{.elc} and @samp{.el}. In
@@ -958,7 +959,7 @@ element looks like this:
958 959
959The key @var{regexp-or-feature} is either a regular expression or a 960The key @var{regexp-or-feature} is either a regular expression or a
960symbol, and the value is a list of forms. The forms are evaluated when 961symbol, and the value is a list of forms. The forms are evaluated when
961the key matches the the absolute true name of the file being 962the key matches the absolute true name of the file being
962@code{load}ed or the symbol being @code{provide}d. 963@code{load}ed or the symbol being @code{provide}d.
963@end defvar 964@end defvar
964 965
diff --git a/lispref/processes.texi b/lispref/processes.texi
index b4e3237f5ed..71e45f4e6f7 100644
--- a/lispref/processes.texi
+++ b/lispref/processes.texi
@@ -1726,7 +1726,7 @@ sets its remote peer address to @var{address}.
1726@section Low-Level Network Access 1726@section Low-Level Network Access
1727 1727
1728 You can also create network connections by operating at a lower 1728 You can also create network connections by operating at a lower
1729level that that of @code{open-network-stream}, using 1729level than that of @code{open-network-stream}, using
1730@code{make-network-process}. 1730@code{make-network-process}.
1731 1731
1732@menu 1732@menu