diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog.10 | 2 | ||||
| -rw-r--r-- | src/ChangeLog.12 | 2 | ||||
| -rw-r--r-- | src/ChangeLog.4 | 2 | ||||
| -rw-r--r-- | src/ChangeLog.5 | 2 | ||||
| -rw-r--r-- | src/ChangeLog.7 | 2 | ||||
| -rw-r--r-- | src/buffer.c | 2 | ||||
| -rw-r--r-- | src/emacs-module.c | 2 | ||||
| -rw-r--r-- | src/emacsgtkfixed.c | 2 | ||||
| -rw-r--r-- | src/fileio.c | 2 | ||||
| -rw-r--r-- | src/frame.h | 2 | ||||
| -rw-r--r-- | src/keyboard.h | 2 | ||||
| -rw-r--r-- | src/nsterm.m | 2 | ||||
| -rw-r--r-- | src/scroll.c | 2 | ||||
| -rw-r--r-- | src/termhooks.h | 2 | ||||
| -rw-r--r-- | src/w32inevt.c | 2 | ||||
| -rw-r--r-- | src/w32proc.c | 2 |
16 files changed, 16 insertions, 16 deletions
diff --git a/src/ChangeLog.10 b/src/ChangeLog.10 index 1bd822d492f..f5eb88be961 100644 --- a/src/ChangeLog.10 +++ b/src/ChangeLog.10 @@ -3958,7 +3958,7 @@ 2006-05-12 Chong Yidong <cyd@stupidchicken.com> - * intervals.c (set_point_both): Fix mixup before before and after + * intervals.c (set_point_both): Fix mixup before and after in variable names. * editfns.c (Fline_beginning_position): Inhibit point-motion hooks diff --git a/src/ChangeLog.12 b/src/ChangeLog.12 index 61251bfbb47..2291e85e8cb 100644 --- a/src/ChangeLog.12 +++ b/src/ChangeLog.12 @@ -3348,7 +3348,7 @@ with plain -g rather than with -g3, and they need the duplicate definitions for .gdbinit to work; see <https://bugs.gnu.org/12814#26>. * lisp.h (GCTYPEBITS, ARRAY_MARK_FLAG, PSEUDOVECTOR_FLAG, VALMASK): - Define as macros, as well as as enums or as constants. + Define as macros, as well as enums or constants. 2012-11-06 Jan Djärv <jan.h.d@swipnet.se> diff --git a/src/ChangeLog.4 b/src/ChangeLog.4 index 2935ee52cca..70865535e96 100644 --- a/src/ChangeLog.4 +++ b/src/ChangeLog.4 @@ -3381,7 +3381,7 @@ some external definitions. (Ffile_attributes) [MSDOS]: Set execute bits from file name. (Ffile_name_all_completions) [FILE_SYSTEM_CASE]: Convert - case of file name as as indicated by conditional. + case of file name as indicated by conditional. * emacs.c (main) [MSDOS]: Call init_environment. Set file types to binary for all files. Call init_dosfns. diff --git a/src/ChangeLog.5 b/src/ChangeLog.5 index 489ccfa5323..99d25163a4d 100644 --- a/src/ChangeLog.5 +++ b/src/ChangeLog.5 @@ -1372,7 +1372,7 @@ 1995-04-11 Richard Stallman <rms@mole.gnu.ai.mit.edu> * keyboard.c (read_char): Rearrange code so that getcjmp is set - only around sit_for and kbd_buffer_get_event, and + only around sit_for and kbd_buffer_get_event, and polling is stopped only around the kbd_buffer_get_event call. (Ftrack_mouse, tracking_off, read_char): Don't call prepare_menu_bars. diff --git a/src/ChangeLog.7 b/src/ChangeLog.7 index 32472ac074c..a1a9fb77157 100644 --- a/src/ChangeLog.7 +++ b/src/ChangeLog.7 @@ -3381,7 +3381,7 @@ 1998-02-15 Richard Stallman <rms@psilocin.gnu.org> * minibuf.c (read_minibuf): Do use DEFALT in place of empty input - when when expflag is nonzero. + when expflag is nonzero. (Fread_no_blanks_input): Arg INIT renamed to INITIAL. 1998-02-14 Richard Stallman <rms@psilocin.gnu.org> diff --git a/src/buffer.c b/src/buffer.c index 76670b89545..cc6021bfb5d 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -6054,7 +6054,7 @@ and is the visited file's modification time, as of that time. If the modification time of the most recent save is different, this entry is obsolete. -An entry (t . 0) means means the buffer was previously unmodified but +An entry (t . 0) means the buffer was previously unmodified but its time stamp was unknown because it was not associated with a file. An entry (t . -1) is similar, except that it means the buffer's visited file did not exist. diff --git a/src/emacs-module.c b/src/emacs-module.c index e5833a1d1f0..6bc91a7e06a 100644 --- a/src/emacs-module.c +++ b/src/emacs-module.c @@ -983,7 +983,7 @@ value_to_lisp (emacs_value v) return o; } -/* Attempt to convert O to an emacs_value. Do not do any checking or +/* Attempt to convert O to an emacs_value. Do not do any checking or allocate any storage; the caller should prevent or detect any resulting bit pattern that is not a valid emacs_value. */ static emacs_value diff --git a/src/emacsgtkfixed.c b/src/emacsgtkfixed.c index 1a00e0f6806..4243b3ffd9d 100644 --- a/src/emacsgtkfixed.c +++ b/src/emacsgtkfixed.c @@ -81,7 +81,7 @@ emacs_fixed_gtk_widget_size_allocate (GtkWidget *widget, additional case for an xwidget view. It would be nicer if the bse class method could be called first, - and the the xview modification only would remain here. It wasn't + and the xview modification only would remain here. It wasn't possible to solve it that way yet. */ EmacsFixedClass *klass; GtkWidgetClass *parent_class; diff --git a/src/fileio.c b/src/fileio.c index adb3534532c..4bbcec6f178 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -124,7 +124,7 @@ static mode_t auto_save_mode_bits; static bool auto_save_error_occurred; /* If VALID_TIMESTAMP_FILE_SYSTEM, then TIMESTAMP_FILE_SYSTEM is the device - number of a file system where time stamps were observed to to work. */ + number of a file system where time stamps were observed to work. */ static bool valid_timestamp_file_system; static dev_t timestamp_file_system; diff --git a/src/frame.h b/src/frame.h index d1c21da4d2a..e610fc768d3 100644 --- a/src/frame.h +++ b/src/frame.h @@ -447,7 +447,7 @@ struct frame /* New text height and width for pending size change. 0 if no change pending. These values represent pixels or canonical character units - according to the value of new_pixelwise and correlate to the the + according to the value of new_pixelwise and correlate to the text width/height of the frame. */ int new_width, new_height; diff --git a/src/keyboard.h b/src/keyboard.h index a2a5f8f21d9..662d8e4a4f6 100644 --- a/src/keyboard.h +++ b/src/keyboard.h @@ -65,7 +65,7 @@ INLINE_HEADER_BEGIN as soon as a complete key arrives from some KBOARD or other, Emacs starts executing that key's binding. It switches to the single-kboard state for the execution of that command, - so that that command can get input only from its own KBOARD. + so that the command can get input only from its own KBOARD. While in the single-kboard state, read_char can consider input only from the current KBOARD. If events come from other KBOARDs, they diff --git a/src/nsterm.m b/src/nsterm.m index abfdffc9f5e..0b43c04c0b7 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -3715,7 +3715,7 @@ ns_dumpglyphs_image (struct glyph_string *s, NSRect r) /* Currently on NS img->mask is always 0. Since get_window_cursor_type specifies a hollow box cursor when on a non-masked image we never reach this clause. But we put it - in in anticipation of better support for image masks on + in, in anticipation of better support for image masks on NS. */ tdCol = ns_lookup_indexed_color (NS_FACE_FOREGROUND (face), s->f); } diff --git a/src/scroll.c b/src/scroll.c index 7004dcd9aea..c6e0cfd7e21 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -457,7 +457,7 @@ calculate_direct_scrolling (struct frame *frame, if (baud_rate <= 0) extra_cost = 1; - /* Overhead of setting the scroll window, plus the extra cost + /* Overhead of setting the scroll window, plus the extra cost of scrolling by a distance of one. The extra cost is added once for consistency with the cost vectors */ scroll_overhead diff --git a/src/termhooks.h b/src/termhooks.h index b5171bf1229..dd6044aabd5 100644 --- a/src/termhooks.h +++ b/src/termhooks.h @@ -625,7 +625,7 @@ struct terminal TERMINAL indicates which terminal device to read from. Input events should be read into HOLD_QUIT. - A positive return value indicates that that many input events + A positive return value N indicates that N input events were read into BUF. Zero means no events were immediately available. A value of -1 means a transient read error, while -2 indicates diff --git a/src/w32inevt.c b/src/w32inevt.c index 0b0f3f9e669..9d79bd46fb3 100644 --- a/src/w32inevt.c +++ b/src/w32inevt.c @@ -526,7 +526,7 @@ do_mouse_event (MOUSE_EVENT_RECORD *event, help_echo_window, help_echo_object, help_echo_pos); } - /* We already called kbd_buffer_store_event, so indicate the + /* We already called kbd_buffer_store_event, so indicate to the caller it shouldn't. */ return 0; } diff --git a/src/w32proc.c b/src/w32proc.c index ca59f995e63..0046c9e85dc 100644 --- a/src/w32proc.c +++ b/src/w32proc.c @@ -838,7 +838,7 @@ alarm (int seconds) updates the status of the read accordingly, and signals the 2nd event object, char_avail, on whose handle sys_select is waiting. This tells sys_select that the file descriptor - allocated for the subprocess or the the stream is ready to be + allocated for the subprocess or the stream is ready to be read from. When the subprocess exits or the network/serial stream is closed, |