diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog.1 | 3 | ||||
| -rw-r--r-- | src/ChangeLog.10 | 3 | ||||
| -rw-r--r-- | src/ChangeLog.11 | 4 | ||||
| -rw-r--r-- | src/ChangeLog.2 | 3 | ||||
| -rw-r--r-- | src/ChangeLog.3 | 10 | ||||
| -rw-r--r-- | src/ChangeLog.8 | 4 | ||||
| -rw-r--r-- | src/bytecode.c | 2 | ||||
| -rw-r--r-- | src/character.c | 2 | ||||
| -rw-r--r-- | src/data.c | 2 | ||||
| -rw-r--r-- | src/regex.h | 2 | ||||
| -rw-r--r-- | src/s/msdos.h | 3 | ||||
| -rw-r--r-- | src/window.c | 2 | ||||
| -rw-r--r-- | src/xdisp.c | 2 |
13 files changed, 19 insertions, 23 deletions
diff --git a/src/ChangeLog.1 b/src/ChangeLog.1 index e32db190cd0..830905cd0b5 100644 --- a/src/ChangeLog.1 +++ b/src/ChangeLog.1 @@ -2375,7 +2375,7 @@ Often, just return what it returned. `error' still never returns to its caller. - * Signalling Qargs_out_of_range: + * Signaling Qargs_out_of_range: Use new functions args_out_of_range and args_out_of_range_3 (in data.c) to do this. @@ -3537,4 +3537,3 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. - diff --git a/src/ChangeLog.10 b/src/ChangeLog.10 index 6152b4c76af..9b61d107059 100644 --- a/src/ChangeLog.10 +++ b/src/ChangeLog.10 @@ -5133,7 +5133,7 @@ it can be called in a signal handler. (x_catch_errors_unwind): Function deleted. (x_uncatch_errors): Deallocate last x_error_message_stack struct. - (x_check_errors): Call x_uncatch_errors before signalling error. + (x_check_errors): Call x_uncatch_errors before signaling error. (x_load_font, x_term_init, XTmouse_position, handle_one_xevent) (x_connection_closed, x_list_fonts): Use new versions of @@ -27928,4 +27928,3 @@ See ChangeLog.9 for earlier changes. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. - diff --git a/src/ChangeLog.11 b/src/ChangeLog.11 index bd1a6ec5918..49bafda36a0 100644 --- a/src/ChangeLog.11 +++ b/src/ChangeLog.11 @@ -11972,7 +11972,7 @@ * image.c (xbm_read_bitmap_data): New arg inhibit_image_error. (xbm_load_image): Caller changed. - (xbm_file_p): Avoid signalling an image_error (Bug#4107). + (xbm_file_p): Avoid signaling an image_error (Bug#4107). 2009-08-13 Nick Roberts <nickrob@snap.net.nz> @@ -16658,7 +16658,7 @@ 2008-08-20 Chong Yidong <cyd@stupidchicken.com> * xselect.c (x_get_foreign_selection): Return nil if desired - selection could not be obtained, instead of signalling an error. + selection could not be obtained, instead of signaling an error. 2008-08-20 David Reitter <david.reitter@gmail.com> diff --git a/src/ChangeLog.2 b/src/ChangeLog.2 index ca7feaee9f5..05e448c043c 100644 --- a/src/ChangeLog.2 +++ b/src/ChangeLog.2 @@ -1222,7 +1222,7 @@ 1987-07-10 Chris Hanson (cph@prep) * xterm.h: Define macros to abstract control of input signals. - Alternate set of macros for hp-ux does no signalling. + Alternate set of macros for hp-ux does no signaling. * xterm.c: * xfns.c: @@ -4787,4 +4787,3 @@ See ChangeLog.1 for earlier changes. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. - diff --git a/src/ChangeLog.3 b/src/ChangeLog.3 index 79a580938d7..2b63ed11bcc 100644 --- a/src/ChangeLog.3 +++ b/src/ChangeLog.3 @@ -900,9 +900,9 @@ invalid overlay. (syms_of_buffer): defsubr Soverlayp; initialize Qoverlayp. (Fdelete_overlay): Set the overlay's markers to point nowhere. - Use CHECK_OVERLAY instead of signalling a special error. + Use CHECK_OVERLAY instead of signaling a special error. (Fmove_overlay, Foverlay_put): Use CHECK_OVERLAY instead of - signalling a special error. + signaling a special error. (Foverlay_get): Use CHECK_OVERLAY. * fns.c (internal_equal): Define this for overlays. * buffer.h (OVERLAY_VALID): Define in terms of OVERLAYP. @@ -5549,7 +5549,7 @@ h->poll_suppress_count. * eval.c (Fsignal): It's okay for the debugger to return to the - caller if the caller was signalling a quit. + caller if the caller was signaling a quit. * eval.c (unbind_catch): Restore the polling suppression count here, instead of in Fsignal and Fthrow. @@ -10592,7 +10592,7 @@ (init_x_parm_symbols, x_set_screen_param): Use x_screen_parms instead of a large switch statement. (x_figure_window_size): Make the default case of the switch call - abort instead of signalling an error, since window_prompting's + abort instead of signaling an error, since window_prompting's value is internally generated. 1991-05-01 Jim Blandy (jimb@churchy.gnu.ai.mit.edu) @@ -14884,7 +14884,7 @@ 1989-08-07 Richard Stallman (rms@sugar-bombs.ai.mit.edu) - * fileio.c (barf_or_query_if_file_exists): When signalling, + * fileio.c (barf_or_query_if_file_exists): When signaling, provide the expected args for a file-error. 1989-08-06 Richard Stallman (rms@sugar-bombs.ai.mit.edu) diff --git a/src/ChangeLog.8 b/src/ChangeLog.8 index 6fd4d5dea27..0bb96b55c30 100644 --- a/src/ChangeLog.8 +++ b/src/ChangeLog.8 @@ -919,7 +919,7 @@ 1999-11-28 Eli Zaretskii <eliz@is.elta.co.il> * charset.c (Fmake_char_internal): Print the charset ID when - signalling an error. + signaling an error. * emacs.c (synchronize_locale): Avoid compiler warnings about pointer type mismatch. @@ -7367,7 +7367,7 @@ * xfaces.c (free_font): Removed. (load_face_font_or_fontset): Renamed from load_font. - (load_face_font_or_fontset): Use message2 instead of signalling. + (load_face_font_or_fontset): Use message2 instead of signaling. (load_color): Likewise. (load_pixmap): Likewise. diff --git a/src/bytecode.c b/src/bytecode.c index 9ed29e94b54..91d360bec1b 100644 --- a/src/bytecode.c +++ b/src/bytecode.c @@ -271,7 +271,7 @@ struct byte_stack /* A list of currently active byte-code execution value stacks. Fbyte_code adds an entry to the head of this list before it starts processing byte-code, and it removed the entry again when it is - done. Signalling an error truncates the list analoguous to + done. Signaling an error truncates the list analoguous to gcprolist. */ struct byte_stack *byte_stack_list; diff --git a/src/character.c b/src/character.c index fb9b8a9b93e..c54c0046c53 100644 --- a/src/character.c +++ b/src/character.c @@ -969,7 +969,7 @@ character is a target to get a byte value. In this case, POSITION, if non-nil, is an index of a target character in the string. If the current buffer (or STRING) is multibyte, and the target -character is not ASCII nor 8-bit character, an error is signalled. */) +character is not ASCII nor 8-bit character, an error is signaled. */) (Lisp_Object position, Lisp_Object string) { int c; diff --git a/src/data.c b/src/data.c index 76a54547a5d..e8d2b43198f 100644 --- a/src/data.c +++ b/src/data.c @@ -2028,7 +2028,7 @@ DEFUN ("indirect-function", Findirect_function, Sindirect_function, 1, 2, 0, If OBJECT is not a symbol, just return it. Otherwise, follow all function indirections to find the final function binding and return it. If the final symbol in the chain is unbound, signal a void-function error. -Optional arg NOERROR non-nil means to return nil instead of signalling. +Optional arg NOERROR non-nil means to return nil instead of signaling. Signal a cyclic-function-indirection error if there is a loop in the function chain of symbols. */) (register Lisp_Object object, Lisp_Object noerror) diff --git a/src/regex.h b/src/regex.h index 7747ec57629..eba62f2e769 100644 --- a/src/regex.h +++ b/src/regex.h @@ -415,7 +415,7 @@ struct re_pattern_buffer typedef struct re_pattern_buffer regex_t; /* Type for byte offsets within the string. POSIX mandates this to be an int, - but the Open Group has signalled its intention to change the requirement to + but the Open Group has signaled its intention to change the requirement to be that regoff_t be at least as wide as ptrdiff_t and ssize_t. Current gnulib sources also use ssize_t, and we need this for supporting buffers and strings > 2GB on 64-bit hosts. */ diff --git a/src/s/msdos.h b/src/s/msdos.h index 29ca0629899..9ee13d12867 100644 --- a/src/s/msdos.h +++ b/src/s/msdos.h @@ -119,7 +119,7 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */ #ifdef HAVE_X_WINDOWS /* We need a little extra space, see ../../lisp/loadup.el and the commentary below, in the non-X branch. The 140KB number was - measured on GNU/Linux and on MS-WIndows. */ + measured on GNU/Linux and on MS-Windows. */ #define SYSTEM_PURESIZE_EXTRA (-170000+140000) #else /* We need a little extra space, see ../../lisp/loadup.el. @@ -138,4 +138,3 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */ registers relevant for conservative garbage collection in the jmp_buf. */ #define GC_SETJMP_WORKS 1 #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS - diff --git a/src/window.c b/src/window.c index 0a780a0170a..9c7e1349011 100644 --- a/src/window.c +++ b/src/window.c @@ -2344,7 +2344,7 @@ Anything else means consider all windows on WINDOW's frame and no others. If WINDOW is not on the list of windows returned, some other window will -be listed first but no error is signalled. */) +be listed first but no error is signaled. */) (Lisp_Object window, Lisp_Object minibuf, Lisp_Object all_frames) { return window_list_1 (window, minibuf, all_frames); diff --git a/src/xdisp.c b/src/xdisp.c index 6129c5e566f..15355e2d47a 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -23627,7 +23627,7 @@ produce_stretch_glyph (struct it *it) { width = it->last_visible_x - it->current_x; #ifdef HAVE_WINDOW_SYSTEM - /* Subtact one more pixel from the stretch width, but only on + /* Subtract one more pixel from the stretch width, but only on GUI frames, since on a TTY each glyph is one "pixel" wide. */ width -= FRAME_WINDOW_P (it->f); #endif |