From: Karl Berry Date: Sun, 1 Apr 2007 18:11:15 +0000 (+0000) Subject: wording matters X-Git-Tag: emacs-pretest-22.0.97~49 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=15bcde049f2044769a3df1fc6fc7c72aaddf80e0;p=emacs.git wording matters --- diff --git a/lispref/ChangeLog b/lispref/ChangeLog index fd858670eff..0021fe9294f 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog @@ -1,3 +1,10 @@ +2007-04-01 Karl Berry + + * processes.texi (Low-Level Network): typo. + * loading.texi (Hooks for Loading): avoid double "the". + * keymaps.texi (Key Sequences): no double "and". + (Changing Key Bindings): shorten to improve line break. + 2007-03-31 Glenn Morris * 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}). The command is called with no arguments, and the specific signal event is available in @code{last-input-event}. For example: -@example +@smallexample (defun sigusr-handler () (interactive) (message "Caught signal %S" last-input-event)) (define-key special-event-map [sigusr1] 'sigusr-handler) -@end example +@end smallexample To test the signal handler, you can make Emacs send a signal to itself: -@example +@smallexample (signal-process (emacs-pid) 'sigusr1) -@end example +@end smallexample @end table 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 a key sequence as an argument can handle both representations. In the string representation, alphanumeric characters ordinarily -stand for themselves; for example, @code{"a"} represents @kbd{a} and +stand for themselves; for example, @code{"a"} represents @kbd{a} and @code{"2"} represents @kbd{2}. Control character events are prefixed by the substring @code{"\C-"}, and meta characters by @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 does matter for menu keymaps (@pxref{Menu Keymaps}). @end defun - Here is an example that creates a sparse keymap and makes a number of + This example creates a sparse keymap and makes a number of bindings in it: @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. To find the file, @code{load} first looks for a file named @file{@var{filename}.elc}, that is, for a file whose name is -@var{filename} with @samp{.elc} appended. If such a file exists, it is -loaded. If there is no file by that name, then @code{load} looks for a -file named @file{@var{filename}.el}. If that file exists, it is loaded. -Finally, if neither of those names is found, @code{load} looks for a -file named @var{filename} with nothing appended, and loads it if it -exists. (The @code{load} function is not clever about looking at -@var{filename}. In the perverse case of a file named @file{foo.el.el}, -evaluation of @code{(load "foo.el")} will indeed find it.) - -If Auto Compression mode is enabled, as it is by default, then -if @code{load} can not find a file, it searches for a compressed -version of the file before trying other file names. It decompresses -and loads it if it exists. It looks for compressed versions by -appending the suffixes in @code{jka-compr-load-suffixes} to the file -name. The value of this variable must be a list of strings. Its -standard value is @code{(".gz")}. +@var{filename} with the extension @samp{.elc} appended. If such a +file exists, it is loaded. If there is no file by that name, then +@code{load} looks for a file named @file{@var{filename}.el}. If that +file exists, it is loaded. Finally, if neither of those names is +found, @code{load} looks for a file named @var{filename} with nothing +appended, and loads it if it exists. (The @code{load} function is not +clever about looking at @var{filename}. In the perverse case of a +file named @file{foo.el.el}, evaluation of @code{(load "foo.el")} will +indeed find it.) + +If Auto Compression mode is enabled, as it is by default, then if +@code{load} can not find a file, it searches for a compressed version +of the file before trying other file names. It decompresses and loads +it if it exists. It looks for compressed versions by appending each +of the suffixes in @code{jka-compr-load-suffixes} to the file name. +The value of this variable must be a list of strings. Its standard +value is @code{(".gz")}. If the optional argument @var{nosuffix} is non-@code{nil}, then @code{load} does not try the suffixes @samp{.elc} and @samp{.el}. In @@ -958,7 +959,7 @@ element looks like this: The key @var{regexp-or-feature} is either a regular expression or a symbol, and the value is a list of forms. The forms are evaluated when -the key matches the the absolute true name of the file being +the key matches the absolute true name of the file being @code{load}ed or the symbol being @code{provide}d. @end defvar 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}. @section Low-Level Network Access You can also create network connections by operating at a lower -level that that of @code{open-network-stream}, using +level than that of @code{open-network-stream}, using @code{make-network-process}. @menu