diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog.10 | 4 | ||||
| -rw-r--r-- | src/ChangeLog.6 | 2 | ||||
| -rw-r--r-- | src/dispnew.c | 2 | ||||
| -rw-r--r-- | src/font.c | 2 | ||||
| -rw-r--r-- | src/keymap.c | 2 | ||||
| -rw-r--r-- | src/process.c | 2 | ||||
| -rw-r--r-- | src/w32proc.c | 2 | ||||
| -rw-r--r-- | src/w32term.h | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/src/ChangeLog.10 b/src/ChangeLog.10 index beb66847253..181b11b5a2b 100644 --- a/src/ChangeLog.10 +++ b/src/ChangeLog.10 @@ -20702,11 +20702,11 @@ (free_frame_menubar): Only compile if not USE_GTK. GTK version is in gtkutil.c. (popup_selection_callback): New version for USE_GTK. - (create_and_show_popup_menu): New fuction, one USE_GTK version and + (create_and_show_popup_menu): New function, one USE_GTK version and one USE_X_TOOLKIT version. (xmenu_show): Call create_and_show_popup_menu. (dialog_selection_callback): New version for USE_GTK. - (create_and_show_dialog): New fuction, one USE_GTK version and + (create_and_show_dialog): New function, one USE_GTK version and one USE_X_TOOLKIT version. (xdialog_show): Call create_and_show_dialog. diff --git a/src/ChangeLog.6 b/src/ChangeLog.6 index f9372aa666a..141a570040c 100644 --- a/src/ChangeLog.6 +++ b/src/ChangeLog.6 @@ -1138,7 +1138,7 @@ ntproc.c and simplified to match other changes (all handles are already non-inheritable). - (get_emacs_configuration): Detect Windows flavour (Windows 95 or + (get_emacs_configuration): Detect Windows flavor (Windows 95 or NT) at run-time. Change OS name for Windows 95 to be "win95". (fd_info): New variable. Array of extra info for file descriptors diff --git a/src/dispnew.c b/src/dispnew.c index 7b594c5b4e8..6ba834ba339 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -3491,7 +3491,7 @@ redraw_overlapping_rows (struct window *w, int yb) if (row->used[RIGHT_MARGIN_AREA]) rif->fix_overlapping_area (w, row, RIGHT_MARGIN_AREA, overlaps); - /* Record in neighbour rows that ROW overwrites part of + /* Record in neighbor rows that ROW overwrites part of their display. */ if (overlaps & OVERLAPS_PRED) MATRIX_ROW (w->current_matrix, i - 1)->overlapped_p = 1; diff --git a/src/font.c b/src/font.c index 3fc5fc944b4..9559c65e7ed 100644 --- a/src/font.c +++ b/src/font.c @@ -954,7 +954,7 @@ font_expand_wildcards (Lisp_Object *field, int n) } } - /* Decide all fileds from restrictions in RANGE. */ + /* Decide all fields from restrictions in RANGE. */ for (i = j = 0; i < n ; i++) { if (j < range[i].from) diff --git a/src/keymap.c b/src/keymap.c index 739dfd8f2de..6f9cf288f6d 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -998,7 +998,7 @@ copy_keymap_item (Lisp_Object elt) } else { - /* It may be an old fomat menu item. + /* It may be an old format menu item. Skip the optional menu string. */ if (STRINGP (XCAR (tem))) { diff --git a/src/process.c b/src/process.c index 9b15e4c56c0..53382d804f2 100644 --- a/src/process.c +++ b/src/process.c @@ -3120,7 +3120,7 @@ usage: (make-network-process &rest ARGS) */) { struct hostent *host_info_ptr; - /* gethostbyname may fail with TRY_AGAIN, but we don't honour that, + /* gethostbyname may fail with TRY_AGAIN, but we don't honor that, as it may `hang' Emacs for a very long time. */ immediate_quit = 1; QUIT; diff --git a/src/w32proc.c b/src/w32proc.c index c2020b40241..279816bcc3e 100644 --- a/src/w32proc.c +++ b/src/w32proc.c @@ -174,7 +174,7 @@ delete_child (child_process *cp) cp->status = STATUS_READ_ERROR; SetEvent (cp->char_consumed); #if 0 - /* We used to forceably terminate the thread here, but it + /* We used to forcibly terminate the thread here, but it is normally unnecessary, and in abnormal cases, the worst that will happen is we have an extra idle thread hanging around waiting for the zombie process. */ diff --git a/src/w32term.h b/src/w32term.h index 710394583e4..02392133837 100644 --- a/src/w32term.h +++ b/src/w32term.h @@ -637,7 +637,7 @@ extern void x_delete_display (struct w32_display_info *dpyinfo); /* Keypad command key support. W32 doesn't have virtual keys defined for the function keys on the keypad (they are mapped to the standard - fuction keys), so we define our own. */ + function keys), so we define our own. */ #define VK_NUMPAD_BEGIN 0x92 #define VK_NUMPAD_CLEAR (VK_NUMPAD_BEGIN + 0) #define VK_NUMPAD_ENTER (VK_NUMPAD_BEGIN + 1) |