diff options
| author | Paul Eggert | 2011-11-17 09:40:48 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-11-17 09:40:48 -0800 |
| commit | c5e87d104b7342f35459c7513d6b4cefea1e968e (patch) | |
| tree | b1e452497894607b5199474897953bf739552904 /src | |
| parent | df85d31593aab41321a8bac130e1f9c5b678e9d7 (diff) | |
| download | emacs-c5e87d104b7342f35459c7513d6b4cefea1e968e.tar.gz emacs-c5e87d104b7342f35459c7513d6b4cefea1e968e.zip | |
Spelling fixes.
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 @@ | |||
| 20702 | (free_frame_menubar): Only compile if not USE_GTK. GTK version | 20702 | (free_frame_menubar): Only compile if not USE_GTK. GTK version |
| 20703 | is in gtkutil.c. | 20703 | is in gtkutil.c. |
| 20704 | (popup_selection_callback): New version for USE_GTK. | 20704 | (popup_selection_callback): New version for USE_GTK. |
| 20705 | (create_and_show_popup_menu): New fuction, one USE_GTK version and | 20705 | (create_and_show_popup_menu): New function, one USE_GTK version and |
| 20706 | one USE_X_TOOLKIT version. | 20706 | one USE_X_TOOLKIT version. |
| 20707 | (xmenu_show): Call create_and_show_popup_menu. | 20707 | (xmenu_show): Call create_and_show_popup_menu. |
| 20708 | (dialog_selection_callback): New version for USE_GTK. | 20708 | (dialog_selection_callback): New version for USE_GTK. |
| 20709 | (create_and_show_dialog): New fuction, one USE_GTK version and | 20709 | (create_and_show_dialog): New function, one USE_GTK version and |
| 20710 | one USE_X_TOOLKIT version. | 20710 | one USE_X_TOOLKIT version. |
| 20711 | (xdialog_show): Call create_and_show_dialog. | 20711 | (xdialog_show): Call create_and_show_dialog. |
| 20712 | 20712 | ||
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 @@ | |||
| 1138 | ntproc.c and simplified to match other changes (all handles are | 1138 | ntproc.c and simplified to match other changes (all handles are |
| 1139 | already non-inheritable). | 1139 | already non-inheritable). |
| 1140 | 1140 | ||
| 1141 | (get_emacs_configuration): Detect Windows flavour (Windows 95 or | 1141 | (get_emacs_configuration): Detect Windows flavor (Windows 95 or |
| 1142 | NT) at run-time. Change OS name for Windows 95 to be "win95". | 1142 | NT) at run-time. Change OS name for Windows 95 to be "win95". |
| 1143 | 1143 | ||
| 1144 | (fd_info): New variable. Array of extra info for file descriptors | 1144 | (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) | |||
| 3491 | if (row->used[RIGHT_MARGIN_AREA]) | 3491 | if (row->used[RIGHT_MARGIN_AREA]) |
| 3492 | rif->fix_overlapping_area (w, row, RIGHT_MARGIN_AREA, overlaps); | 3492 | rif->fix_overlapping_area (w, row, RIGHT_MARGIN_AREA, overlaps); |
| 3493 | 3493 | ||
| 3494 | /* Record in neighbour rows that ROW overwrites part of | 3494 | /* Record in neighbor rows that ROW overwrites part of |
| 3495 | their display. */ | 3495 | their display. */ |
| 3496 | if (overlaps & OVERLAPS_PRED) | 3496 | if (overlaps & OVERLAPS_PRED) |
| 3497 | MATRIX_ROW (w->current_matrix, i - 1)->overlapped_p = 1; | 3497 | 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) | |||
| 954 | } | 954 | } |
| 955 | } | 955 | } |
| 956 | 956 | ||
| 957 | /* Decide all fileds from restrictions in RANGE. */ | 957 | /* Decide all fields from restrictions in RANGE. */ |
| 958 | for (i = j = 0; i < n ; i++) | 958 | for (i = j = 0; i < n ; i++) |
| 959 | { | 959 | { |
| 960 | if (j < range[i].from) | 960 | 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) | |||
| 998 | } | 998 | } |
| 999 | else | 999 | else |
| 1000 | { | 1000 | { |
| 1001 | /* It may be an old fomat menu item. | 1001 | /* It may be an old format menu item. |
| 1002 | Skip the optional menu string. */ | 1002 | Skip the optional menu string. */ |
| 1003 | if (STRINGP (XCAR (tem))) | 1003 | if (STRINGP (XCAR (tem))) |
| 1004 | { | 1004 | { |
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) */) | |||
| 3120 | { | 3120 | { |
| 3121 | struct hostent *host_info_ptr; | 3121 | struct hostent *host_info_ptr; |
| 3122 | 3122 | ||
| 3123 | /* gethostbyname may fail with TRY_AGAIN, but we don't honour that, | 3123 | /* gethostbyname may fail with TRY_AGAIN, but we don't honor that, |
| 3124 | as it may `hang' Emacs for a very long time. */ | 3124 | as it may `hang' Emacs for a very long time. */ |
| 3125 | immediate_quit = 1; | 3125 | immediate_quit = 1; |
| 3126 | QUIT; | 3126 | 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) | |||
| 174 | cp->status = STATUS_READ_ERROR; | 174 | cp->status = STATUS_READ_ERROR; |
| 175 | SetEvent (cp->char_consumed); | 175 | SetEvent (cp->char_consumed); |
| 176 | #if 0 | 176 | #if 0 |
| 177 | /* We used to forceably terminate the thread here, but it | 177 | /* We used to forcibly terminate the thread here, but it |
| 178 | is normally unnecessary, and in abnormal cases, the worst that | 178 | is normally unnecessary, and in abnormal cases, the worst that |
| 179 | will happen is we have an extra idle thread hanging around | 179 | will happen is we have an extra idle thread hanging around |
| 180 | waiting for the zombie process. */ | 180 | 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); | |||
| 637 | 637 | ||
| 638 | /* Keypad command key support. W32 doesn't have virtual keys defined | 638 | /* Keypad command key support. W32 doesn't have virtual keys defined |
| 639 | for the function keys on the keypad (they are mapped to the standard | 639 | for the function keys on the keypad (they are mapped to the standard |
| 640 | fuction keys), so we define our own. */ | 640 | function keys), so we define our own. */ |
| 641 | #define VK_NUMPAD_BEGIN 0x92 | 641 | #define VK_NUMPAD_BEGIN 0x92 |
| 642 | #define VK_NUMPAD_CLEAR (VK_NUMPAD_BEGIN + 0) | 642 | #define VK_NUMPAD_CLEAR (VK_NUMPAD_BEGIN + 0) |
| 643 | #define VK_NUMPAD_ENTER (VK_NUMPAD_BEGIN + 1) | 643 | #define VK_NUMPAD_ENTER (VK_NUMPAD_BEGIN + 1) |