aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2008-06-27 02:14:52 +0000
committerGlenn Morris2008-06-27 02:14:52 +0000
commit04bf5b655a9b5c0b82d8f54f96ab0f90241f6ab8 (patch)
treeffeae66e55a3c7757fac38c639292dce799c6fa7
parent5618fbd2c79e982d717eaaec749eeb16382ddc04 (diff)
downloademacs-04bf5b655a9b5c0b82d8f54f96ab0f90241f6ab8.tar.gz
emacs-04bf5b655a9b5c0b82d8f54f96ab0f90241f6ab8.zip
American English spelling fix.
-rw-r--r--etc/termcap.src2
-rw-r--r--leim/quail/latin-pre.el2
-rw-r--r--lisp/ChangeLog.122
-rw-r--r--lisp/ChangeLog.132
-rw-r--r--lisp/ChangeLog.52
-rw-r--r--lisp/ChangeLog.92
-rw-r--r--lisp/kmacro.el2
-rw-r--r--lisp/mwheel.el2
-rw-r--r--lisp/net/tramp.el2
-rw-r--r--lisp/nxml/rng-valid.el2
-rw-r--r--lisp/subr.el2
-rw-r--r--lisp/url/url-gw.el5
-rw-r--r--src/ChangeLog.12
-rw-r--r--src/ChangeLog.92
-rw-r--r--src/lread.c2
-rw-r--r--src/process.c2
-rw-r--r--src/w32proc.c14
-rw-r--r--src/w32xfns.c6
-rw-r--r--src/window.c2
19 files changed, 29 insertions, 28 deletions
diff --git a/etc/termcap.src b/etc/termcap.src
index def2df31ec9..ae7a3e390a3 100644
--- a/etc/termcap.src
+++ b/etc/termcap.src
@@ -13980,7 +13980,7 @@ mai|basic4|MAI Basic Four in ansi mode:\
13980# The Basis 108 was a Apple II clone, manufactured by the "Basis 13980# The Basis 108 was a Apple II clone, manufactured by the "Basis
13981# Mikrocomputer GmbH" in Munster, Germany (the company still exists today, 13981# Mikrocomputer GmbH" in Munster, Germany (the company still exists today,
13982# about 1,5 km from where I live, but doesn't build own computers any 13982# about 1,5 km from where I live, but doesn't build own computers any
13983# more). A Basis 108 featured a really heavy (cast aluminium?) case, was 13983# more). A Basis 108 featured a really heavy (cast aluminum?) case, was
13984# equipped with one or two 5.25" disk drives, had a monochrome and colour 13984# equipped with one or two 5.25" disk drives, had a monochrome and colour
13985# video output for a TV set or a dedicated monitor and several slots for 13985# video output for a TV set or a dedicated monitor and several slots for
13986# Apple II cards. Basis 108 were quite popular at german schools before 13986# Apple II cards. Basis 108 were quite popular at german schools before
diff --git a/leim/quail/latin-pre.el b/leim/quail/latin-pre.el
index bb4e49303e6..c8040e83157 100644
--- a/leim/quail/latin-pre.el
+++ b/leim/quail/latin-pre.el
@@ -41,7 +41,7 @@
41;; You might make extra input sequences on the basis of the X 41;; You might make extra input sequences on the basis of the X
42;; locale/*/Compose files (which have both prefix and postfix 42;; locale/*/Compose files (which have both prefix and postfix
43;; sequences), but bear in mind that sequences which are logical in 43;; sequences), but bear in mind that sequences which are logical in
44;; that context may not be sensible when they're not signalled with 44;; that context may not be sensible when they're not signaled with
45;; the Compose key. An example is a double space for NBSP. 45;; the Compose key. An example is a double space for NBSP.
46 46
47;;; Code: 47;;; Code:
diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12
index 53feb90c0d4..1ab643c9ff5 100644
--- a/lisp/ChangeLog.12
+++ b/lisp/ChangeLog.12
@@ -12372,7 +12372,7 @@
12372 (gud-watch, gdb-var-create-handler): Display function::var format 12372 (gud-watch, gdb-var-create-handler): Display function::var format
12373 but don't use to create variable object. 12373 but don't use to create variable object.
12374 (gdb-var-create-handler): Use message-box in place of message. 12374 (gdb-var-create-handler): Use message-box in place of message.
12375 (gdb-stopped): Call gdb-exited if signalled. 12375 (gdb-stopped): Call gdb-exited if signaled.
12376 12376
123772006-02-22 Carsten Dominik <dominik@science.uva.nl> 123772006-02-22 Carsten Dominik <dominik@science.uva.nl>
12378 12378
diff --git a/lisp/ChangeLog.13 b/lisp/ChangeLog.13
index 9bcf436c73d..43ccb0b4ff8 100644
--- a/lisp/ChangeLog.13
+++ b/lisp/ChangeLog.13
@@ -4554,7 +4554,7 @@
4554 * doc-view.el (doc-view-scroll-up-or-next-page) 4554 * doc-view.el (doc-view-scroll-up-or-next-page)
4555 (doc-view-scroll-down-or-previous-page): Use image-scroll-up and 4555 (doc-view-scroll-down-or-previous-page): Use image-scroll-up and
4556 image-scroll-down instead of the non-image equivalents. 4556 image-scroll-down instead of the non-image equivalents.
4557 Don't rely on a signalled condition but switch pages when scrolling 4557 Don't rely on a signaled condition but switch pages when scrolling
4558 doesn't change the vertical position anymore. 4558 doesn't change the vertical position anymore.
4559 (doc-view-mode-map): Remap scroll-{up,down} to 4559 (doc-view-mode-map): Remap scroll-{up,down} to
4560 image-scroll-{up,down}. 4560 image-scroll-{up,down}.
diff --git a/lisp/ChangeLog.5 b/lisp/ChangeLog.5
index b795bfc4910..ee88e5b073a 100644
--- a/lisp/ChangeLog.5
+++ b/lisp/ChangeLog.5
@@ -291,7 +291,7 @@
291 branch and removes any locks that might remain after check-in. 291 branch and removes any locks that might remain after check-in.
292 292
293 (vc-cancel-version): Abort with error message in the CVS case. 293 (vc-cancel-version): Abort with error message in the CVS case.
294 (The error used to be signalled in vc-backend-uncheck, which is 294 (The error used to be signaled in vc-backend-uncheck, which is
295 a little too late.) 295 a little too late.)
296 296
297 (vc-minor-revision): Function removed. 297 (vc-minor-revision): Function removed.
diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9
index e752a2c3086..7134dcbb6b1 100644
--- a/lisp/ChangeLog.9
+++ b/lisp/ChangeLog.9
@@ -9989,7 +9989,7 @@
9989 9989
99902000-10-19 Jason Rumney <jasonr@gnu.org> 99902000-10-19 Jason Rumney <jasonr@gnu.org>
9991 9991
9992 * dired.el (dired-insert-directory): Do not let errors signalled by 9992 * dired.el (dired-insert-directory): Do not let errors signaled by
9993 attempt to run dired-free-space-program prevent dired from working. 9993 attempt to run dired-free-space-program prevent dired from working.
9994 9994
99952000-10-19 Stefan Monnier <monnier@cs.yale.edu> 99952000-10-19 Stefan Monnier <monnier@cs.yale.edu>
diff --git a/lisp/kmacro.el b/lisp/kmacro.el
index e9b2676acf7..1abe3178cc3 100644
--- a/lisp/kmacro.el
+++ b/lisp/kmacro.el
@@ -39,7 +39,7 @@
39;; you can give a numeric prefix argument specifying the number of 39;; you can give a numeric prefix argument specifying the number of
40;; times to repeat the macro. Macro execution automatically 40;; times to repeat the macro. Macro execution automatically
41;; terminates when point reaches the end of the buffer or if an error 41;; terminates when point reaches the end of the buffer or if an error
42;; is signalled by ringing the bell. 42;; is signaled by ringing the bell.
43 43
44;; When you define a macro with F3/F4, it is automatically added to 44;; When you define a macro with F3/F4, it is automatically added to
45;; the head of the "keyboard macro ring", and F4 actually executes the 45;; the head of the "keyboard macro ring", and F4 actually executes the
diff --git a/lisp/mwheel.el b/lisp/mwheel.el
index 7e38b2e8434..75d6a44ccba 100644
--- a/lisp/mwheel.el
+++ b/lisp/mwheel.el
@@ -220,7 +220,7 @@ This should only be bound to mouse buttons 4 and 5."
220 ;; If the first scroll succeeded, then some scrolling 220 ;; If the first scroll succeeded, then some scrolling
221 ;; is possible: keep scrolling til the beginning but 221 ;; is possible: keep scrolling til the beginning but
222 ;; do not signal an error. For some reason, we have 222 ;; do not signal an error. For some reason, we have
223 ;; to do it even if the first scroll signalled an 223 ;; to do it even if the first scroll signaled an
224 ;; error, because otherwise the window is recentered 224 ;; error, because otherwise the window is recentered
225 ;; for a reason that escapes me. This problem seems 225 ;; for a reason that escapes me. This problem seems
226 ;; to only affect scroll-down. --Stef 226 ;; to only affect scroll-down. --Stef
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 5918db6df4a..6dd76abc610 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -4404,7 +4404,7 @@ pass to the OPERATION."
4404 4404
4405;; We handle here all file primitives. Most of them have the file 4405;; We handle here all file primitives. Most of them have the file
4406;; name as first parameter; nevertheless we check for them explicitly 4406;; name as first parameter; nevertheless we check for them explicitly
4407;; in order to be signalled if a new primitive appears. This 4407;; in order to be signaled if a new primitive appears. This
4408;; scenario is needed because there isn't a way to decide by 4408;; scenario is needed because there isn't a way to decide by
4409;; syntactical means whether a foreign method must be called. It would 4409;; syntactical means whether a foreign method must be called. It would
4410;; ease the life if `file-name-handler-alist' would support a decision 4410;; ease the life if `file-name-handler-alist' would support a decision
diff --git a/lisp/nxml/rng-valid.el b/lisp/nxml/rng-valid.el
index 74e18cde5bc..eac8172b2ba 100644
--- a/lisp/nxml/rng-valid.el
+++ b/lisp/nxml/rng-valid.el
@@ -481,7 +481,7 @@ The schema is set like `rng-auto-set-schema'."
481 (let ((rng-dt-namespace-context-getter '(nxml-ns-get-context))) 481 (let ((rng-dt-namespace-context-getter '(nxml-ns-get-context)))
482 (nxml-with-unmodifying-text-property-changes 482 (nxml-with-unmodifying-text-property-changes
483 (rng-do-some-validation-1 continue-p-function)))) 483 (rng-do-some-validation-1 continue-p-function))))
484 ;; errors signalled from a function run by an idle timer 484 ;; errors signaled from a function run by an idle timer
485 ;; are ignored; if we don't catch them, validation 485 ;; are ignored; if we don't catch them, validation
486 ;; will get mysteriously stuck at a single place 486 ;; will get mysteriously stuck at a single place
487 (rng-compile-error 487 (rng-compile-error
diff --git a/lisp/subr.el b/lisp/subr.el
index 8c9491a7195..b673980510c 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2643,7 +2643,7 @@ More specifically if `debug-on-error' is set, then it does not catch any signal.
2643 "Run BODY and demote any errors to simple messages. 2643 "Run BODY and demote any errors to simple messages.
2644If `debug-on-error' is non-nil, run BODY without catching its errors. 2644If `debug-on-error' is non-nil, run BODY without catching its errors.
2645This is to be used around code which is not expected to signal an error 2645This is to be used around code which is not expected to signal an error
2646but which should be robust in the unexpected case that an error is signalled." 2646but which should be robust in the unexpected case that an error is signaled."
2647 (declare (debug t) (indent 0)) 2647 (declare (debug t) (indent 0))
2648 (let ((err (make-symbol "err"))) 2648 (let ((err (make-symbol "err")))
2649 `(condition-case-no-debug ,err 2649 `(condition-case-no-debug ,err
diff --git a/lisp/url/url-gw.el b/lisp/url/url-gw.el
index 17f7b77b173..e5021bec52f 100644
--- a/lisp/url/url-gw.el
+++ b/lisp/url/url-gw.el
@@ -1,6 +1,7 @@
1;;; url-gw.el --- Gateway munging for URL loading 1;;; url-gw.el --- Gateway munging for URL loading
2 2
3;; Copyright (C) 1997, 1998, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. 3;; Copyright (C) 1997, 1998, 2004, 2005, 2006, 2007, 2008
4;; Free Software Foundation, Inc.
4 5
5;; Author: Bill Perry <wmperry@gnu.org> 6;; Author: Bill Perry <wmperry@gnu.org>
6;; Keywords: comm, data, processes 7;; Keywords: comm, data, processes
@@ -263,7 +264,7 @@ Might do a non-blocking connection; use `process-status' to check."
263 (error "Bad setting of url-gateway-method: %s" 264 (error "Bad setting of url-gateway-method: %s"
264 url-gateway-method))))) 265 url-gateway-method)))))
265 ;; Ignoring errors here seems wrong. E.g. it'll throw away the 266 ;; Ignoring errors here seems wrong. E.g. it'll throw away the
266 ;; error signalled two lines above. It was also found inconvenient 267 ;; error signaled two lines above. It was also found inconvenient
267 ;; during debugging. 268 ;; during debugging.
268 ;; (error 269 ;; (error
269 ;; (setq conn nil)) 270 ;; (setq conn nil))
diff --git a/src/ChangeLog.1 b/src/ChangeLog.1
index 80e3ae98db7..6ba90aa56c9 100644
--- a/src/ChangeLog.1
+++ b/src/ChangeLog.1
@@ -3435,7 +3435,7 @@
3435 is non-nil it is silently bashed; else if the function was 3435 is non-nil it is silently bashed; else if the function was
3436 called interactively the user is queried as to whether s/he 3436 called interactively the user is queried as to whether s/he
3437 wants to bash the file; otherwise (ok-if-exists nil, non-interactive) 3437 wants to bash the file; otherwise (ok-if-exists nil, non-interactive)
3438 a file-already-exists error is signalled. 3438 a file-already-exists error is signaled.
3439 3439
3440 * window.c: Made get-window-buffer return nil if get-buffer of 3440 * window.c: Made get-window-buffer return nil if get-buffer of
3441 its arg returns nil, rather than erring. 3441 its arg returns nil, rather than erring.
diff --git a/src/ChangeLog.9 b/src/ChangeLog.9
index d725e50d966..55ada360995 100644
--- a/src/ChangeLog.9
+++ b/src/ChangeLog.9
@@ -12883,7 +12883,7 @@
12883 * editfns.c (Fchar_after, Fchar_before): Doc fix. 12883 * editfns.c (Fchar_after, Fchar_before): Doc fix.
12884 12884
12885 * bytecode.c (Fbyte_code): Use {BEFORE,AFTER}_POTENTIAL_GC where 12885 * bytecode.c (Fbyte_code): Use {BEFORE,AFTER}_POTENTIAL_GC where
12886 an error may be signalled. 12886 an error may be signaled.
12887 12887
128882000-01-26 Gerd Moellmann <gerd@gnu.org> 128882000-01-26 Gerd Moellmann <gerd@gnu.org>
12889 12889
diff --git a/src/lread.c b/src/lread.c
index 3e0bd1ff671..9e543f88fae 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -3104,7 +3104,7 @@ substitute_object_recurse (object, placeholder, subtree)
3104 else 3104 else
3105 /* An unknown pseudovector may contain non-Lisp fields, so we 3105 /* An unknown pseudovector may contain non-Lisp fields, so we
3106 can't just blindly traverse all its fields. We used to call 3106 can't just blindly traverse all its fields. We used to call
3107 `Flength' which signalled `sequencep', so I just preserved this 3107 `Flength' which signaled `sequencep', so I just preserved this
3108 behavior. */ 3108 behavior. */
3109 wrong_type_argument (Qsequencep, subtree); 3109 wrong_type_argument (Qsequencep, subtree);
3110 3110
diff --git a/src/process.c b/src/process.c
index 73bbb34fd01..0ddeb517290 100644
--- a/src/process.c
+++ b/src/process.c
@@ -3511,7 +3511,7 @@ usage: (make-network-process &rest ARGS) */)
3511 3511
3512 /* Parse network options in the arg list. 3512 /* Parse network options in the arg list.
3513 We simply ignore anything which isn't a known option (including other keywords). 3513 We simply ignore anything which isn't a known option (including other keywords).
3514 An error is signalled if setting a known option fails. */ 3514 An error is signaled if setting a known option fails. */
3515 for (optn = optbits = 0; optn < nargs-1; optn += 2) 3515 for (optn = optbits = 0; optn < nargs-1; optn += 2)
3516 optbits |= set_socket_option (s, args[optn], args[optn+1]); 3516 optbits |= set_socket_option (s, args[optn], args[optn+1]);
3517 3517
diff --git a/src/w32proc.c b/src/w32proc.c
index 56369e63281..91722df87ae 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -274,7 +274,7 @@ find_child_pid (DWORD pid)
274 274
275/* Thread proc for child process and socket reader threads. Each thread 275/* Thread proc for child process and socket reader threads. Each thread
276 is normally blocked until woken by select() to check for input by 276 is normally blocked until woken by select() to check for input by
277 reading one char. When the read completes, char_avail is signalled 277 reading one char. When the read completes, char_avail is signaled
278 to wake up the select emulator and the thread blocks itself again. */ 278 to wake up the select emulator and the thread blocks itself again. */
279DWORD WINAPI 279DWORD WINAPI
280reader_thread (void *arg) 280reader_thread (void *arg)
@@ -1088,7 +1088,7 @@ sys_spawnve (int mode, char *cmdname, char **argv, char **envp)
1088 1088
1089 To reduce the number of places in which Emacs can be hung such that 1089 To reduce the number of places in which Emacs can be hung such that
1090 C-g is not able to interrupt it, we always wait on interrupt_handle 1090 C-g is not able to interrupt it, we always wait on interrupt_handle
1091 (which is signalled by the input thread when C-g is detected). If we 1091 (which is signaled by the input thread when C-g is detected). If we
1092 detect that we were woken up by C-g, we return -1 with errno set to 1092 detect that we were woken up by C-g, we return -1 with errno set to
1093 EINTR as on Unix. */ 1093 EINTR as on Unix. */
1094 1094
@@ -1185,7 +1185,7 @@ sys_select (int nfds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds,
1185 current_status = cp->status; 1185 current_status = cp->status;
1186 if (WaitForSingleObject (cp->char_avail, 0) == WAIT_OBJECT_0) 1186 if (WaitForSingleObject (cp->char_avail, 0) == WAIT_OBJECT_0)
1187 { 1187 {
1188 /* char_avail has been signalled, so status (which may 1188 /* char_avail has been signaled, so status (which may
1189 have changed) should indicate read has completed 1189 have changed) should indicate read has completed
1190 but has not been acknowledged. */ 1190 but has not been acknowledged. */
1191 current_status = cp->status; 1191 current_status = cp->status;
@@ -1196,9 +1196,9 @@ sys_select (int nfds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds,
1196 } 1196 }
1197 else 1197 else
1198 { 1198 {
1199 /* char_avail has not been signalled, so status should 1199 /* char_avail has not been signaled, so status should
1200 indicate that read is in progress; small possibility 1200 indicate that read is in progress; small possibility
1201 that read has completed but event wasn't yet signalled 1201 that read has completed but event wasn't yet signaled
1202 when we tested it (because a context switch occurred 1202 when we tested it (because a context switch occurred
1203 or if running on separate CPUs). */ 1203 or if running on separate CPUs). */
1204 if (current_status != STATUS_READ_READY 1204 if (current_status != STATUS_READ_READY
@@ -1264,7 +1264,7 @@ count_children:
1264 1264
1265 start_time = GetTickCount (); 1265 start_time = GetTickCount ();
1266 1266
1267 /* Wait for input or child death to be signalled. If user input is 1267 /* Wait for input or child death to be signaled. If user input is
1268 allowed, then also accept window messages. */ 1268 allowed, then also accept window messages. */
1269 if (FD_ISSET (0, &orfds)) 1269 if (FD_ISSET (0, &orfds))
1270 active = MsgWaitForMultipleObjects (nh + nc, wait_hnd, FALSE, timeout_ms, 1270 active = MsgWaitForMultipleObjects (nh + nc, wait_hnd, FALSE, timeout_ms,
@@ -1301,7 +1301,7 @@ count_children:
1301 abort (); 1301 abort ();
1302 1302
1303 /* Loop over all handles after active (now officially documented as 1303 /* Loop over all handles after active (now officially documented as
1304 being the first signalled handle in the array). We do this to 1304 being the first signaled handle in the array). We do this to
1305 ensure fairness, so that all channels with data available will be 1305 ensure fairness, so that all channels with data available will be
1306 processed - otherwise higher numbered channels could be starved. */ 1306 processed - otherwise higher numbered channels could be starved. */
1307 do 1307 do
diff --git a/src/w32xfns.c b/src/w32xfns.c
index 115b0363dd8..682876c6b25 100644
--- a/src/w32xfns.c
+++ b/src/w32xfns.c
@@ -46,12 +46,12 @@ init_crit ()
46 when the input queue is empty, so make it a manual reset event. */ 46 when the input queue is empty, so make it a manual reset event. */
47 keyboard_handle = input_available = CreateEvent (NULL, TRUE, FALSE, NULL); 47 keyboard_handle = input_available = CreateEvent (NULL, TRUE, FALSE, NULL);
48 48
49 /* interrupt_handle is signalled when quit (C-g) is detected, so that 49 /* interrupt_handle is signaled when quit (C-g) is detected, so that
50 blocking system calls can be interrupted. We make it a manual 50 blocking system calls can be interrupted. We make it a manual
51 reset event, so that if we should ever have multiple threads 51 reset event, so that if we should ever have multiple threads
52 performing system calls, they will all be interrupted (I'm guessing 52 performing system calls, they will all be interrupted (I'm guessing
53 that would the right response). Note that we use PulseEvent to 53 that would the right response). Note that we use PulseEvent to
54 signal this event, so that it never remains signalled. */ 54 signal this event, so that it never remains signaled. */
55 interrupt_handle = CreateEvent (NULL, TRUE, FALSE, NULL); 55 interrupt_handle = CreateEvent (NULL, TRUE, FALSE, NULL);
56} 56}
57 57
@@ -75,7 +75,7 @@ delete_crit ()
75void 75void
76signal_quit () 76signal_quit ()
77{ 77{
78 /* Make sure this event never remains signalled; if the main thread 78 /* Make sure this event never remains signaled; if the main thread
79 isn't in a blocking call, then this should do nothing. */ 79 isn't in a blocking call, then this should do nothing. */
80 PulseEvent (interrupt_handle); 80 PulseEvent (interrupt_handle);
81} 81}
diff --git a/src/window.c b/src/window.c
index 27db0296dcf..43b96534427 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4173,7 +4173,7 @@ enlarge_window (window, delta, horiz_flag)
4173 4173
4174 The number of children n equals the number of resizable 4174 The number of children n equals the number of resizable
4175 children of this window + 1 because we know window itself 4175 children of this window + 1 because we know window itself
4176 is resizable (otherwise we would have signalled an error). 4176 is resizable (otherwise we would have signaled an error).
4177 4177
4178 This reasoning is not correct when other windows become too 4178 This reasoning is not correct when other windows become too
4179 small and shrink_windows refuses to delete them. Below we 4179 small and shrink_windows refuses to delete them. Below we