diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2011-11-19 18:29:42 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-11-19 18:29:42 -0800 |
commit | e1dbe924b53c541fdf238a5a722b7177d5c8760b (patch) | |
tree | cef637ee7849fac3160c668f88e0f761305f87d3 /src | |
parent | 7fb18e9ef9edb3b47cf463babe83922f9310a473 (diff) | |
download | emacs-e1dbe924b53c541fdf238a5a722b7177d5c8760b.tar.gz |
Spelling fixes.
Diffstat (limited to 'src')
-rw-r--r-- | src/ChangeLog.10 | 4 | ||||
-rw-r--r-- | src/ChangeLog.11 | 16 | ||||
-rw-r--r-- | src/ChangeLog.2 | 14 | ||||
-rw-r--r-- | src/ChangeLog.3 | 2 | ||||
-rw-r--r-- | src/ChangeLog.4 | 4 | ||||
-rw-r--r-- | src/ChangeLog.5 | 2 | ||||
-rw-r--r-- | src/ChangeLog.6 | 4 | ||||
-rw-r--r-- | src/ChangeLog.7 | 2 | ||||
-rw-r--r-- | src/ChangeLog.8 | 4 | ||||
-rw-r--r-- | src/ccl.c | 2 | ||||
-rw-r--r-- | src/character.c | 2 | ||||
-rw-r--r-- | src/character.h | 2 | ||||
-rw-r--r-- | src/dbusbind.c | 2 | ||||
-rw-r--r-- | src/fileio.c | 4 | ||||
-rw-r--r-- | src/fontset.c | 2 | ||||
-rw-r--r-- | src/ftfont.c | 4 | ||||
-rw-r--r-- | src/gtkutil.c | 4 | ||||
-rw-r--r-- | src/image.c | 2 | ||||
-rw-r--r-- | src/keyboard.c | 2 | ||||
-rw-r--r-- | src/process.c | 2 | ||||
-rw-r--r-- | src/w32.c | 4 | ||||
-rw-r--r-- | src/w32console.c | 3 | ||||
-rw-r--r-- | src/w32fns.c | 4 | ||||
-rw-r--r-- | src/w32proc.c | 6 | ||||
-rw-r--r-- | src/w32term.c | 4 | ||||
-rw-r--r-- | src/w32xfns.c | 3 | ||||
-rw-r--r-- | src/window.h | 2 | ||||
-rw-r--r-- | src/xdisp.c | 6 | ||||
-rw-r--r-- | src/xfns.c | 2 |
29 files changed, 56 insertions, 58 deletions
diff --git a/src/ChangeLog.10 b/src/ChangeLog.10 index 181b11b5a2b..1992ef96e0a 100644 --- a/src/ChangeLog.10 +++ b/src/ChangeLog.10 @@ -6387,7 +6387,7 @@ 2005-11-20 Nick Roberts <nickrob@snap.net.nz> * lisp.h: Use typedef when Lisp_Object is EMACS_INT so that - this type is recognised when debugging. + this type is recognized when debugging. 2005-11-19 Andreas Schwab <schwab@suse.de> @@ -13398,7 +13398,7 @@ 2004-07-04 John Paul Wallington <jpw@gnu.org> * fileio.c (read_file_name_completion_ignore_case): New variable. - (syms_of_fileio): Declare and initialise it. + (syms_of_fileio): Declare and initialize it. (Fread_file_name): Bind `completion-ignore-case' to respect it. 2004-07-03 Eli Zaretskii <eliz@gnu.org> diff --git a/src/ChangeLog.11 b/src/ChangeLog.11 index f8b38554781..37a75c3c998 100644 --- a/src/ChangeLog.11 +++ b/src/ChangeLog.11 @@ -5896,7 +5896,7 @@ * eval.c (Feval, Ffuncall): Use the new names. * lisp.h (struct Lisp_Subr): Rename `am' to aMANY and add aUNEVALLED. - (DEFUN): Add braces around the union initialisation and use ## to + (DEFUN): Add braces around the union initialization and use ## to specify the right union alternative and avoid a cast. 2010-07-18 Juanma Barranquero <lekktu@gmail.com> @@ -9266,7 +9266,7 @@ Get rid of the direct_output optimizations. * keyboard.c (nonundocount): Remove extern declaration. - (command_loop_1): Remove brittle optimisation for cheap and + (command_loop_1): Remove brittle optimization for cheap and common operations. * xdisp.c (redisplay_internal): Don't bother checking redisplay_performed_directly_p any more. @@ -12481,7 +12481,7 @@ * dbusbind.c (XD_SYMBOL_TO_DBUS_TYPE): Convert macro into function xd_symbol_to_dbus_type. With Solaris 2.11, it was said to compile - for hours, when optimzation is enabled. + for hours, when optimization is enabled. (xd_signature, xd_append_arg, xd_retrieve_arg, xd_initialize) (xd_read_message): Make them static. @@ -16072,7 +16072,7 @@ 2008-09-07 Andreas Schwab <schwab@suse.de> * callproc.c (Fcall_process): Don't hold references to string data - across garbage collection. Move initialisation of new_argv down + across garbage collection. Move initialization of new_argv down to avoid compiler bug. 2008-09-07 Roland Winkler <Roland.Winkler@physik.uni-erlangen.de> @@ -19248,7 +19248,7 @@ * w32menu.c (Fx_popup_menu): Unwind protect while building menu. (parse_single_submenu): Remove. (digest_single_submenu): Remove. - (syms_of_w32menu): Don't initialise variables that have moved + (syms_of_w32menu): Don't initialize variables that have moved to menu.c. (set_frame_menubar): Sync with version in xmenu.c. (w32_menu_show): Sync with xmenu_show in xmenu.c. @@ -21290,7 +21290,7 @@ (CACHE_BLOCKSIZE): New constants. * w32font.c (Qja, Qko, Qzh): New symbols. - (syms_of_w32font): Initialise them. + (syms_of_w32font): Initialize them. (font_matches_spec): Use them to filter by language. (recompute_cached_metrics): Remove function. (compute_metrics, clear_cached_metrics): New functions. @@ -29651,7 +29651,7 @@ * callproc.c (child_setup, getenv_internal): Use the display-environment-variable and term-environment-variable frame params. - (set_initial_environment): Initialise Vprocess_environment. + (set_initial_environment): Initialize Vprocess_environment. * config.in: Disable multi-keyboard support on a mac. @@ -31298,7 +31298,7 @@ (term_mouse_highlight, term_mouse_movement, term_mouse_position) (term_mouse_click, handle_one_term_event, Fterm_open_connection) (Fterm_close_connection): New functions. - (term_init): Initialise mouse_face_window. + (term_init): Initialize mouse_face_window. 2007-05-19 Chong Yidong <cyd@stupidchicken.com> diff --git a/src/ChangeLog.2 b/src/ChangeLog.2 index 05e448c043c..62e3de22b09 100644 --- a/src/ChangeLog.2 +++ b/src/ChangeLog.2 @@ -1152,7 +1152,7 @@ 1987-07-29 Richard Mlynarik (mly@prep) - * lread.c (init_read): Initialise load_in_progress. + * lread.c (init_read): Initialize load_in_progress. 1987-07-28 Richard M. Stallman (rms@prep) @@ -2251,7 +2251,7 @@ 1987-01-16 Richard Mlynarik (mly@prep) * xfns.c (Fx_set_{background,cursor,mouse}_color): - Initialise save_color. + Initialize save_color. * fileio.c, search.c, sysdep.c, filelock.c, editfns.c, process.c: Delete/replace unused/conditionalised variables @@ -3002,7 +3002,7 @@ 1986-11-18 Richard Mlynarik (mly@prep) * emacs.c (main): - Giving `inhibit_x_windows' an initialisation loses; + Giving `inhibit_x_windows' an initialization loses; do it explicitly. * xfns.c (Fx_rubber_band): @@ -3291,7 +3291,7 @@ 1986-11-03 Richard Mlynarik (mly@prep) * xterm.c (stufflines): - Initialise signal mask. + Initialize signal mask. * xterm.h: Add definition of sigmask @@ -3346,7 +3346,7 @@ New function. * window.c (Fset_window_hscroll): - Don't inhibit redisplay optimisations if hscroll is same. + Don't inhibit redisplay optimizations if hscroll is same. * ymakefile: rm ../etc/DOC to avoid make-docfile overwriting any files which @@ -3358,7 +3358,7 @@ VMS changes from Sasaki * termcap.c (tgetent): - Make sure `indirect' initialised. + Make sure `indirect' initialized. * xfns.c (grey_p and callers): New function to compensate for ugly chauvinistic American @@ -3496,7 +3496,7 @@ core-dump) Dike out global-minor-modes. This wasn't actually being used by - anything (due to a bug) and wasn't even being initialised! + anything (due to a bug) and wasn't even being initialized! minor-mode-alist does what this thought it was doing. 1986-10-11 Richard Mlynarik (mly@prep) diff --git a/src/ChangeLog.3 b/src/ChangeLog.3 index 9ce7828fac9..fb3ec172055 100644 --- a/src/ChangeLog.3 +++ b/src/ChangeLog.3 @@ -9010,7 +9010,7 @@ * keyboard.c (cmd_error): If an error occurs before somebody has provided a screen to print it on, print it to stderr and exit Emacs. Handle batch-mode errors with the same code. - * lisp.h (Qexternal_debugging_ouput): New extern declaration, for + * lisp.h (Qexternal_debugging_output): New extern declaration, for use in cmd_error. * screen.c (Fscreen_pixel_size, Fset_screen_position): Doc fix. diff --git a/src/ChangeLog.4 b/src/ChangeLog.4 index 208d9c2cdb0..88c9e3dbf71 100644 --- a/src/ChangeLog.4 +++ b/src/ChangeLog.4 @@ -3656,7 +3656,7 @@ * m/delta.h (BROKEN_CLOSEDIR): Added because closedir is interruptible. (HAVE_UNISTD_H): Deleted because configure takes care of it. - (C_SWITCH_MACHINE): Added optimisation options for gnu cc. + (C_SWITCH_MACHINE): Added optimization options for gnu cc. 1993-12-17 Mike Long (mike.long@analog.com) @@ -5007,7 +5007,7 @@ Change display code to handle the `invisible' text property. * dispnew.c (direct_output_for_insert): Fail if character just inserted has text properties. - (direct_ouput_forward_char): Fail if moving near invisible chars. + (direct_output_forward_char): Fail if moving near invisible chars. * indent.c (compute_motion): Compute correctly for invisible text. (vmotion): Take care of invisible newlines. * intervals.c (set_point): Ignore `invisible' property diff --git a/src/ChangeLog.5 b/src/ChangeLog.5 index 1f21e9fb99c..ee79917a34d 100644 --- a/src/ChangeLog.5 +++ b/src/ChangeLog.5 @@ -3463,7 +3463,7 @@ * lisp.h (running_asynch_code): New global flag. * emacs.c (running_asynch_code): New global flag. - (main): Initialise it. + (main): Initialize it. * process.c (read_process_output, exec_sentinel): Set and reset the running_asynch_code global flag and restore match data. diff --git a/src/ChangeLog.6 b/src/ChangeLog.6 index 141a570040c..af97d0de7b4 100644 --- a/src/ChangeLog.6 +++ b/src/ChangeLog.6 @@ -1182,7 +1182,7 @@ support in sys_select. (term_ntproc): New function. - (init_ntproc): New function to initialise socket support and make + (init_ntproc): New function to initialize socket support and make initial std handles non-inheritable. Also ensure stdin, stdout and stderr have valid handles so that pipes and sockets can't inadvertently use fd 0, 1, or 2. @@ -1440,7 +1440,7 @@ Correctly detect when default_directory is absolute. Be strict when looking for MSDOS drive specifier; defer calling getdefdir. Ignore drive specifier if name now has UNC prefix. - Correctly recognise if name is not absolute when trying simple + Correctly recognize if name is not absolute when trying simple method to expand; return original string if possible. Skip dir sep after ~ or ~user. Use getpwnam instead of HOME for ~user on NT. diff --git a/src/ChangeLog.7 b/src/ChangeLog.7 index 73d0d45e9c1..ec4c27a4d9e 100644 --- a/src/ChangeLog.7 +++ b/src/ChangeLog.7 @@ -10963,7 +10963,7 @@ 1996-08-28 Morten Welinder <terra@diku.dk> * minibuf.c (Vhistory_length, Qhistory_length): New variables. - (syms_of_minibuf): Register and initialise these. + (syms_of_minibuf): Register and initialize these. (read_minibuf): Truncate history list if needed. 1996-08-28 Richard Stallman <rms@psilocin.gnu.ai.mit.edu> diff --git a/src/ChangeLog.8 b/src/ChangeLog.8 index 00e4a1f62c8..bd51e55cdc6 100644 --- a/src/ChangeLog.8 +++ b/src/ChangeLog.8 @@ -13266,7 +13266,7 @@ * charset.c (Fchar_bytes): Doc fix. (char_bytes): Fix returned value to match returned type. - (syms_of_charset): Fix type clash in initialisation of + (syms_of_charset): Fix type clash in initialization of Vauto_fill_chars. 1998-10-29 Geoff Voelker <voelker@cs.washington.edu> @@ -13429,7 +13429,7 @@ `x-list-fonts.c'. (w32_get_font_info, w32_query_font, w32_find_ccl_program): New functions for fontset support - adapted from x_ equivalents. - (syms_of_w32fns): New lisp variables initialised. Function + (syms_of_w32fns): New lisp variables initialized. Function pointers for fontset.c set up. * w32term.c: Include fontset.h. Define codepage macros. diff --git a/src/ccl.c b/src/ccl.c index 6366f1acb88..2b4f04d1247 100644 --- a/src/ccl.c +++ b/src/ccl.c @@ -47,7 +47,7 @@ static Lisp_Object Qcode_conversion_map; static Lisp_Object Qcode_conversion_map_id; /* Symbols of ccl program have this property, a value of the property - is an index for Vccl_protram_table. */ + is an index for Vccl_program_table. */ static Lisp_Object Qccl_program_idx; /* Table of registered CCL programs. Each element is a vector of diff --git a/src/character.c b/src/character.c index a21760c8ab2..88b1f11b96b 100644 --- a/src/character.c +++ b/src/character.c @@ -669,7 +669,7 @@ str_as_multibyte (unsigned char *str, EMACS_INT len, EMACS_INT nbytes, } /* Parse unibyte string at STR of LEN bytes, and return the number of - bytes it may ocupy when converted to multibyte string by + bytes it may occupy when converted to multibyte string by `str_to_multibyte'. */ EMACS_INT diff --git a/src/character.h b/src/character.h index 09bcf17ab96..5ae6cb8c49c 100644 --- a/src/character.h +++ b/src/character.h @@ -596,7 +596,7 @@ sanitize_char_width (EMACS_INT width) ? ASCII_CHAR_WIDTH (c) \ : sanitize_char_width (XINT (CHAR_TABLE_REF (Vchar_width_table, c)))) -/* If C is a variation selector, return the index numnber of the +/* If C is a variation selector, return the index of the variation selector (1..256). Otherwise, return 0. */ #define CHAR_VARIATION_SELECTOR_P(c) \ diff --git a/src/dbusbind.c b/src/dbusbind.c index 52e08d8ee2a..7984be3564b 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c @@ -184,7 +184,7 @@ static int xd_in_read_queued_messages = 0; #endif /* This was a macro. On Solaris 2.11 it was said to compile for - hours, when optimzation is enabled. So we have transferred it into + hours, when optimization is enabled. So we have transferred it into a function. */ /* Determine the DBusType of a given Lisp symbol. OBJECT must be one of the predefined D-Bus type symbols. */ diff --git a/src/fileio.c b/src/fileio.c index 54fc67e6631..e3586c50056 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -338,7 +338,7 @@ Given a Unix syntax file name, returns a string ending in slash. */) while (p != beg && !IS_DIRECTORY_SEP (p[-1]) #ifdef DOS_NT - /* only recognise drive specifier at the beginning */ + /* only recognize drive specifier at the beginning */ && !(p[-1] == ':' /* handle the "/:d:foo" and "/:foo" cases correctly */ && ((p == beg + 2 && !IS_DIRECTORY_SEP (*beg)) @@ -401,7 +401,7 @@ or the entire name if it contains no slash. */) while (p != beg && !IS_DIRECTORY_SEP (p[-1]) #ifdef DOS_NT - /* only recognise drive specifier at beginning */ + /* only recognize drive specifier at beginning */ && !(p[-1] == ':' /* handle the "/:d:foo" case correctly */ && (p == beg + 2 || (p == beg + 4 && IS_DIRECTORY_SEP (*beg)))) diff --git a/src/fontset.c b/src/fontset.c index 34b2131832f..e20d7957c7f 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -1346,7 +1346,7 @@ accumulate_script_ranges (Lisp_Object arg, Lisp_Object range, Lisp_Object val) In FONTSET, set FONT_DEF in a fashion specified by ADD for characters in RANGE and ranges in SCRIPT_RANGE_LIST before RANGE. - The consumed ranges are poped up from SCRIPT_RANGE_LIST, and the + The consumed ranges are popped up from SCRIPT_RANGE_LIST, and the new SCRIPT_RANGE_LIST is stored in ARG. If ASCII is nil, don't set FONT_DEF for ASCII characters. It is diff --git a/src/ftfont.c b/src/ftfont.c index 7858a31be21..5c540f9bf82 100644 --- a/src/ftfont.c +++ b/src/ftfont.c @@ -272,7 +272,7 @@ ftfont_pattern_entity (FcPattern *p, Lisp_Object extra) } else { - /* As this font is not scalable, parhaps this is a BDF or PCF + /* As this font is not scalable, perhaps this is a BDF or PCF font. */ FT_Face ft_face; @@ -730,7 +730,7 @@ ftfont_spec_pattern (Lisp_Object spec, char *otlayout, struct OpenTypeSpec **ots if ((n = FONT_SLANT_NUMERIC (spec)) >= 0 && n < 100) - /* Fontconfig doesn't support reverse-italic/obligue. */ + /* Fontconfig doesn't support reverse-italic/oblique. */ return NULL; if (INTEGERP (AREF (spec, FONT_DPI_INDEX))) diff --git a/src/gtkutil.c b/src/gtkutil.c index 59bcdfa4afd..3df46afcd3a 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -127,7 +127,7 @@ xg_set_screen (GtkWidget *w, FRAME_PTR f) Returns non-zero if display could be opened, zero if display could not be opened, and less than zero if the GTK version doesn't support - multipe displays. */ + multiple displays. */ void xg_display_open (char *display_name, Display **dpy) @@ -4262,7 +4262,7 @@ xg_make_tool_item (FRAME_PTR f, #endif gtk_tool_item_set_homogeneous (ti, FALSE); - /* Callback to save modifyer mask (Shift/Control, etc). GTK makes + /* Callback to save modifier mask (Shift/Control, etc). GTK makes no distinction based on modifiers in the activate callback, so we have to do it ourselves. */ g_signal_connect (wb, "button-release-event", diff --git a/src/image.c b/src/image.c index a82b16aa805..8b61c7eefbc 100644 --- a/src/image.c +++ b/src/image.c @@ -7754,7 +7754,7 @@ imagemagick_load_image (struct frame *f, struct image *img, } /* Finally we are done manipulating the image. Figure out the - resulting width/height and transfer ownerwship to Emacs. */ + resulting width/height and transfer ownership to Emacs. */ height = MagickGetImageHeight (image_wand); width = MagickGetImageWidth (image_wand); diff --git a/src/keyboard.c b/src/keyboard.c index a4c85683061..80873fcb57a 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -12100,7 +12100,7 @@ This variable is keyboard-local. */); Function key definitions that apply to all terminal devices should go here. If a mapping is defined in both the current `local-function-key-map' binding and this variable, then the local -definition will take precendence. */); +definition will take precedence. */); Vfunction_key_map = Fmake_sparse_keymap (Qnil); DEFVAR_LISP ("key-translation-map", Vkey_translation_map, diff --git a/src/process.c b/src/process.c index 53382d804f2..bea9e72019b 100644 --- a/src/process.c +++ b/src/process.c @@ -1414,7 +1414,7 @@ usage: (start-process NAME BUFFER PROGRAM &rest PROGRAM-ARGS) */) val = XCDR (Vdefault_process_coding_system); } XPROCESS (proc)->encode_coding_system = val; - /* Note: At this momemnt, the above coding system may leave + /* Note: At this moment, the above coding system may leave text-conversion or eol-conversion unspecified. They will be decided after we read output from the process and decode it by some coding system, or just before we actually send a text to diff --git a/src/w32.c b/src/w32.c index b2b47dbd179..304445e2238 100644 --- a/src/w32.c +++ b/src/w32.c @@ -3057,7 +3057,7 @@ generate_inode_val (const char * name) unsigned hash; /* Get the truly canonical filename, if it exists. (Note: this - doesn't resolve aliasing due to subst commands, or recognise hard + doesn't resolve aliasing due to subst commands, or recognize hard links. */ if (!w32_get_long_filename ((char *)name, fullname, MAX_PATH)) abort (); @@ -5845,7 +5845,7 @@ term_ntproc (void) void init_ntproc (void) { - /* Initialise the socket interface now if available and requested by + /* Initialize the socket interface now if available and requested by the user by defining PRELOAD_WINSOCK; otherwise loading will be delayed until open-network-stream is called (w32-has-winsock can also be used to dynamically load or reload winsock). diff --git a/src/w32console.c b/src/w32console.c index 49bf56ddee9..30c71f1c276 100644 --- a/src/w32console.c +++ b/src/w32console.c @@ -748,7 +748,7 @@ syms_of_ntterm (void) doc: /* Non-nil means make terminal frames use the full screen buffer dimensions. This is desirable when running Emacs over telnet. A value of nil means use the current console window dimensions; this -may be preferrable when working directly at the console with a large +may be preferable when working directly at the console with a large scroll-back buffer. */); w32_use_full_screen_buffer = 0; @@ -757,4 +757,3 @@ scroll-back buffer. */); defsubr (&Sset_cursor_size); defsubr (&Sset_message_beep); } - diff --git a/src/w32fns.c b/src/w32fns.c index 4a6da46141c..5b936195aa5 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -2262,7 +2262,7 @@ w32_msg_pump (deferred_msg * msg_buf) some third party shell extensions can cause it to be used in system dialogs, which causes a crash if it is not initialized. This is a known bug in Windows, which was fixed long ago, but - the patch for XP is not publically available until XP SP3, + the patch for XP is not publicly available until XP SP3, and older versions will never be patched. */ CoInitialize (NULL); w32_createwindow ((struct frame *) msg.wParam); @@ -2880,7 +2880,7 @@ w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) key.dwControlKeyState = modifiers; add = w32_kbd_patch_key (&key); - /* 0 means an unrecognised keycode, negative means + /* 0 means an unrecognized keycode, negative means dead key. Ignore both. */ while (--add >= 0) { diff --git a/src/w32proc.c b/src/w32proc.c index 279816bcc3e..254a32503c4 100644 --- a/src/w32proc.c +++ b/src/w32proc.c @@ -122,12 +122,12 @@ new_child (void) for (cp = child_procs + (child_proc_count-1); cp >= child_procs; cp--) if (!CHILD_ACTIVE (cp)) - goto Initialise; + goto Initialize; if (child_proc_count == MAX_CHILDREN) return NULL; cp = &child_procs[child_proc_count++]; - Initialise: + Initialize: memset (cp, 0, sizeof (*cp)); cp->fd = -1; cp->pid = -1; @@ -821,7 +821,7 @@ sys_spawnve (int mode, char *cmdname, char **argv, char **envp) The w32 GNU-based library from Cygnus doubles quotes to escape them, while MSVC uses backslash for escaping. (Actually the MSVC - startup code does attempt to recognise doubled quotes and accept + startup code does attempt to recognize doubled quotes and accept them, but gets it wrong and ends up requiring three quotes to get a single embedded quote!) So by default we decide whether to use quote or backslash as the escape character based on whether the diff --git a/src/w32term.c b/src/w32term.c index 18f5b85367c..a2ccdd21f7d 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -5576,7 +5576,7 @@ x_raise_frame (struct frame *f) input focus anyway (so the window with focus will never be completely obscured) - if not, then just moving the mouse over it is sufficient to give it focus. On Windows, the user must actually - click on the frame (preferrably the title bar so as not to move + click on the frame (preferably the title bar so as not to move point), which is more awkward. Also, no other Windows program raises a window to the top but leaves another window (possibly now completely obscured) with input focus. @@ -6164,7 +6164,7 @@ w32_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name) dpyinfo->has_palette = GetDeviceCaps (hdc, RASTERCAPS) & RC_PALETTE; ReleaseDC (NULL, hdc); - /* initialise palette with white and black */ + /* initialize palette with white and black */ { XColor color; w32_defined_color (0, "white", &color, 1); diff --git a/src/w32xfns.c b/src/w32xfns.c index fbbf11bd65c..fc2d5904d67 100644 --- a/src/w32xfns.c +++ b/src/w32xfns.c @@ -188,7 +188,7 @@ get_next_msg (W32Msg * lpmsg, BOOL bWait) } nQueue--; - /* Consolidate WM_PAINT messages to optimise redrawing. */ + /* Consolidate WM_PAINT messages to optimize redrawing. */ if (lpmsg->msg.message == WM_PAINT && nQueue) { int_msg * lpCur = lpHead; @@ -441,4 +441,3 @@ void x_sync (void *f) { } - diff --git a/src/window.h b/src/window.h index de0f7307a51..df29ca1368f 100644 --- a/src/window.h +++ b/src/window.h @@ -268,7 +268,7 @@ struct window /* List of buffers re-shown in this window. */ Lisp_Object next_buffers; - /* An alist with parameteres. */ + /* An alist with parameters. */ Lisp_Object window_parameters; /* No Lisp data may follow below this point without changing diff --git a/src/xdisp.c b/src/xdisp.c index bc7a7a053db..8a8c1d08994 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -1445,7 +1445,7 @@ pos_visible_p (struct window *w, EMACS_INT charpos, int *x, int *y, position is CHARPOS. For the contingency that we didn't, and stopped at the first newline from the display string, move back over the glyphs - prfoduced from the string, until we find the + produced from the string, until we find the rightmost glyph not from the string. */ if (IT_CHARPOS (it3) != charpos && EQ (it3.object, string)) { @@ -14109,7 +14109,7 @@ set_cursor_from_row (struct window *w, struct glyph_row *row, || (STRINGP (g1->object) && (!NILP (Fget_char_property (make_number (g1->charpos), Qcursor, g1->object)) - /* pevious candidate is from the same display + /* previous candidate is from the same display string as this one, and the display string came from a text property */ || (EQ (g1->object, glyph->object) @@ -17020,7 +17020,7 @@ try_window_id (struct window *w) last_unchanged_at_beg_row = find_last_unchanged_at_beg_row (w); if (last_unchanged_at_beg_row) { - /* Avoid starting to display in the moddle of a character, a TAB + /* Avoid starting to display in the middle of a character, a TAB for instance. This is easier than to set up the iterator exactly, and it's not a frequent case, so the additional effort wouldn't really pay off. */ diff --git a/src/xfns.c b/src/xfns.c index 6de412c4e68..88e8ac595c5 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -2962,7 +2962,7 @@ x_default_font_parameter (struct frame *f, Lisp_Object parms) if (NILP (font_param)) { - /* System font should take precedendce over X resources. We suggest this + /* System font should take precedence over X resources. We suggest this regardless of font-use-system-font because .emacs may not have been read yet. */ const char *system_font = xsettings_get_system_font (); |