Merge from trunk.

author: Paul Eggert 2011-11-19 19:07:02 -0800
committer: Paul Eggert 2011-11-19 19:07:02 -0800
commit: 615a3b8d0d2c88cd664f1e0beb5a32b5b8e08f90 (patch)
tree: e0458a9eac443c36a3a4bfa117fde01bbd6e4140 /src
parent: c3ca24d48c10fb771ee02eb58f7d49bd82d6306e (diff)
parent: e1dbe924b53c541fdf238a5a722b7177d5c8760b (diff)
download: emacs-615a3b8d0d2c88cd664f1e0beb5a32b5b8e08f90.tar.gz
emacs-615a3b8d0d2c88cd664f1e0beb5a32b5b8e08f90.zip
88 files changed, 577 insertions, 395 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 533f5cf4327..17c27bc3048 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
-2011-11-14  Paul Eggert  <eggert@cs.ucla.edu>
+2011-11-20  Paul Eggert  <eggert@cs.ucla.edu>
        Standardize on VIRT_ADDR_VARIES behavior; otherwise, valgrind
        does not work on some platforms.  Problem reported by Andreas Schwab in
@@ -17,6 +17,99 @@
        * m/ibms390.h, m/intel386.h, m/template.h, s/cygwin.h, s/hpux10-20.h:
        Remove VIRT_ADDR_VARIES no longer needed.
+2011-11-19  Eli Zaretskii  <eliz@gnu.org>
+        * xdisp.c (x_write_glyphs, draw_phys_cursor_glyph)
+        (erase_phys_cursor, update_window_cursor, show_mouse_face)
+        (cursor_in_mouse_face_p): If the cursor position is out of bounds,
+        behave as if the cursor position were at the window margin.
+        * window.c (get_phys_cursor_glyph): If the window is hscrolled,
+        and the cursor position is out of bounds, behave as if the cursor
+        position were at the window margin.  (Bug#10075)
+2011-11-18  Chong Yidong  <cyd@gnu.org>
+        * window.c (Fwindow_combination_limit): Make first argument
+        non-optional, since it is meaningless for live windows like the
+        selected window.
+2011-11-18  Dmitry Antipov  <dmantipov@yandex.ru>
+        * keymap.c (Fwhere_is_internal): Add missing RETURN_UNGCPROs.
+2011-11-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+        * intervals.c: Fix grafting over the whole buffer (bug#10071).
+        (graft_intervals_into_buffer): Simplify.
+2011-11-18  Eli Zaretskii  <eliz@gnu.org>
+        * dispnew.c (swap_glyph_pointers): Swap the used[] arrays and the
+        hash values of the two rows.
+        (copy_row_except_pointers): Preserve the used[] arrays and the
+        hash values of the two rows.  (Bug#10035)
+        (add_row_entry): Add xassert to verify that ROW's hash code is valid.
+        * xdisp.c (row_hash): New function, body extracted from
+        compute_line_metrics.
+        (compute_line_metrics): Call row_hash, instead of computing the
+        hash code inline.
+        * dispnew.c (verify_row_hash): Call row_hash for computing the
+        hash code of a row, instead of duplicating code from xdisp.c.
+        * dispextern.h (row_hash): Add prototype.
+2011-11-18  Tassilo Horn  <tassilo@member.fsf.org>
+        * frame.c (delete_frame): Don't delete the terminal when the last
+        X frame is closed if emacs is built with GTK toolkit.
+2011-11-17  Juanma Barranquero  <lekktu@gmail.com>
+        * window.c (syms_of_window) <window-combination-resize>: Fix typo.
+2011-11-17  Martin Rudalics  <rudalics@gmx.at>
+        * window.c (Vwindow_splits): Rename to
+        Vwindow_combination_resize.  Suggested by Juri Linkov.
+        (Fsplit_window_internal): Use Vwindow_combination_resize instead
+        of Vwindow_splits.
+2011-11-16  Juanma Barranquero  <lekktu@gmail.com>
+        * nsfns.m (Fns_font_name):
+        * window.c (syms_of_window) <window-combination-limit>: Fix typos.
+2011-11-16  Martin Rudalics  <rudalics@gmx.at>
+        * window.h (window): Rename slot "nest" to "combination_limit".
+        * window.c (Fwindow_nest): Rename to Fwindow_combination_limit.
+        (Fset_window_nest): Rename to Fset_window_combination_limit.
+        (Vwindow_nest): Rename to Vwindow_combination_limit.
+        (recombine_windows, make_parent_window, make_window)
+        (Fsplit_window_internal, saved_window)
+        (Fset_window_configuration, save_window_save): Rename all
+        occurrences of window_nest to window_combination_limit.
+2011-11-15  Juanma Barranquero  <lekktu@gmail.com>
+        * image.c (imagemagick_load_image): Fix typo.
+2011-11-14  Eli Zaretskii  <eliz@gnu.org>
+        * xdisp.c (display_line): Move the call to
+        highlight_trailing_whitespace before the call to
+        compute_line_metrics, since the latter needs to see the final
+        faces of all the glyphs to compute ROW's hash value.  Fixes
+        assertion violations in row_equal_p.  (Bug#10035)
+2011-11-14  Juanma Barranquero  <lekktu@gmail.com>
+        * w32proc.c (reader_thread): Don't check pending input if cp->fd < 0,
+        just return (bug#10044).
 2011-11-12  Eli Zaretskii  <eliz@gnu.org>
        * makefile.w32-in (HEAPSIZE): New variable, allows to build temacs
@@ -50,7 +143,7 @@
 2011-11-11  Dmitry Antipov  <dmantipov@yandex.ru>
-        * xdisp.c (syms_of_xdisp): Remove duplicated definition of Qtext.
+        * xdisp.c (syms_of_xdisp): Remove duplicated definition of Qtext.
 2011-11-11  Kenichi Handa  <handa@m17n.org>
@@ -250,7 +343,7 @@
        * w32fns.c [_MSC_VER]: DECLARE_HANDLE for any MSVC version.
-2011-11-05  Fabrice Popineau  <fabrice.popineau@supelec.fr> (tiny change)
+2011-11-05  Fabrice Popineau  <fabrice.popineau@supelec.fr>  (tiny change)
        Support MSVC build with newer versions of Visual Studio.
        * w32.c: Don't include w32api.h for MSVC.
@@ -312,7 +405,7 @@
        * xdisp.c (try_cursor_movement): Make sure ROW isn't decremented
        past the beginning of the current glyph matrix.
-2011-10-30  Adam Sjøgren <asjo@koldfront.dk> (tiny change)
+2011-10-30  Adam Sjøgren  <asjo@koldfront.dk>  (tiny change)
        * xterm.c: Include X11/Xproto.h if HAVE_GTK3.
        (x_error_handler): Ignore BadMatch for X_SetInputFocus for
@@ -346,7 +439,7 @@
        Fix the `xbytecode' command.
        * .gdbinit (xprintbytestr): New command.
-        (xwhichsymbols): Renamed from `which'; all callers changed.
+        (xwhichsymbols): Rename from `which'; all callers changed.
        (xbytecode): Print the byte-code string as well.
 2011-10-29  Kim Storm  <storm@cua.dk>
@@ -3040,7 +3133,7 @@
        * nsselect.m (ns_string_from_pasteboard): Don't use deprecated methods
        cString and lossyCString on OSX >= 10.4
-        * nsmenu.m (fillWithWidgetValue): Don't use depercated method
+        * nsmenu.m (fillWithWidgetValue): Don't use deprecated method
        sizeToFit on OSX >= 10.2.
        * nsimage.m (allocInitFromFile): Don't use deprecated method
diff --git a/src/ChangeLog.1 b/src/ChangeLog.1
index e32db190cd0..efe77648458 100644
--- a/src/ChangeLog.1
+++ b/src/ChangeLog.1
@@ -405,7 +405,7 @@
        Copy their own header field a_scovfrl from ohdr.
        * unexec.c [COFF]:
-        Round positions of text and and data sections in output file
+        Round positions of text and data sections in output file
        to page boundaries.
        * crt0.c: Install version for Encore machines.
@@ -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..1992ef96e0a 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
@@ -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>
@@ -19139,7 +19139,7 @@
        (font_rescale_ratio): New function.
        (split_font_name): If NUMERIC_P is nonzero, set font->rescale_ratio.
        (better_font_p): On comparing point sized, pay attention to
-        recale_ratio member of fonts.
+        rescale_ratio member of fonts.
        (build_scalable_font_name): Reflect font->rescale_ratio in the
        font name.
        (syms_of_xfaces): Declare Vface_font_rescale_alist as a Lisp variable.
@@ -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.
@@ -22780,7 +22780,7 @@
 2002-07-23  Kenichi Handa  <handa@etl.go.jp>
        * xdisp.c (face_before_or_after_it_pos):
-        Call FETCH_MULTIBYTE_CHAR with byte postion, not char position.
+        Call FETCH_MULTIBYTE_CHAR with byte position, not char position.
 2002-07-22  Juanma Barranquero  <lektu@terra.es>
@@ -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..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.
@@ -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>
@@ -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.
@@ -13149,7 +13149,7 @@
        (ftfont_has_char): Special handling of `ja' and `ko' adstyle.
        * font.c (font_sort_entites): Change the meaning of the arg
-        BEST-ONLY.  Don't optimize for VEC of lenght 1.
+        BEST-ONLY.  Don't optimize for VEC of length 1.
        (font_select_entity): Just return the value of font_sort_entites.
        * xfaces.c (merge_face_vectors): Reflect font properties in
@@ -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>
@@ -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>
@@ -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.
@@ -23551,7 +23551,7 @@
        STORE_XCHARB a valid l-value.
        * w32term.c (w32_native_per_char_metric): Swap width and rbearing
-        calculations for non-Truetype fonts.
+        calculations for non-TrueType fonts.
        (x_draw_glyph_string): Sync with xterm.c.
        (x_draw_glyph_string_foreground) [USE_FONT_BACKEND]:
        Remove redundant code.
@@ -26748,7 +26748,7 @@
 2008-02-01  Kenichi Handa  <handa@m17n.org>
        * xdisp.c (face_before_or_after_it_pos):
-        Call FETCH_MULTIBYTE_CHAR with byte postion, not char position.
+        Call FETCH_MULTIBYTE_CHAR with byte position, not char position.
 2008-02-01  Kenichi Handa  <handa@m17n.org>
@@ -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 ca7feaee9f5..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)
@@ -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:
@@ -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)
@@ -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..fb3ec172055 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.
@@ -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.
@@ -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)
@@ -13137,7 +13137,7 @@
        * print.c: Include dispextern.h.
        (printchar, strout): Use message_buf.
-        * sysdep.c (get_screen_size): Don't use MscreenWidth, MscreenLenght.
+        * sysdep.c (get_screen_size): Don't use MscreenWidth, MscreenLength.
        * term.c: Likewise.
        * scroll.c (CalcIDCosts, CalcIDCosts1, CalcLID): These now take a
@@ -13147,7 +13147,7 @@
        (do_scrolling): Use alloca for queue.
        * dispnew.c (remake_screen_structures): Allocate message_buf.
-        Don't use MscreenWidth, MscreenLenght.
+        Don't use MscreenWidth, MscreenLength.
        * xdisp.c: bf_cur replaced with current_buffer.
        Calls to SetBfx deleted.
@@ -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)
@@ -15414,7 +15414,7 @@
        * xfns.c (Fx_create_screen): If user has specified
        `x-iconic-startup' then start emacs in iconic form.
        Look for icon position in `icon-left' and `icon-top', or use
-        window postion.
+        window position.
        * xterm.c (x_term_init): If server doesn't respond, use fatal
        instead of error.  Also tell user about -d option.
diff --git a/src/ChangeLog.4 b/src/ChangeLog.4
index dc8fe23a221..88c9e3dbf71 100644
--- a/src/ChangeLog.4
+++ b/src/ChangeLog.4
@@ -811,7 +811,7 @@
 1994-04-28  Michael D. Ernst  (mernst@monozygote.research.microsoft.com)
-        * fileio.c (inhibit-file-name-handers): Correct documentation.
+        * fileio.c (inhibit-file-name-handlers): Correct documentation.
 1994-04-28  Karl Heuer  (kwzh@hal.gnu.ai.mit.edu)
@@ -1885,7 +1885,7 @@
 1994-03-22  Frederic Pierresteguy  (fp@mole.gnu.ai.mit.edu)
        * widget.c (set_frame_size): Put #if 0 around a lot of useless code.
-        Compute explicitely the geometry of the toplevel widget.
+        Compute explicitly the geometry of the toplevel widget.
        Call XtSetValues not XtVaSetValues.
 1994-03-22  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
@@ -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 f9372aa666a..af97d0de7b4 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
@@ -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 fa55d6974ad..ec4c27a4d9e 100644
--- a/src/ChangeLog.7
+++ b/src/ChangeLog.7
@@ -5943,7 +5943,7 @@
        Vauto_file_coding_system.
        (syms_of_fileio): Adjusted for the above change.  Doc change.
        (Finsert_file_contents): The argument for Vset_auto_coding is a
-        concatination of the heading 1K-byte and the tailing 3K-byte.
+        concatenation of the heading 1K-byte and the tailing 3K-byte.
        * cmds.c (internal_self_insert): Only set TARGET_CLM when C2 is tab.
        When multibyte characters are disabled,
@@ -7485,7 +7485,7 @@
 1997-06-09  Kenichi Handa  <handa@etl.go.jp>
-        * buffer.c (init_buffer_once): Inititialize the member
+        * buffer.c (init_buffer_once): Initialize the member
        buffer_file_coding_system.
        (syms_of_buffer): Declare Lisp variables
        default-buffer-file-coding-system and buffer-file-coding-system.
@@ -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 6fd4d5dea27..bd51e55cdc6 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.
@@ -2196,7 +2196,7 @@
 1999-09-14  Gerd Moellmann  <gerd@gnu.org>
-        * sound.c (Fplay_sound): Remove usused variables.
+        * sound.c (Fplay_sound): Remove unused variables.
        (be2hs): Put in #if 0 because it's currently not used.
 1999-09-14  Ken Raeburn  <raeburn@gnu.org>
@@ -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.
@@ -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/ChangeLog.9 b/src/ChangeLog.9
index 1a4abfab61b..9e7bd24f792 100644
--- a/src/ChangeLog.9
+++ b/src/ChangeLog.9
@@ -8409,7 +8409,7 @@
        (encode_coding_iso2022): New local variable safe_chars.  Check
        unsafe chars.
        (setup_coding_system): Delete the code to initialize
-        coding->safe_charses.
+        coding->safe_charsets.
        (intersection, find_safe_codings): New functions.
        (Ffind_coding_systems_region_internal): New function.
        (syms_of_coding): Defsubr it.  Initialize Qsafe_chars,
diff --git a/src/alloc.c b/src/alloc.c
index 639a35c3f36..96d63f53cf9 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -876,7 +876,7 @@ safe_alloca_unwind (Lisp_Object arg)
 /* Like malloc but used for allocating Lisp data.  NBYTES is the
   number of bytes to allocate, TYPE describes the intended use of the
-   allcated memory block (for strings, for conses, ...).  */
+   allocated memory block (for strings, for conses, ...).  */
 #ifndef USE_LSB_TAG
 static void *lisp_malloc_loser;
@@ -1406,7 +1406,7 @@ uninterrupt_malloc (void)
 #ifdef DOUG_LEA_MALLOC
  pthread_mutexattr_t attr;
-  /*  GLIBC has a faster way to do this, but lets keep it portable.
+  /*  GLIBC has a faster way to do this, but let's keep it portable.
      This is according to the Single UNIX Specification.  */
  pthread_mutexattr_init (&attr);
  pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE);
diff --git a/src/buffer.c b/src/buffer.c
index fdf006a41eb..8bc6e37732d 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -4431,7 +4431,7 @@ static int mmap_initialized_p;
   is currently mapped.  Used to prevent overwriting an existing
   memory mapping.
-   Default is to conservativly assume the address range is occupied by
+   Default is to conservatively assume the address range is occupied by
   something else.  This can be overridden by system configuration
   files if system-specific means to determine this exists.  */
@@ -4439,7 +4439,7 @@ static int mmap_initialized_p;
 #define MMAP_ALLOCATED_P(start, end) 1
 #endif
-/* Perform necessary intializations for the use of mmap.  */
+/* Perform necessary initializations for the use of mmap.  */
 static void
 mmap_init (void)
diff --git a/src/buffer.h b/src/buffer.h
index a6b82abf053..fa65a4b81fd 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -978,7 +978,7 @@ extern int last_per_buffer_idx;
   variable has an index > 0 associated with it, except when it always
   has buffer-local values, in which case the index is -1.  If this is
   0, this is a bug and means that the slot of VAR in
-   buffer_local_flags wasn't intiialized.  */
+   buffer_local_flags wasn't initialized.  */
 #define PER_BUFFER_VAR_IDX(VAR) \
    PER_BUFFER_IDX (PER_BUFFER_VAR_OFFSET (VAR))
diff --git a/src/bytecode.c b/src/bytecode.c
index 9ed29e94b54..3af0abd63cf 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 analogous to
   gcprolist.  */
 struct byte_stack *byte_stack_list;
diff --git a/src/ccl.c b/src/ccl.c
index 01943eddf58..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
@@ -484,7 +484,7 @@ static Lisp_Object Vccl_program_table;
   If the element is t or lambda, finish without changing reg[rrr].
   If the element is a number, set reg[rrr] to the number and finish.
-   Detail of the map structure is descibed in the comment for
+   Detail of the map structure is described in the comment for
   CCL_MapMultiple below.  */
 #define CCL_IterateMultipleMap  0x10 /* Iterate multiple maps
@@ -1762,7 +1762,7 @@ ccl_driver (struct ccl_program *ccl, int *source, int *destination, int src_size
        case CCL_STAT_QUIT:
          if (! ccl->quit_silently)
-            sprintf (msg, "\nCCL: Quited.");
+            sprintf (msg, "\nCCL: Quitted.");
          break;
        default:
@@ -1808,7 +1808,7 @@ ccl_driver (struct ccl_program *ccl, int *source, int *destination, int src_size
 /* Resolve symbols in the specified CCL code (Lisp vector).  This
   function converts symbols of code conversion maps and character
-   translation tables embeded in the CCL code into their ID numbers.
+   translation tables embedded in the CCL code into their ID numbers.
   The return value is a vector (CCL itself or a new vector in which
   all symbols are resolved), Qt if resolving of some symbol failed,
diff --git a/src/character.c b/src/character.c
index fb9b8a9b93e..88b1f11b96b 100644
--- a/src/character.c
+++ b/src/character.c
@@ -588,7 +588,7 @@ parse_str_as_multibyte (const unsigned char *str, EMACS_INT len,
 }
 /* Arrange unibyte text at STR of NBYTES bytes as a multibyte text.
-   It actually converts only such 8-bit characters that don't contruct
+   It actually converts only such 8-bit characters that don't construct
   a multibyte sequence to multibyte forms of Latin-1 characters.  If
   NCHARS is nonzero, set *NCHARS to the number of characters in the
   text.  It is assured that we can use LEN bytes at STR as a work
@@ -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
@@ -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/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/charset.c b/src/charset.c
index 8d6a3982d14..266753f9d05 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -162,8 +162,8 @@ static struct
  /* 1 iff the following table is used for encoder.  */
  short for_encoder;
-  /* When the following table is used for encoding, mininum and
+  /* When the following table is used for encoding, minimum and
-     maxinum character of the current charset.  */
+     maximum character of the current charset.  */
  int min_char, max_char;
  /* A Unicode character correspoinding to the code indice 0 (i.e. the
diff --git a/src/charset.h b/src/charset.h
index be02bc0feae..fc35d6bb991 100644
--- a/src/charset.h
+++ b/src/charset.h
@@ -153,7 +153,7 @@ struct charset
  /* Dimension of the charset: 1, 2, 3, or 4.  */
  int dimension;
-  /* Byte code range of each dimension.  <code_space>[4N] is a mininum
+  /* Byte code range of each dimension.  <code_space>[4N] is a minimum
     byte code of the (N+1)th dimension, <code_space>[4N+1] is a
     maximum byte code of the (N+1)th dimension, <code_space>[4N+2] is
     (<code_space>[4N+1] - <code_space>[4N] + 1), <code_space>[4N+3]
@@ -199,14 +199,14 @@ struct charset
  /* The method for encoding/decoding characters of the charset.  */
  enum charset_method method;
-  /* Mininum and Maximum code points of the charset.  */
+  /* Minimum and Maximum code points of the charset.  */
  unsigned min_code, max_code;
  /* Offset value used by macros CODE_POINT_TO_INDEX and
      INDEX_TO_CODE_POINT. .  */
  unsigned char_index_offset;
-  /* Mininum and Maximum character codes of the charset.  If the
+  /* Minimum and Maximum character codes of the charset.  If the
     charset is compatible with ASCII, min_char is a minimum non-ASCII
     character of the charset.  If the method of charset is
     CHARSET_METHOD_OFFSET, even if the charset is unified, min_char
diff --git a/src/chartab.c b/src/chartab.c
index 1d4ac04312a..8d903749284 100644
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -747,7 +747,7 @@ equivalent and can be merged.  It defaults to `equal'.  */)
   ARG is passed to C_FUNCTION when that is called.
   It returns the value of last character covered by TABLE (not the
-   value inheritted from the parent), and by side-effect, the car part
+   value inherited from the parent), and by side-effect, the car part
   of RANGE is updated to the minimum character C where C and all the
   following characters in TABLE have the same value.  */
@@ -758,7 +758,7 @@ map_sub_char_table (void (*c_function) (Lisp_Object, Lisp_Object, Lisp_Object),
 {
  /* Depth of TABLE.  */
  int depth;
-  /* Minimum and maxinum characters covered by TABLE. */
+  /* Minimum and maximum characters covered by TABLE. */
  int min_char, max_char;
  /* Number of characters covered by one element of TABLE.  */
  int chars_in_block;
@@ -1196,7 +1196,7 @@ uniprop_table_uncompress (Lisp_Object table, int idx)
 }
-/* Decode VALUE as an elemnet of char-table TABLE.  */
+/* Decode VALUE as an element of char-table TABLE.  */
 static Lisp_Object
 uniprop_decode_value_run_length (Lisp_Object table, Lisp_Object value)
diff --git a/src/coding.h b/src/coding.h
index fdf9b762e75..2621928adc3 100644
--- a/src/coding.h
+++ b/src/coding.h
@@ -518,7 +518,7 @@ struct coding_system
 #define CODING_REQUIRE_DETECTION_MASK           0x1000
 #define CODING_RESET_AT_BOL_MASK                0x2000
-/* Return 1 if the coding context CODING requires annotaion
+/* Return 1 if the coding context CODING requires annotation
   handling.  */
 #define CODING_REQUIRE_ANNOTATION(coding) \
  ((coding)->common_flags & CODING_ANNOTATION_MASK)
diff --git a/src/composite.c b/src/composite.c
index c8e4dd082ae..885e0262673 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -1307,7 +1307,7 @@ composition_reseat_it (struct composition_it *cmp_it, EMACS_INT charpos, EMACS_I
              if (cmp_it->lookback == 0)
                goto no_composition;
              lgstring = Qnil;
-              /* Try to find a shorter compostion that starts after CPOS.  */
+              /* Try to find a shorter composition that starts after CPOS.  */
              composition_compute_stop_pos (cmp_it, charpos, bytepos, cpos,
                                            string);
              if (cmp_it->ch == -2 || cmp_it->stop_pos < charpos)
diff --git a/src/composite.h b/src/composite.h
index c57e2a0e9b3..60145b10bd9 100644
--- a/src/composite.h
+++ b/src/composite.h
@@ -41,7 +41,7 @@ enum composition_method {
  COMPOSITION_NO
 };
-/* Maximum number of compoments a single composition can have.  */
+/* Maximum number of components a single composition can have.  */
 #define MAX_COMPOSITION_COMPONENTS 16
 /* These macros access information about a composition that
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/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/dired.c b/src/dired.c
index fac3a34ab9b..acc81a6ed9d 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -628,7 +628,7 @@ file_name_completion (Lisp_Object file, Lisp_Object dirname, int all_flag, int v
          if (includeall && !canexclude)
            { /* If we have one non-excludable file, we want to exclude the
-                 excudable files.  */
+                 excludable files.  */
              includeall = 0;
              /* Throw away any previous excludable match found.  */
              bestmatch = Qnil;
diff --git a/src/dispextern.h b/src/dispextern.h
index 5c60a5499da..486aa4f7a40 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -3126,6 +3126,9 @@ void compute_fringe_widths (struct frame *, int);
 void w32_init_fringe (struct redisplay_interface *);
 void w32_reset_fringes (void);
 #endif
+extern unsigned row_hash (struct glyph_row *);
 /* Defined in image.c */
 #ifdef HAVE_WINDOW_SYSTEM
diff --git a/src/dispnew.c b/src/dispnew.c
index 7b594c5b4e8..d6bf6666ee2 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -434,18 +434,7 @@ margin_glyphs_to_reserve (struct window *w, int total_glyphs, Lisp_Object margin
 int
 verify_row_hash (struct glyph_row *row)
 {
-  int area, k;
+  return row->hash == row_hash (row);
-  unsigned row_hash = 0;
-  for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area)
-    for (k = 0; k < row->used[area]; ++k)
-      row_hash = ((((row_hash << 4) + (row_hash >> 24)) & 0x0fffffff)
-                  + row->glyphs[area][k].u.val
-                  + row->glyphs[area][k].face_id
-                  + row->glyphs[area][k].padding_p
-                  + (row->glyphs[area][k].type << 2));
-  return row_hash == row->hash;
 }
 #endif
@@ -1083,37 +1072,55 @@ swap_glyphs_in_rows (struct glyph_row *a, struct glyph_row *b)
 #endif /* 0 */
-/* Exchange pointers to glyph memory between glyph rows A and B.  */
+/* Exchange pointers to glyph memory between glyph rows A and B.  Also
+   exchange the used[] array and the hash values of the rows, because
+   these should all go together for the row's hash value to be
+   correct.  */
 static inline void
 swap_glyph_pointers (struct glyph_row *a, struct glyph_row *b)
 {
  int i;
+  unsigned hash_tem = a->hash;
  for (i = 0; i < LAST_AREA + 1; ++i)
    {
      struct glyph *temp = a->glyphs[i];
+      short used_tem = a->used[i];
      a->glyphs[i] = b->glyphs[i];
      b->glyphs[i] = temp;
+      a->used[i] = b->used[i];
+      b->used[i] = used_tem;
    }
+  a->hash = b->hash;
+  b->hash = hash_tem;
 }
 /* Copy glyph row structure FROM to glyph row structure TO, except
-   that glyph pointers in the structures are left unchanged.  */
+   that glyph pointers, the `used' counts, and the hash values in the
+   structures are left unchanged.  */
 static inline void
 copy_row_except_pointers (struct glyph_row *to, struct glyph_row *from)
 {
  struct glyph *pointers[1 + LAST_AREA];
+  short used[1 + LAST_AREA];
+  unsigned hashval;
  /* Save glyph pointers of TO.  */
  memcpy (pointers, to->glyphs, sizeof to->glyphs);
+  memcpy (used, to->used, sizeof to->used);
+  hashval = to->hash;
  /* Do a structure assignment.  */
  *to = *from;
  /* Restore original pointers of TO.  */
  memcpy (to->glyphs, pointers, sizeof to->glyphs);
+  memcpy (to->used, used, sizeof to->used);
+  to->hash = hashval;
 }
@@ -3491,7 +3498,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;
@@ -4233,6 +4240,7 @@ add_row_entry (struct glyph_row *row)
  ptrdiff_t i = row->hash % row_table_size;
  entry = row_table[i];
+  xassert (entry || verify_row_hash (row));
  while (entry && !row_equal_p (entry->row, row, 1))
    entry = entry->next;
diff --git a/src/doprnt.c b/src/doprnt.c
index b4d13c59137..35af2297ff4 100644
--- a/src/doprnt.c
+++ b/src/doprnt.c
@@ -26,7 +26,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
     of the (`int') argument, suitable for display in an Emacs buffer.
   . For %s and %c, when field width is specified (e.g., %25s), it accounts for
-     the diplay width of each character, according to char-width-table.  That
+     the display width of each character, according to char-width-table.  That
     is, it does not assume that each character takes one column on display.
   . If the size of the buffer is not enough to produce the formatted string in
diff --git a/src/emacs.c b/src/emacs.c
index 12be7bc0808..529fa35a5bd 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1402,7 +1402,7 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
 #endif
  /* argmatch must not be used after here,
-     except when bulding temacs
+     except when building temacs
     because the -d argument has not been skipped in skip_args.  */
 #ifdef MSDOS
diff --git a/src/fileio.c b/src/fileio.c
index 44a85ab1977..e3586c50056 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -70,7 +70,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define IS_DRIVE(x) isalpha ((unsigned char) (x))
 #endif
 /* Need to lower-case the drive letter, or else expanded
-   filenames will sometimes compare inequal, because
+   filenames will sometimes compare unequal, because
   `expand-file-name' doesn't always down-case the drive letter.  */
 #define DRIVE_LETTER(x) (tolower ((unsigned char) (x)))
 #endif
@@ -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/fns.c b/src/fns.c
index 392f447a6d8..04b51d10d9b 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -3252,7 +3252,7 @@ DEFUN ("base64-decode-string", Fbase64_decode_string, Sbase64_decode_string,
  return decoded_string;
 }
-/* Base64-decode the data at FROM of LENGHT bytes into TO.  If
+/* Base64-decode the data at FROM of LENGTH bytes into TO.  If
   MULTIBYTE is nonzero, the decoded result should be in multibyte
   form.  If NCHARS_RETRUN is not NULL, store the number of produced
   characters in *NCHARS_RETURN.  */
diff --git a/src/font.c b/src/font.c
index f6723157de1..9559c65e7ed 100644
--- a/src/font.c
+++ b/src/font.c
@@ -802,7 +802,7 @@ font_expand_wildcards (Lisp_Object *field, int n)
  struct {
    /* Minimum possible field.  */
    int from;
-    /* Maxinum possible field.  */
+    /* Maximum possible field.  */
    int to;
    /* Bit mask of possible field.  Nth bit corresponds to Nth field.  */
    int mask;
@@ -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)
@@ -5144,7 +5144,7 @@ the corresponding glyph code.  If ENCODING is a char-table, looking up
 the table by a character gives the corresponding glyph code.
 REPERTORY specifies a repertory of characters supported by the font.
-If REPERTORY is a charset, all characters beloging to the charset are
+If REPERTORY is a charset, all characters belonging to the charset are
 supported.  If REPERTORY is a char-table, all characters who have a
 non-nil value in the table are supported.  If REPERTORY is nil, Emacs
 gets the repertory information by an opened font and ENCODING.  */);
diff --git a/src/font.h b/src/font.h
index e50eaff9a1f..42fc050b670 100644
--- a/src/font.h
+++ b/src/font.h
@@ -599,7 +599,7 @@ struct font_driver
  /* Optional.
     Store bitmap data for glyph-code CODE of FONT in BITMAP.  It is
-     intended that this method is callled from the other font-driver
+     intended that this method is called from the other font-driver
     for actual drawing.  */
  int (*get_bitmap) (struct font *font, unsigned code,
                     struct font_bitmap *bitmap,
diff --git a/src/fontset.c b/src/fontset.c
index 74a25a1ca04..e20d7957c7f 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -1088,7 +1088,7 @@ fontset_pattern_regexp (Lisp_Object pattern)
            nescs++;
        }
-      /* If PATTERN is not full XLFD we conert "*" to ".*".  Otherwise
+      /* If PATTERN is not full XLFD we convert "*" to ".*".  Otherwise
         we convert "*" to "[^-]*" which is much faster in regular
         expression matching.  */
      if (ndashes < 14)
@@ -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
@@ -1702,7 +1702,7 @@ static Lisp_Object auto_fontset_alist;
 /* Number of automatically created fontsets.  */
 static printmax_t num_auto_fontsets;
-/* Retun a fontset synthesized from FONT-OBJECT.  This is called from
+/* Return a fontset synthesized from FONT-OBJECT.  This is called from
   x_new_font when FONT-OBJECT is used for the default ASCII font of a
   frame, and the returned fontset is used for the default fontset of
   that frame.  The fontset specifies a font of the same registry as
@@ -1788,7 +1788,7 @@ update_auto_fontset_alist (Lisp_Object font_object, Lisp_Object fontset)
 /* Return a cons (FONT-OBJECT . GLYPH-CODE).
   FONT-OBJECT is the font for the character at POSITION in the current
   buffer.  This is computed from all the text properties and overlays
-   that apply to POSITION.  POSTION may be nil, in which case,
+   that apply to POSITION.  POSITION may be nil, in which case,
   FONT-SPEC is the font for displaying the character CH with the
   default face.
diff --git a/src/frame.c b/src/frame.c
index d56a2efb17f..984651ae9ce 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1237,7 +1237,7 @@ delete_frame (Lisp_Object frame, Lisp_Object force)
  else
    {
 #ifdef HAVE_X_WINDOWS
-      /* Also, save clipboard to the the clipboard manager.  */
+      /* Also, save clipboard to the clipboard manager.  */
      x_clipboard_manager_save_frame (frame);
 #endif
@@ -1359,6 +1359,13 @@ delete_frame (Lisp_Object frame, Lisp_Object force)
    /* If needed, delete the terminal that this frame was on.
       (This must be done after the frame is killed.) */
    terminal->reference_count--;
+#ifdef USE_GTK
+    /* FIXME: Deleting the terminal crashes emacs because of a GTK
+       bug.
+       http://lists.gnu.org/archive/html/emacs-devel/2011-10/msg00363.html */
+    if (terminal->reference_count == 0 && terminal->type == output_x_window)
+      terminal->reference_count = 1;
+#endif /* USE_GTK */
    if (terminal->reference_count == 0)
      {
        Lisp_Object tmp;
@@ -2487,7 +2494,7 @@ If FRAME is omitted, the selected frame is used.  The exact value
 of the result depends on the window-system and toolkit in use:
 In the Gtk+ version of Emacs, it includes only any window (including
-the minibuffer or eacho area), mode line, and header line.  It does not
+the minibuffer or echo area), mode line, and header line.  It does not
 include the tool bar or menu bar.
 With the Motif or Lucid toolkits, it also includes the tool bar (but
diff --git a/src/frame.h b/src/frame.h
index e096807b02e..a32d1c549b5 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -371,7 +371,7 @@ struct frame
     if greater than 1, then the frame is obscured - we still consider
     it to be "visible" as seen from lisp, but we don't bother
     updating it.  We must take care to garbage the frame when it
-     ceaces to be obscured though.
+     ceases to be obscured though.
     iconified is nonzero if the frame is currently iconified.
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/ftxfont.c b/src/ftxfont.c
index bbba3ca8163..608cfd8d44d 100644
--- a/src/ftxfont.c
+++ b/src/ftxfont.c
@@ -55,7 +55,7 @@ struct ftxfont_frame_data
 {
  /* Background and foreground colors.  */
  XColor colors[2];
-  /* GCs interporationg the above colors.  gcs[0] is for a color
+  /* GCs interpolating the above colors.  gcs[0] is for a color
   closest to BACKGROUND, and gcs[5] is for a color closest to
   FOREGROUND.  */
  GC gcs[6];
diff --git a/src/gtkutil.c b/src/gtkutil.c
index af697c72673..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)
@@ -348,7 +348,7 @@ file_for_image (Lisp_Object image)
 /* For the image defined in IMG, make and return a GtkImage.  For displays with
   8 planes or less we must make a GdkPixbuf and apply the mask manually.
-   Otherwise the highlightning and dimming the tool bar code in GTK does
+   Otherwise the highlighting and dimming the tool bar code in GTK does
   will look bad.  For display with more than 8 planes we just use the
   pixmap and mask directly.  For monochrome displays, GTK doesn't seem
   able to use external pixmaps, it looks bad whatever we do.
@@ -891,7 +891,7 @@ xg_frame_resized (FRAME_PTR f, int pixelwidth, int pixelheight)
    }
 }
-/* Resize the outer window of frame F after chainging the height.
+/* Resize the outer window of frame F after changing the height.
   COLUMNS/ROWS is the size the edit area shall have after the resize.  */
 void
@@ -1423,7 +1423,7 @@ get_dialog_title (char key)
 /* Callback for dialogs that get WM_DELETE_WINDOW.  We pop down
   the dialog, but return TRUE so the event does not propagate further
   in GTK.  This prevents GTK from destroying the dialog widget automatically
-   and we can always destrou the widget manually, regardles of how
+   and we can always destroy the widget manually, regardless of how
   it was popped down (button press or WM_DELETE_WINDOW).
   W is the dialog widget.
   EVENT is the GdkEvent that represents WM_DELETE_WINDOW (not used).
@@ -2294,7 +2294,7 @@ tearoff_activate (GtkWidget *widget, gpointer client_data)
 /* Create a menu item widget, and connect the callbacks.
-   ITEM decribes the menu item.
+   ITEM describes the menu item.
   F is the frame the created menu belongs to.
   SELECT_CB is the callback to use when a menu item is selected.
   HIGHLIGHT_CB is the callback to call when entering/leaving menu items.
@@ -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 14c74f10607..8b61c7eefbc 100644
--- a/src/image.c
+++ b/src/image.c
@@ -7552,7 +7552,7 @@ imagemagick_image_p (Lisp_Object object)
 }
 /* The GIF library also defines DrawRectangle, but its never used in Emacs.
-   Therefore rename the function so it doesnt collide with ImageMagick.  */
+   Therefore rename the function so it doesn't collide with ImageMagick.  */
 #define DrawRectangle DrawRectangleGif
 #include <wand/MagickWand.h>
@@ -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);
@@ -7786,7 +7786,7 @@ imagemagick_load_image (struct frame *f, struct image *img,
          goto imagemagick_error;
        }
-      /* Copy imagegmagick image to x with primitive yet robust pixel
+      /* Copy imagemagick image to x with primitive yet robust pixel
         pusher loop.  This has been tested a lot with many different
         images.  */
@@ -7824,7 +7824,7 @@ imagemagick_load_image (struct frame *f, struct image *img,
  if (imagemagick_rendermethod == 1)
    {
-      /* Magicexportimage is normaly faster than pixelpushing.  This
+      /* Magicexportimage is normally faster than pixelpushing.  This
         method is also well tested. Some aspects of this method are
         ad-hoc and needs to be more researched. */
      int imagedepth = 24;/*MagickGetImageDepth(image_wand);*/
@@ -7841,7 +7841,7 @@ imagemagick_load_image (struct frame *f, struct image *img,
        }
-      /* Oddly, the below code doesnt seem to work:*/
+      /* Oddly, the below code doesn't seem to work:*/
      /* switch(ximg->bitmap_unit){ */
      /* case 8: */
      /*   pixelwidth=CharPixel; */
@@ -7870,7 +7870,7 @@ imagemagick_load_image (struct frame *f, struct image *img,
                               /*&(img->pixmap));*/
                               ximg->data);
 #else
-      image_error ("You dont have MagickExportImagePixels, upgrade ImageMagick!",
+      image_error ("You don't have MagickExportImagePixels, upgrade ImageMagick!",
                   Qnil, Qnil);
 #endif
    }
@@ -8781,7 +8781,7 @@ syms_of_image (void)
     operation on GNU/Linux of calling dump-emacs after loading some images.  */
  image_types = NULL;
-  /* Must be defined now becase we're going to update it below, while
+  /* Must be defined now because we're going to update it below, while
     defining the supported image types.  */
  DEFVAR_LISP ("image-types", Vimage_types,
    doc: /* List of potentially supported image types.
diff --git a/src/indent.c b/src/indent.c
index a70b7971b96..07a54c0c1b7 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -1675,7 +1675,7 @@ compute_motion (EMACS_INT from, EMACS_INT fromvpos, EMACS_INT fromhpos, int did_
    val_compute_motion.prevhpos = contin_hpos;
  else
    val_compute_motion.prevhpos = prev_hpos;
-  /* We alalways handle all of them here; none of them remain to do.  */
+  /* We always handle all of them here; none of them remain to do.  */
  val_compute_motion.ovstring_chars_done = 0;
  /* Nonzero if have just continued a line */
diff --git a/src/indent.h b/src/indent.h
index 07ca4dd87a5..55ee934f574 100644
--- a/src/indent.h
+++ b/src/indent.h
@@ -19,7 +19,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* We introduce new member `tab_offset'.  We need it because of the
   existence of wide-column characters.  There is a case that the
   line-break occurs at a wide-column character and the number of
-   colums of the line gets less than width.
+   columns of the line gets less than width.
   Example (where W_ stands for a wide-column character):
             ----------
@@ -73,5 +73,3 @@ int disptab_matches_widthtab (struct Lisp_Char_Table *disptab,
 /* Recompute BUF's width table, using the display table DISPTAB.  */
 void recompute_width_table (struct buffer *buf,
                            struct Lisp_Char_Table *disptab);
diff --git a/src/insdel.c b/src/insdel.c
index 01e5c57b2b0..e39a362eac7 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -1316,7 +1316,7 @@ replace_range (EMACS_INT from, EMACS_INT to, Lisp_Object new,
  UNGCPRO;
-  /* Make args be valid */
+  /* Make args be valid.  */
  if (from < BEGV)
    from = BEGV;
  if (to > ZV)
diff --git a/src/intervals.c b/src/intervals.c
index a78c7f07f6c..05b7175ac3f 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -1317,7 +1317,7 @@ interval_deletion_adjustment (register INTERVAL tree, register EMACS_INT from,
  if (NULL_INTERVAL_P (tree))
    return 0;
-  /* Left branch */
+  /* Left branch.  */
  if (relative_position < LEFT_TOTAL_LENGTH (tree))
    {
      EMACS_INT subtract = interval_deletion_adjustment (tree->left,
@@ -1327,7 +1327,7 @@ interval_deletion_adjustment (register INTERVAL tree, register EMACS_INT from,
      CHECK_TOTAL_LENGTH (tree);
      return subtract;
    }
-  /* Right branch */
+  /* Right branch.  */
  else if (relative_position >= (TOTAL_LENGTH (tree)
                                 - RIGHT_TOTAL_LENGTH (tree)))
    {
@@ -1699,54 +1699,37 @@ graft_intervals_into_buffer (INTERVAL source, EMACS_INT position,
                                 Qnil, buf, 0);
        }
      if (! NULL_INTERVAL_P (BUF_INTERVALS (buffer)))
-        /* Shouldn't be necessary.  -stef  */
+        /* Shouldn't be necessary.  --Stef  */
        BUF_INTERVALS (buffer) = balance_an_interval (BUF_INTERVALS (buffer));
      return;
    }
-  if (NULL_INTERVAL_P (tree))
+  eassert (length == TOTAL_LENGTH (source));
-    {
-      /* The inserted text constitutes the whole buffer, so
+  if ((BUF_Z (buffer) - BUF_BEG (buffer)) == length)
+    {  /* The inserted text constitutes the whole buffer, so
         simply copy over the interval structure.  */
-      if ((BUF_Z (buffer) - BUF_BEG (buffer)) == TOTAL_LENGTH (source))
-        {
          Lisp_Object buf;
          XSETBUFFER (buf, buffer);
          BUF_INTERVALS (buffer) = reproduce_tree_obj (source, buf);
-          BUF_INTERVALS (buffer)->position = BEG;
+      BUF_INTERVALS (buffer)->position = BUF_BEG (buffer);
-          BUF_INTERVALS (buffer)->up_obj = 1;
+      eassert (BUF_INTERVALS (buffer)->up_obj == 1);
          return;
        }
+  else if (NULL_INTERVAL_P (tree))
-      /* Create an interval tree in which to place a copy
+    { /* Create an interval tree in which to place a copy
         of the intervals of the inserted string.  */
-      {
        Lisp_Object buf;
        XSETBUFFER (buf, buffer);
        tree = create_root_interval (buf);
      }
-    }
-  else if (TOTAL_LENGTH (tree) == TOTAL_LENGTH (source))
-    /* If the buffer contains only the new string, but
-       there was already some interval tree there, then it may be
-       some zero length intervals.  Eventually, do something clever
-       about inserting properly.  For now, just waste the old intervals.  */
-    {
-      BUF_INTERVALS (buffer) = reproduce_tree (source, INTERVAL_PARENT (tree));
-      BUF_INTERVALS (buffer)->position = BEG;
-      BUF_INTERVALS (buffer)->up_obj = 1;
-      /* Explicitly free the old tree here.  */
-      return;
-    }
  /* Paranoia -- the text has already been added, so this buffer
     should be of non-zero length.  */
  else if (TOTAL_LENGTH (tree) == 0)
    abort ();
  this = under = find_interval (tree, position);
-  if (NULL_INTERVAL_P (under))  /* Paranoia */
+  if (NULL_INTERVAL_P (under))  /* Paranoia.  */
    abort ();
  over = find_interval (source, interval_start_pos (source));
@@ -1917,7 +1900,7 @@ set_point (EMACS_INT charpos)
   current buffer, and the invisible property has a `stickiness' such that
   inserting a character at position POS would inherit the property it,
   return POS + ADJ, otherwise return POS.  If TEST_INTANG is non-zero,
-   then intangibility is required as well as invisibleness.
+   then intangibility is required as well as invisibility.
   TEST_OFFS should be either 0 or -1, and ADJ should be either 1 or -1.
diff --git a/src/intervals.h b/src/intervals.h
index 720598fe7a6..977f3d965a4 100644
--- a/src/intervals.h
+++ b/src/intervals.h
@@ -64,71 +64,71 @@ struct interval
  Lisp_Object plist;
 };
-/* These are macros for dealing with the interval tree. */
+/* These are macros for dealing with the interval tree.  */
-/* Size of the structure used to represent an interval */
+/* Size of the structure used to represent an interval.  */
 #define INTERVAL_SIZE (sizeof (struct interval))
-/* Size of a pointer to an interval structure */
+/* Size of a pointer to an interval structure.  */
 #define INTERVAL_PTR_SIZE (sizeof (struct interval *))
 #define NULL_INTERVAL_P(i) ((i) == NULL_INTERVAL)
-/* True if this interval has no right child. */
+/* True if this interval has no right child.  */
 #define NULL_RIGHT_CHILD(i) ((i)->right == NULL_INTERVAL)
-/* True if this interval has no left child. */
+/* True if this interval has no left child.  */
 #define NULL_LEFT_CHILD(i) ((i)->left == NULL_INTERVAL)
-/* True if this interval has no parent. */
+/* True if this interval has no parent.  */
 #define NULL_PARENT(i) ((i)->up_obj || (i)->up.interval == 0)
-/* True if this interval is the left child of some other interval. */
+/* True if this interval is the left child of some other interval.  */
 #define AM_LEFT_CHILD(i) (! NULL_PARENT (i) \
                          && INTERVAL_PARENT (i)->left == (i))
-/* True if this interval is the right child of some other interval. */
+/* True if this interval is the right child of some other interval.  */
 #define AM_RIGHT_CHILD(i) (! NULL_PARENT (i) \
                           && INTERVAL_PARENT (i)->right == (i))
-/* True if this interval has no children. */
+/* True if this interval has no children.  */
 #define LEAF_INTERVAL_P(i) ((i)->left == NULL_INTERVAL \
                            && (i)->right == NULL_INTERVAL)
-/* True if this interval has no parent and is therefore the root. */
+/* True if this interval has no parent and is therefore the root.  */
 #define ROOT_INTERVAL_P(i) (NULL_PARENT (i))
-/* True if this interval is the only interval in the interval tree. */
+/* True if this interval is the only interval in the interval tree.  */
 #define ONLY_INTERVAL_P(i) (ROOT_INTERVAL_P ((i)) && LEAF_INTERVAL_P ((i)))
-/* True if this interval has both left and right children. */
+/* True if this interval has both left and right children.  */
 #define BOTH_KIDS_P(i) ((i)->left != NULL_INTERVAL     \
                        && (i)->right != NULL_INTERVAL)
 /* The total size of all text represented by this interval and all its
-   children in the tree.   This is zero if the interval is null. */
+   children in the tree.   This is zero if the interval is null.  */
 #define TOTAL_LENGTH(i) ((i) == NULL_INTERVAL ? 0 : (i)->total_length)
-/* The size of text represented by this interval alone. */
+/* The size of text represented by this interval alone.  */
 #define LENGTH(i) ((i) == NULL_INTERVAL ? 0 : (TOTAL_LENGTH ((i))          \
                                               - TOTAL_LENGTH ((i)->right) \
                                               - TOTAL_LENGTH ((i)->left)))
 /* The position of the character just past the end of I.  Note that
-   the position cache i->position must be valid for this to work. */
+   the position cache i->position must be valid for this to work.  */
 #define INTERVAL_LAST_POS(i) ((i)->position + LENGTH ((i)))
-/* The total size of the left subtree of this interval. */
+/* The total size of the left subtree of this interval.  */
 #define LEFT_TOTAL_LENGTH(i) ((i)->left ? (i)->left->total_length : 0)
-/* The total size of the right subtree of this interval. */
+/* The total size of the right subtree of this interval.  */
 #define RIGHT_TOTAL_LENGTH(i) ((i)->right ? (i)->right->total_length : 0)
-/* These macros are for dealing with the interval properties. */
+/* These macros are for dealing with the interval properties.  */
 /* True if this is a default interval, which is the same as being null
-   or having no properties. */
+   or having no properties.  */
 #define DEFAULT_INTERVAL_P(i) (NULL_INTERVAL_P (i) || EQ ((i)->plist, Qnil))
 /* Test what type of parent we have.  Three possibilities: another
@@ -169,7 +169,7 @@ struct interval
    }                                        \
  while (0)
-/* Reset this interval to its vanilla, or no-property state. */
+/* Reset this interval to its vanilla, or no-property state.  */
 #define RESET_INTERVAL(i) \
 { \
    (i)->total_length = (i)->position = 0;    \
@@ -181,7 +181,7 @@ struct interval
    (i)->plist = Qnil;                        \
 }
-/* Copy the cached property values of interval FROM to interval TO. */
+/* Copy the cached property values of interval FROM to interval TO.  */
 #define COPY_INTERVAL_CACHE(from,to) \
 { \
  (to)->write_protect = (from)->write_protect; \
@@ -190,7 +190,7 @@ struct interval
  (to)->rear_sticky = (from)->rear_sticky;     \
 }
-/* Copy only the set bits of FROM's cache. */
+/* Copy only the set bits of FROM's cache.  */
 #define MERGE_INTERVAL_CACHE(from,to) \
 { \
  if ((from)->write_protect) (to)->write_protect = 1; \
@@ -201,18 +201,18 @@ struct interval
 /* Macro determining whether the properties of an interval being
   inserted should be merged with the properties of the text where
-   they are being inserted. */
+   they are being inserted.  */
 #define MERGE_INSERTIONS(i) 1
 /* Macro determining if an invisible interval should be displayed
-   as a special glyph, or not at all. */
+   as a special glyph, or not at all.  */
 #define DISPLAY_INVISIBLE_GLYPH(i) 0
-/* Is this interval visible?  Replace later with cache access */
+/* Is this interval visible?  Replace later with cache access.  */
 #define INTERVAL_VISIBLE_P(i) \
  (! NULL_INTERVAL_P (i) && NILP (textget ((i)->plist, Qinvisible)))
-/* Is this interval writable?  Replace later with cache access */
+/* Is this interval writable?  Replace later with cache access.  */
 #define INTERVAL_WRITABLE_P(i)                                  \
  (! NULL_INTERVAL_P (i)                                        \
   && (NILP (textget ((i)->plist, Qread_only))                  \
@@ -222,7 +222,7 @@ struct interval
            : !NILP (Vinhibit_read_only)))))                    \
 /* Macros to tell whether insertions before or after this interval
-   should stick to it. */
+   should stick to it.  */
 /* Replace later with cache access */
 /*#define FRONT_STICKY_P(i) ((i)->front_sticky != 0)
  #define END_STICKY_P(i) ((i)->rear_sticky != 0)*/
@@ -245,11 +245,11 @@ struct interval
   ? !NILP (prop)                                               \
   : invisible_p (prop, BVAR (current_buffer, invisibility_spec)))
-/* Declared in alloc.c */
+/* Declared in alloc.c.  */
 extern INTERVAL make_interval (void);
-/* Declared in intervals.c */
+/* Declared in intervals.c.  */
 extern INTERVAL create_root_interval (Lisp_Object);
 extern void copy_properties (INTERVAL, INTERVAL);
@@ -288,12 +288,12 @@ extern INTERVAL validate_interval_range (Lisp_Object, Lisp_Object *,
                                         Lisp_Object *, int);
 extern INTERVAL interval_of (EMACS_INT, Lisp_Object);
-/* Defined in xdisp.c */
+/* Defined in xdisp.c.  */
 extern int invisible_p (Lisp_Object, Lisp_Object);
-/* Declared in textprop.c */
+/* Declared in textprop.c.  */
-/* Types of hooks. */
+/* Types of hooks.  */
 extern Lisp_Object Qpoint_left;
 extern Lisp_Object Qpoint_entered;
 extern Lisp_Object Qmodification_hooks;
@@ -301,11 +301,11 @@ extern Lisp_Object Qcategory;
 extern Lisp_Object Qlocal_map;
 extern Lisp_Object Qkeymap;
-/* Visual properties text (including strings) may have. */
+/* Visual properties text (including strings) may have.  */
 extern Lisp_Object Qfont;
 extern Lisp_Object Qinvisible, Qintangible;
-/* Sticky properties */
+/* Sticky properties.  */
 extern Lisp_Object Qfront_sticky, Qrear_nonsticky;
 EXFUN (Fget_char_property, 3);
diff --git a/src/keyboard.c b/src/keyboard.c
index f8c31af3fbe..80873fcb57a 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -932,7 +932,7 @@ pop_kboard (void)
  state later.
  If Emacs is already in single_kboard mode, and F's keyboard is
-  locked, then this function will throw an errow.  */
+  locked, then this function will throw an error.  */
 void
 temporarily_switch_to_single_kboard (struct frame *f)
@@ -1060,7 +1060,7 @@ cmd_error_internal (Lisp_Object data, const char *context)
  struct frame *sf = SELECTED_FRAME ();
  /* The immediate context is not interesting for Quits,
-     since they are asyncronous.  */
+     since they are asynchronous.  */
  if (EQ (XCAR (data), Qquit))
    Vsignaling_function = Qnil;
@@ -5393,7 +5393,7 @@ make_lispy_event (struct input_event *event)
          || !lispy_function_keys[event->code - FUNCTION_KEY_OFFSET])
        {
          /* We need to use an alist rather than a vector as the cache
-             since we can't make a vector long enuf.  */
+             since we can't make a vector long enough.  */
          if (NILP (KVAR (current_kboard, system_key_syms)))
            KVAR (current_kboard, system_key_syms) = Fcons (Qnil, Qnil);
          return modify_event_symbol (event->code,
@@ -8782,7 +8782,7 @@ typedef struct keyremap
  /* Positions [START, END) in the key sequence buffer
     are the key that we have scanned so far.
     Those events are the ones that we will replace
-     if PAREHT maps them into a key sequence.  */
+     if PARENT maps them into a key sequence.  */
  int start, end;
 } keyremap;
@@ -10137,7 +10137,7 @@ will read just one key sequence.  */)
                         ! NILP (can_return_switch_frame), 0);
 #if 0  /* The following is fine for code reading a key sequence and
-          then proceeding with a lenghty computation, but it's not good
+          then proceeding with a lengthy computation, but it's not good
          for code reading keys in a loop, like an input method.  */
 #ifdef HAVE_WINDOW_SYSTEM
  if (display_hourglass_p)
@@ -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/keymap.c b/src/keymap.c
index 739dfd8f2de..b429ca968d7 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)))
        {
@@ -2624,11 +2624,11 @@ remapped command in the returned list.  */)
      /* We have a list of advertised bindings.  */
      while (CONSP (tem))
        if (EQ (shadow_lookup (keymaps, XCAR (tem), Qnil, 0), definition))
-          return XCAR (tem);
+          RETURN_UNGCPRO (XCAR (tem));
        else
          tem = XCDR (tem);
      if (EQ (shadow_lookup (keymaps, tem, Qnil, 0), definition))
-        return tem;
+        RETURN_UNGCPRO (tem);
    }
  sequences = Freverse (where_is_internal (definition, keymaps,
diff --git a/src/lisp.h b/src/lisp.h
index 880de65bf65..dcd1167e0a2 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -943,7 +943,7 @@ struct Lisp_Vector
 /* Compute A OP B, using the unsigned comparison operator OP.  A and B
   should be integer expressions.  This is not the same as
-   mathemeatical comparison; for example, UNSIGNED_CMP (0, <, -1)
+   mathematical comparison; for example, UNSIGNED_CMP (0, <, -1)
   returns 1.  For efficiency, prefer plain unsigned comparison if A
   and B's sizes both fit (after integer promotion).  */
 #define UNSIGNED_CMP(a, op, b)                                          \
diff --git a/src/lread.c b/src/lread.c
index 110f3e62f71..f1f6f0cbd78 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -3984,7 +3984,7 @@ init_obarray (void)
  Qnil = intern_c_string ("nil");
  /* Fmake_symbol inits fields of new symbols with Qunbound and Qnil,
-     so those two need to be fixed manally.  */
+     so those two need to be fixed manually.  */
  SET_SYMBOL_VAL (XSYMBOL (Qunbound), Qunbound);
  XSYMBOL (Qunbound)->function = Qunbound;
  XSYMBOL (Qunbound)->plist = Qnil;
diff --git a/src/msdos.c b/src/msdos.c
index 6b6e365a165..4c08c5b29e0 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -1342,7 +1342,7 @@ static void
 IT_copy_glyphs (int xfrom, int xto, size_t len, int ypos)
 {
  /* The offsets of source and destination relative to the
-     conventional memorty selector.  */
+     conventional memory selector.  */
  int from = 2 * (xfrom + screen_size_X * ypos) + ScreenPrimary;
  int to = 2 * (xto + screen_size_X * ypos) + ScreenPrimary;
diff --git a/src/nsfns.m b/src/nsfns.m
index 20b021c6f5d..280fee0b27b 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -1267,7 +1267,7 @@ This function is an internal primitive--use `make-frame' instead.  */)
 #endif
  init_frame_faces (f);
-  
  /* The resources controlling the menu-bar and tool-bar are
     processed specially at startup, and reflected in the mode
     variables; ignore them here.  */
@@ -1656,7 +1656,7 @@ If omitted or nil, the selected frame's display is used.  */)
 DEFUN ("x-display-backing-store", Fx_display_backing_store,
       Sx_display_backing_store, 0, 1, 0,
-       doc: /* Return whether the Nexstep display DISPLAY supports backing store.
+       doc: /* Return whether the Nextstep display DISPLAY supports backing store.
 The value may be `buffered', `retained', or `non-retained'.
 DISPLAY should be a frame, the display name as a string, or a terminal ID.
 If omitted or nil, the selected frame's display is used.  */)
@@ -1846,7 +1846,7 @@ DEFUN ("ns-emacs-info-panel", Fns_emacs_info_panel, Sns_emacs_info_panel,
 DEFUN ("ns-font-name", Fns_font_name, Sns_font_name, 1, 1, 0,
-       doc: /* Determine font postscript or family name for font NAME.
+       doc: /* Determine font PostScript or family name for font NAME.
 NAME should be a string containing either the font name or an XLFD
 font descriptor.  If string contains `fontset' and not
 `fontset-startup', it is left alone. */)
diff --git a/src/nsterm.h b/src/nsterm.h
index b54e182780a..574d31c962a 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -447,7 +447,7 @@ struct nsfont_info
 {
  struct font font;
-  char *name;  /* postscript name, uniquely identifies on NS systems */
+  char *name;  /* PostScript name, uniquely identifies on NS systems */
  float width;  /* this and following metrics stored as float rather than int */
  float height;
  float underpos;
diff --git a/src/nsterm.m b/src/nsterm.m
index 3d3723fc28c..c5b28d57ac5 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -3035,7 +3035,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 antipication 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);
    }
@@ -4503,7 +4503,7 @@ ns_term_shutdown (int sig)
  //ns_app_active=YES;
  ns_update_auto_hide_menu_bar ();
-  // No constrining takes place when the application is not active.
+  // No constraining takes place when the application is not active.
  ns_constrain_all_frames ();
 }
 - (void)applicationDidResignActive: (NSNotification *)notification
diff --git a/src/print.c b/src/print.c
index 62bd048cf97..fc36d29da7c 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1635,7 +1635,7 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
                /* Detect circular list.  */
                if (NILP (Vprint_circle))
                  {
-                    /* Simple but imcomplete way.  */
+                    /* Simple but incomplete way.  */
                    if (i != 0 && EQ (obj, halftail))
                      {
                        sprintf (buf, " . #%"pMd, i / 2);
diff --git a/src/process.c b/src/process.c
index 301274676d6..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
@@ -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;
@@ -5377,8 +5377,8 @@ send_process (volatile Lisp_Object proc, const char *volatile buf,
             sending a multibyte text, thus we must encode it by the
             original coding system specified for the current process.
-             Another reason we comming here is that the coding system
+             Another reason we come here is that the coding system
-             was just complemented and new one was returned by
+             was just complemented and a new one was returned by
             complement_process_encoding_system.  */
          setup_coding_system (p->encode_coding_system, coding);
          Vlast_coding_system_used = p->encode_coding_system;
diff --git a/src/ralloc.c b/src/ralloc.c
index 50d322523c1..62189ad8fc7 100644
--- a/src/ralloc.c
+++ b/src/ralloc.c
@@ -219,13 +219,13 @@ find_heap (POINTER address)
   If enough space is not presently available in our reserve, this means
   getting more page-aligned space from the system.  If the returned space
   is not contiguous to the last heap, allocate a new heap, and append it
+   to the heap list.
-   obtain does not try to keep track of whether space is in use
+   obtain does not try to keep track of whether space is in use or not
-   or not in use.  It just returns the address of SIZE bytes that
+   in use.  It just returns the address of SIZE bytes that fall within a
-   fall within a single heap.  If you call obtain twice in a row
+   single heap.  If you call obtain twice in a row with the same arguments,
-   with the same arguments, you typically get the same value.
+   you typically get the same value.  It's the caller's responsibility to
-   to the heap list.  It's the caller's responsibility to keep
+   keep track of what space is in use.
-   track of what space is in use.
   Return the address of the space if all went well, or zero if we couldn't
   allocate the memory.  */
@@ -389,7 +389,7 @@ find_bloc (POINTER *ptr)
  while (p != NIL_BLOC)
    {
      /* Consistency check. Don't return inconsistent blocs.
-         Don't abort here, as callers might be expecting this,  but
+         Don't abort here, as callers might be expecting this, but
         callers that always expect a bloc to be returned should abort
         if one isn't to avoid a memory corruption bug that is
         difficult to track down.  */
@@ -1180,7 +1180,7 @@ r_alloc_reset_variable (POINTER *old, POINTER *new)
  /* Find the bloc that corresponds to the data pointed to by pointer.
     find_bloc cannot be used, as it has internal consistency checks
-     which fail when the variable needs reseting.  */
+     which fail when the variable needs resetting.  */
  while (bloc != NIL_BLOC)
    {
      if (bloc->data == *new)
diff --git a/src/regex.c b/src/regex.c
index ccbad58abb3..b7699378f5a 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -637,7 +637,7 @@ typedef enum
  on_failure_jump_nastyloop,
        /* A smart `on_failure_jump' used for greedy * and + operators.
-           It analyses the loop before which it is put and if the
+           It analyzes the loop before which it is put and if the
           loop does not require backtracking, it changes itself to
           `on_failure_keep_string_jump' and short-circuits the loop,
           else it just defaults to changing itself into `on_failure_jump'.
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/sound.c b/src/sound.c
index 362c04b7d40..39007574afc 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -226,7 +226,7 @@ struct sound_device
  /* Close device SD.  */
  void (* close) (struct sound_device *sd);
-  /* Configure SD accoring to device-dependent parameters.  */
+  /* Configure SD according to device-dependent parameters.  */
  void (* configure) (struct sound_device *device);
  /* Choose a device-dependent format for outputting sound S.  */
diff --git a/src/syssignal.h b/src/syssignal.h
index 7533a5a64fd..315400d8498 100644
--- a/src/syssignal.h
+++ b/src/syssignal.h
@@ -39,7 +39,7 @@ extern sigset_t empty_mask;
 /* POSIX pretty much destroys any possibility of writing sigmask as a
   macro in standard C.  We always define our own version because the
-   predefined macro in Glibc 2.1 is only provided for compatility for old
+   predefined macro in Glibc 2.1 is only provided for compatibility for old
   programs that use int as signal mask type.  */
 #undef sigmask
 #ifdef __GNUC__
diff --git a/src/unexelf.c b/src/unexelf.c
index 979d6dce629..04c029f7e80 100644
--- a/src/unexelf.c
+++ b/src/unexelf.c
@@ -1019,7 +1019,7 @@ temacs:
          /* The conditional bit below was in Oliva's original code
             (1999-08-25) and seems to have been dropped by mistake
             subsequently.  It prevents a crash at startup under X in
-             `IRIX64 6.5 6.5.17m', whether compiled on that relase or
+             `IRIX64 6.5 6.5.17m', whether compiled on that release or
             an earlier one.  It causes no trouble on the other ELF
             platforms I could test (Irix 6.5.15m, Solaris 8, Debian
             Potato x86, Debian Woody SPARC); however, it's reported
diff --git a/src/w32.c b/src/w32.c
index c752333c68d..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 ();
@@ -3403,7 +3403,7 @@ stat (const char * path, struct stat * buf)
                           FILE_FLAG_BACKUP_SEMANTICS, NULL))
         != INVALID_HANDLE_VALUE)
    {
-      /* This is more accurate in terms of gettting the correct number
+      /* This is more accurate in terms of getting the correct number
         of links, but is quite slow (it is noticeable when Emacs is
         making a list of file name completions). */
      BY_HANDLE_FILE_INFORMATION info;
@@ -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 ffbcff86694..5b936195aa5 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -2088,7 +2088,7 @@ w32_key_to_modifier (int key)
      key_mapping = Qnil;
    }
-  /* NB. This code runs in the input thread, asychronously to the lisp
+  /* NB. This code runs in the input thread, asynchronously to the lisp
     thread, so we must be careful to ensure access to lisp data is
     thread-safe.  The following code is safe because the modifier
     variable values are updated atomically from lisp and symbols are
@@ -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)
                        {
@@ -6709,7 +6709,7 @@ DEFUN ("default-printer-name", Fdefault_printer_name, Sdefault_printer_name,
      ClosePrinter (hPrn);
      return Qnil;
    }
-  /* Call GetPrinter again with big enouth memory block */
+  /* Call GetPrinter again with big enough memory block.  */
  err = GetPrinter (hPrn, 2, (LPBYTE)ppi2, dwNeeded, &dwReturned);
  ClosePrinter (hPrn);
  if (!err)
diff --git a/src/w32font.c b/src/w32font.c
index 365f8b78a5e..bd58e7e757b 100644
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -330,7 +330,7 @@ w32font_list (Lisp_Object frame, Lisp_Object font_spec)
 /* w32 implementation of match for font backend.
   Return a font entity most closely matching with FONT_SPEC on
-   FRAME.  The closeness is detemined by the font backend, thus
+   FRAME.  The closeness is determined by the font backend, thus
   `face-font-selection-order' is ignored here.  */
 static Lisp_Object
 w32font_match (Lisp_Object frame, Lisp_Object font_spec)
@@ -1284,8 +1284,8 @@ font_matches_spec (DWORD type, NEWTEXTMETRICEX *font,
            {
              /* Only truetype fonts will have information about what
                 scripts they support.  This probably means the user
-                 will have to force Emacs to use raster, postscript
+                 will have to force Emacs to use raster, PostScript
-                 or atm fonts for non-ASCII text.  */
+                 or ATM fonts for non-ASCII text.  */
              if (type & TRUETYPE_FONTTYPE)
                {
                  Lisp_Object support
@@ -1464,7 +1464,7 @@ check_face_name (LOGFONT *font, char *full_name)
  /* Helvetica is mapped to Arial in Windows, but if a Type-1 Helvetica is
     installed, we run into problems with the Uniscribe backend which tries
     to avoid non-truetype fonts, and ends up mixing the Type-1 Helvetica
-     with Arial's characteristics, since that attempt to use Truetype works
+     with Arial's characteristics, since that attempt to use TrueType works
     some places, but not others.  */
  if (!xstrcasecmp (font->lfFaceName, "helvetica"))
    {
@@ -1492,7 +1492,7 @@ check_face_name (LOGFONT *font, char *full_name)
 /* Callback function for EnumFontFamiliesEx.
- * Checks if a font matches everything we are trying to check agaist,
+ * Checks if a font matches everything we are trying to check against,
 * and if so, adds it to a list. Both the data we are checking against
 * and the list to which the fonts are added are passed in via the
 * lparam argument, in the form of a font_callback_data struct. */
diff --git a/src/w32font.h b/src/w32font.h
index 45c06897195..f77866b869f 100644
--- a/src/w32font.h
+++ b/src/w32font.h
@@ -20,8 +20,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define EMACS_W32FONT_H
-/* Bit 17 of ntmFlags in NEWTEXTMETRIC is set for Postscript OpenType fonts,
+/* Bit 17 of ntmFlags in NEWTEXTMETRIC is set for PostScript OpenType fonts,
-   bit 18 for Truetype OpenType fonts, bit 20 for Type1 fonts.  */
+   bit 18 for TrueType OpenType fonts, bit 20 for Type1 fonts.  */
 #ifndef NTM_PS_OPENTYPE
 #define NTM_PS_OPENTYPE 0x00020000
 #endif
@@ -84,4 +84,3 @@ int uniscribe_check_otf (LOGFONT *font, Lisp_Object otf_spec);
 Lisp_Object intern_font_name (char *);
 #endif
diff --git a/src/w32menu.c b/src/w32menu.c
index c31a8c1fd96..39d101e7bd5 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -1443,7 +1443,7 @@ add_menu_item (HMENU menu, widget_value *wv, HMENU item)
              out_string = (char *) local_alloc (strlen (wv->name) + 1);
              strcpy (out_string, wv->name);
 #ifdef MENU_DEBUG
-              DebPrint ("Menu: allocing %ld for owner-draw", out_string);
+              DebPrint ("Menu: allocating %ld for owner-draw", out_string);
 #endif
              fuFlags = MF_OWNERDRAW | MF_DISABLED;
            }
diff --git a/src/w32proc.c b/src/w32proc.c
index 47cbf57d9ea..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;
@@ -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.  */
@@ -241,7 +241,8 @@ reader_thread (void *arg)
  /* We have to wait for the go-ahead before we can start */
  if (cp == NULL
-      || WaitForSingleObject (cp->char_consumed, INFINITE) != WAIT_OBJECT_0)
+      || WaitForSingleObject (cp->char_consumed, INFINITE) != WAIT_OBJECT_0
+      || cp->fd < 0)
    return 1;
  for (;;)
@@ -820,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
@@ -2295,7 +2296,7 @@ filesystems via ange-ftp.  */);
               doc: /* Non-nil means attempt to fake realistic inode values.
 This works by hashing the truename of files, and should detect
 aliasing between long and short (8.3 DOS) names, but can have
-false positives because of hash collisions.  Note that determing
+false positives because of hash collisions.  Note that determining
 the truename of a file can be slow.  */);
  Vw32_generate_fake_inodes = Qnil;
 #endif
@@ -2319,4 +2320,3 @@ where the performance impact may be noticeable even on modern hardware.  */);
  staticpro (&Vw32_valid_codepages);
 }
 /* end of w32proc.c */
diff --git a/src/w32term.c b/src/w32term.c
index f876cff0363..a2ccdd21f7d 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -3287,7 +3287,7 @@ w32_mouse_position (FRAME_PTR *fp, int insist, Lisp_Object *bar_window,
 /* Handle mouse button event on the tool-bar of frame F, at
   frame-relative coordinates X/Y.  EVENT_TYPE is either ButtionPress
-   or ButtonRelase.  */
+   or ButtonRelease.  */
 static void
 w32_handle_tool_bar_click (struct frame *f, struct input_event *button_event)
@@ -4506,7 +4506,7 @@ w32_read_socket (struct terminal *terminal, int expected,
            }
          /* If window has been obscured or exposed by another window
-             being maximised or minimised/restored, then recheck
+             being maximized or minimized/restored, then recheck
             visibility of all frames.  Direct changes to our own
             windows get handled by WM_SIZE.  */
 #if 0
@@ -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.
@@ -5691,11 +5691,11 @@ x_make_frame_visible (struct frame *f)
      f->output_data.w32->asked_for_visible = 1;
      /* According to a report in emacs-devel 2008-06-03, SW_SHOWNORMAL
-         causes unexpected behaviour when unminimizing frames that were
+         causes unexpected behavior when unminimizing frames that were
-         previously maximised.  But only SW_SHOWNORMAL works properly for
+         previously maximized.  But only SW_SHOWNORMAL works properly for
         frames that were truely hidden (using make-frame-invisible), so
         we need it to avoid Bug#5482.  It seems that async_iconified
-         is only set for minimised windows that are still visible, so
+         is only set for minimized windows that are still visible, so
         use that to determine the appropriate flag to pass ShowWindow.  */
      my_show_window (f, FRAME_W32_WINDOW (f),
                      f->async_iconified ? SW_RESTORE : SW_SHOWNORMAL);
@@ -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/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)
diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c
index f6347bb88f7..36197b3b28a 100644
--- a/src/w32uniscribe.c
+++ b/src/w32uniscribe.c
@@ -507,7 +507,7 @@ uniscribe_encode_char (struct font *font, int c)
          if (SUCCEEDED (result) && nglyphs == 1)
            {
              /* Some fonts return .notdef glyphs instead of failing.
-                 (Truetype spec reserves glyph code 0 for .notdef)  */
+                 (TrueType spec reserves glyph code 0 for .notdef)  */
              if (glyphs[0])
                code = glyphs[0];
            }
@@ -961,4 +961,3 @@ syms_of_w32uniscribe (void)
  register_font_driver (&uniscribe_font_driver, NULL);
 }
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.c b/src/window.c
index 0a780a0170a..776f097b59e 100644
--- a/src/window.c
+++ b/src/window.c
@@ -465,32 +465,29 @@ Return nil if WINDOW has no previous sibling.  */)
  return decode_any_window (window)->prev;
 }
-DEFUN ("window-nest", Fwindow_nest, Swindow_nest, 0, 1, 0,
+DEFUN ("window-combination-limit", Fwindow_combination_limit, Swindow_combination_limit, 1, 1, 0,
-       doc: /* Return nest status of window WINDOW.
+       doc: /* Return combination limit of window WINDOW.
-If WINDOW is omitted or nil, it defaults to the selected window.
 If the return value is nil, child windows of WINDOW can be recombined with
-WINDOW's siblings.  A return value of non-nil means that child windows of
+WINDOW's siblings.  A return value of t means that child windows of
 WINDOW are never \(re-)combined with WINDOW's siblings.  */)
  (Lisp_Object window)
 {
-  return decode_any_window (window)->nest;
+  return decode_any_window (window)->combination_limit;
 }
-DEFUN ("set-window-nest", Fset_window_nest, Sset_window_nest, 2, 2, 0,
+DEFUN ("set-window-combination-limit", Fset_window_combination_limit, Sset_window_combination_limit, 2, 2, 0,
-       doc: /* Set nest status of window WINDOW to STATUS; return STATUS.
+       doc: /* Set combination limit of window WINDOW to STATUS; return STATUS.
-If WINDOW is omitted or nil, it defaults to the selected window.
+If STATUS is nil, child windows of WINDOW can be recombined with
+WINDOW's siblings.  STATUS t means that child windows of WINDOW are
-If STATUS is nil, child windows of WINDOW can be recombined with WINDOW's
+never \(re-)combined with WINDOW's siblings.  Other values are reserved
-siblings.  STATUS non-nil means that child windows of WINDOW are never
+for future use.  */)
-\(re-)combined with WINDOW's siblings.  */)
  (Lisp_Object window, Lisp_Object status)
 {
  register struct window *w = decode_any_window (window);
-  w->nest = status;
+  w->combination_limit = status;
-  return w->nest;
+  return w->combination_limit;
 }
 DEFUN ("window-use-time", Fwindow_use_time, Swindow_use_time, 0, 1, 0,
@@ -1879,7 +1876,7 @@ recombine_windows (Lisp_Object window)
  w = XWINDOW (window);
  parent = w->parent;
-  if (!NILP (parent) && NILP (w->nest))
+  if (!NILP (parent) && NILP (w->combination_limit))
    {
      p = XWINDOW (parent);
      if (((!NILP (p->vchild) && !NILP (w->vchild))
@@ -2344,7 +2341,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);
@@ -3248,7 +3245,7 @@ make_parent_window (Lisp_Object window, int horflag)
  p->start = Qnil;
  p->pointm = Qnil;
  p->buffer = Qnil;
-  p->nest = Qnil;
+  p->combination_limit = Qnil;
  p->window_parameters = Qnil;
 }
@@ -3295,7 +3292,7 @@ make_window (void)
  w->start_at_line_beg = w->display_table = w->dedicated = Qnil;
  w->base_line_number = w->base_line_pos = w->region_showing = Qnil;
  w->column_number_displayed = w->redisplay_end_trigger = Qnil;
-  w->nest = w->window_parameters = Qnil;
+  w->combination_limit = w->window_parameters = Qnil;
  w->prev_buffers = w->next_buffers = Qnil;
  /* Initialize non-Lisp data.  */
  w->desired_matrix = w->current_matrix = 0;
@@ -3668,7 +3665,7 @@ set correctly.  See the code of `split-window' for how this is done.  */)
  int horflag
    /* HORFLAG is 1 when we split side-by-side, 0 otherwise.  */
    = EQ (side, Qt) || EQ (side, Qleft) || EQ (side, Qright);
-  int do_nest = 0;
+  int combination_limit = 0;
  CHECK_WINDOW (old);
  o = XWINDOW (old);
@@ -3677,11 +3674,11 @@ set correctly.  See the code of `split-window' for how this is done.  */)
  CHECK_NUMBER (total_size);
-  /* Set do_nest to 1 if we have to make a new parent window.  We do
+  /* Set combination_limit to 1 if we have to make a new parent window.
-     that if either `window-nest' is non-nil, or OLD has no parent, or
+     We do that if either `window-combination-limit' is t, or OLD has no
-     OLD is ortho-combined.  */
+     parent, or OLD is ortho-combined.  */
-  do_nest =
+  combination_limit =
-    !NILP (Vwindow_nest)
+    !NILP (Vwindow_combination_limit)
    || NILP (o->parent)
    || NILP (horflag
             ? (XWINDOW (o->parent)->hchild)
@@ -3701,8 +3698,8 @@ set correctly.  See the code of `split-window' for how this is done.  */)
    error ("Attempt to split minibuffer window");
  else if (XINT (total_size) < (horflag ? 2 : 1))
    error ("Size of new window too small (after split)");
-  else if (!do_nest && !NILP (Vwindow_splits))
+  else if (!combination_limit && !NILP (Vwindow_combination_resize))
-    /* `window-splits' non-nil means try to resize OLD's siblings
+    /* `window-combination-resize' non-nil means try to resize OLD's siblings
       proportionally.  */
    {
      p = XWINDOW (o->parent);
@@ -3726,7 +3723,7 @@ set correctly.  See the code of `split-window' for how this is done.  */)
    }
  /* This is our point of no return. */
-  if (do_nest)
+  if (combination_limit)
    {
      /* Save the old value of o->normal_cols/lines.  It gets corrupted
         by make_parent_window and we need it below for assigning it to
@@ -3735,8 +3732,9 @@ set correctly.  See the code of `split-window' for how this is done.  */)
      make_parent_window (old, horflag);
      p = XWINDOW (o->parent);
-      /* Store value of `window-nest' in new parent's nest slot.  */
+      /* Store value of `window-combination-limit' in new parent's
-      p->nest = Vwindow_nest;
+         combination_limit slot.  */
+      p->combination_limit = Vwindow_combination_limit;
      /* These get applied below.  */
      p->new_total = horflag ? o->total_cols : o->total_lines;
      p->new_normal = new_normal;
@@ -3923,7 +3921,7 @@ Signal an error when WINDOW is the only window on its frame.  */)
          /* Put SIBLING into PARENT's place.  */
          replace_window (parent, sibling, 0);
          /* Have SIBLING inherit the following three slot values from
-             PARENT (the nest slot is not inherited).  */
+             PARENT (the combination_limit slot is not inherited).  */
          s->normal_cols = p->normal_cols;
          s->normal_lines = p->normal_lines;
          /* Mark PARENT as deleted.  */
@@ -5312,7 +5310,7 @@ struct saved_window
  Lisp_Object left_margin_cols, right_margin_cols;
  Lisp_Object left_fringe_width, right_fringe_width, fringes_outside_margins;
  Lisp_Object scroll_bar_width, vertical_scroll_bar_type, dedicated;
-  Lisp_Object nest, window_parameters;
+  Lisp_Object combination_limit, window_parameters;
 };
 #define SAVED_WINDOW_N(swv,n) \
@@ -5543,7 +5541,7 @@ the return value is nil.  Otherwise the value is t.  */)
          w->scroll_bar_width = p->scroll_bar_width;
          w->vertical_scroll_bar_type = p->vertical_scroll_bar_type;
          w->dedicated = p->dedicated;
-          w->nest = p->nest;
+          w->combination_limit = p->combination_limit;
          w->window_parameters = p->window_parameters;
          XSETFASTINT (w->last_modified, 0);
          XSETFASTINT (w->last_overlay_modified, 0);
@@ -5775,13 +5773,30 @@ get_phys_cursor_glyph (struct window *w)
 {
  struct glyph_row *row;
  struct glyph *glyph;
+  int hpos = w->phys_cursor.hpos;
+  if (!(w->phys_cursor.vpos >= 0
+        && w->phys_cursor.vpos < w->current_matrix->nrows))
+    return NULL;
+  row = MATRIX_ROW (w->current_matrix, w->phys_cursor.vpos);
+  if (!row->enabled_p)
+    return NULL;
-  if (w->phys_cursor.vpos >= 0
+  if (w->hscroll)
-      && w->phys_cursor.vpos < w->current_matrix->nrows
+    {
-      && (row = MATRIX_ROW (w->current_matrix, w->phys_cursor.vpos),
+      /* When the window is hscrolled, cursor hpos can legitimately be
-          row->enabled_p)
+         out of bounds, but we draw the cursor at the corresponding
-      && row->used[TEXT_AREA] > w->phys_cursor.hpos)
+         window margin in that case.  */
-    glyph = row->glyphs[TEXT_AREA] + w->phys_cursor.hpos;
+      if (!row->reversed_p && hpos < 0)
+        hpos = 0;
+      if (row->reversed_p && hpos >= row->used[TEXT_AREA])
+        hpos = row->used[TEXT_AREA] - 1;
+    }
+  if (row->used[TEXT_AREA] > hpos
+      && 0 <= hpos)
+    glyph = row->glyphs[TEXT_AREA] + hpos;
  else
    glyph = NULL;
@@ -5821,7 +5836,7 @@ save_window_save (Lisp_Object window, struct Lisp_Vector *vector, int i)
      p->scroll_bar_width = w->scroll_bar_width;
      p->vertical_scroll_bar_type = w->vertical_scroll_bar_type;
      p->dedicated = w->dedicated;
-      p->nest = w->nest;
+      p->combination_limit = w->combination_limit;
      p->window_parameters = w->window_parameters;
      if (!NILP (w->buffer))
        {
@@ -6284,7 +6299,8 @@ freeze_window_starts (struct frame *f, int freeze_p)
   and the like.
   This ignores a couple of things like the dedicatedness status of
-   window, nest and the like.  This might have to be fixed.  */
+   window, combination_limit and the like.  This might have to be
+   fixed.  */
 int
 compare_window_configurations (Lisp_Object configuration1, Lisp_Object configuration2, int ignore_positions)
@@ -6488,32 +6504,39 @@ will redraw the entire frame; the special value `tty' causes the
 frame to be redrawn only if it is a tty frame.  */);
  Vrecenter_redisplay = Qtty;
-  DEFVAR_LISP ("window-splits", Vwindow_splits,
+  DEFVAR_LISP ("window-combination-resize", Vwindow_combination_resize,
-               doc: /* Non-nil means splitting windows is handled specially.
+               doc: /* Non-nil means resize window combinations proportionally.
 If this variable is nil, splitting a window gets the entire screen space
-for displaying the new window from the window to split.  If this
+for displaying the new window from the window to split.  Deleting and
-variable is non-nil, splitting a window may resize all windows in the
+resizing a window preferably resizes one adjacent window only.
-same combination.  This also allows to split a window that is otherwise
-too small or of fixed size.
-This variable takes no effect if `window-nest' is non-nil.  */);
+If this variable is non-nil, splitting a window tries to get the space
-  Vwindow_splits = Qnil;
+proportionally from all windows in the same combination.  This also
+allows to split a window that is otherwise too small or of fixed size.
+Resizing and deleting a window proportionally resize all windows in the
+same combination.
-  DEFVAR_LISP ("window-nest", Vwindow_nest,
+This variable takes no effect if `window-combination-limit' is non-nil.  */);
+  Vwindow_combination_resize = Qnil;
+  DEFVAR_LISP ("window-combination-limit", Vwindow_combination_limit,
               doc: /* Non-nil means splitting a window makes a new parent window.
 If this variable is nil, splitting a window will create a new parent
 window only if the window has no parent window or the window shall
-become a combination orthogonal to the one it it is part of.
+become a combination orthogonal to the one it is part of.
+If this variable is t, splitting a window always creates a new parent
+window.  If all splits behave this way, each frame's window tree is a
+binary tree and every window but the frame's root window has exactly one
+sibling.
-If this variable is non-nil, splitting a window always creates a new
+Other values are reserved for future use.
-parent window.  If all splits behave this way, each frame's window tree
-is a binary tree and every window but the frame's root window has
-exactly one sibling.
-The value of this variable is also assigned to the nest status of the
+The value of this variable is also assigned to the combination-limit
-new parent window.  The nest status of a window can be retrieved via the
+status of the new parent window.  The combination-limit status of a
-function `window-nest' and altered by the function `set-window-nest'.  */);
+window can be retrieved via the function `window-combination-limit' and
-  Vwindow_nest = Qnil;
+altered by the function `set-window-combination-limit'.  */);
+  Vwindow_combination_limit = Qnil;
  defsubr (&Sselected_window);
  defsubr (&Sminibuffer_window);
@@ -6533,8 +6556,8 @@ function `window-nest' and altered by the function `set-window-nest'.  */);
  defsubr (&Swindow_left_child);
  defsubr (&Swindow_next_sibling);
  defsubr (&Swindow_prev_sibling);
-  defsubr (&Swindow_nest);
+  defsubr (&Swindow_combination_limit);
-  defsubr (&Sset_window_nest);
+  defsubr (&Sset_window_combination_limit);
  defsubr (&Swindow_use_time);
  defsubr (&Swindow_top_line);
  defsubr (&Swindow_left_column);
diff --git a/src/window.h b/src/window.h
index c11235bd67b..df29ca1368f 100644
--- a/src/window.h
+++ b/src/window.h
@@ -258,9 +258,8 @@ struct window
       must run the redisplay-end-trigger-hook.  */
    Lisp_Object redisplay_end_trigger;
-    /* Non-nil means this window's child windows are never
+    /* t means this window's child windows are not (re-)combined.  */
-       (re-)combined.  */
+    Lisp_Object combination_limit;
-    Lisp_Object nest;
    /* Alist of <buffer, window-start, window-point> triples listing
       buffers previously shown in this window.  */
@@ -269,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 dfb794f38d3..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)
@@ -15031,7 +15031,7 @@ redisplay_window (Lisp_Object window, int just_this_one_p)
  int current_matrix_up_to_date_p = 0;
  int used_current_matrix_p = 0;
  /* This is less strict than current_matrix_up_to_date_p.
-     It indictes that the buffer contents and narrowing are unchanged.  */
+     It indicates that the buffer contents and narrowing are unchanged.  */
  int buffer_unchanged_p = 0;
  int temp_scroll_step = 0;
  int count = SPECPDL_INDEX ();
@@ -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.  */
@@ -17949,6 +17949,23 @@ insert_left_trunc_glyphs (struct it *it)
    }
 }
+/* Compute the hash code for ROW.  */
+unsigned
+row_hash (struct glyph_row *row)
+{
+  int area, k;
+  unsigned hashval = 0;
+  for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area)
+    for (k = 0; k < row->used[area]; ++k)
+      hashval = ((((hashval << 4) + (hashval >> 24)) & 0x0fffffff)
+                  + row->glyphs[area][k].u.val
+                  + row->glyphs[area][k].face_id
+                  + row->glyphs[area][k].padding_p
+                  + (row->glyphs[area][k].type << 2));
+  return hashval;
+}
 /* Compute the pixel height and width of IT->glyph_row.
@@ -18035,17 +18052,7 @@ compute_line_metrics (struct it *it)
    }
  /* Compute a hash code for this row.  */
-  {
+  row->hash = row_hash (row);
-    int area, i;
-    row->hash = 0;
-    for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area)
-      for (i = 0; i < row->used[area]; ++i)
-        row->hash = ((((row->hash << 4) + (row->hash >> 24)) & 0x0fffffff)
-                     + row->glyphs[area][i].u.val
-                     + row->glyphs[area][i].face_id
-                     + row->glyphs[area][i].padding_p
-                     + (row->glyphs[area][i].type << 2));
-  }
  it->max_ascent = it->max_descent = 0;
  it->max_phys_ascent = it->max_phys_descent = 0;
@@ -19382,9 +19389,18 @@ display_line (struct it *it)
      overlay_arrow_seen = 1;
    }
+  /* Highlight trailing whitespace.  */
+  if (!NILP (Vshow_trailing_whitespace))
+    highlight_trailing_whitespace (it->f, it->glyph_row);
  /* Compute pixel dimensions of this line.  */
  compute_line_metrics (it);
+  /* Implementation note: No changes in the glyphs of ROW or in their
+     faces can be done past this point, because compute_line_metrics
+     computes ROW's hash value and stores it within the glyph_row
+     structure.  */
  /* Record whether this row ends inside an ellipsis.  */
  row->ends_in_ellipsis_p
    = (it->method == GET_FROM_DISPLAY_VECTOR
@@ -19419,10 +19435,6 @@ display_line (struct it *it)
      && cursor_row_p (row))
    set_cursor_from_row (it->w, row, it->w->desired_matrix, 0, 0, 0, 0);
-  /* Highlight trailing whitespace.  */
-  if (!NILP (Vshow_trailing_whitespace))
-    highlight_trailing_whitespace (it->f, it->glyph_row);
  /* Prepare for the next line.  This line starts horizontally at (X
     HPOS) = (0 0).  Vertical positions are incremented.  As a
     convenience for the caller, IT->glyph_row is set to the next
@@ -22049,7 +22061,7 @@ get_glyph_face_and_encoding (struct frame *f, struct glyph *glyph,
 /* Get glyph code of character C in FONT in the two-byte form CHAR2B.
-   Retunr 1 if FONT has a glyph for C, otherwise return 0.  */
+   Return 1 if FONT has a glyph for C, otherwise return 0.  */
 static inline int
 get_char_glyph_code (int c, struct font *font, XChar2b *char2b)
@@ -23622,7 +23634,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
@@ -24659,9 +24671,17 @@ x_produce_glyphs (struct it *it)
 void
 x_write_glyphs (struct glyph *start, int len)
 {
-  int x, hpos;
+  int x, hpos, chpos = updated_window->phys_cursor.hpos;
  xassert (updated_window && updated_row);
+  /* When the window is hscrolled, cursor hpos can legitimately be out
+     of bounds, but we draw the cursor at the corresponding window
+     margin in that case.  */
+  if (!updated_row->reversed_p && chpos < 0)
+    chpos = 0;
+  if (updated_row->reversed_p && chpos >= updated_row->used[TEXT_AREA])
+    chpos = updated_row->used[TEXT_AREA] - 1;
  BLOCK_INPUT;
  /* Write glyphs.  */
@@ -24676,8 +24696,8 @@ x_write_glyphs (struct glyph *start, int len)
  if (updated_area == TEXT_AREA
      && updated_window->phys_cursor_on_p
      && updated_window->phys_cursor.vpos == output_cursor.vpos
-      && updated_window->phys_cursor.hpos >= hpos
+      && chpos >= hpos
-      && updated_window->phys_cursor.hpos < hpos + len)
+      && chpos < hpos + len)
    updated_window->phys_cursor_on_p = 0;
  UNBLOCK_INPUT;
@@ -25187,8 +25207,17 @@ draw_phys_cursor_glyph (struct window *w, struct glyph_row *row,
    {
      int on_p = w->phys_cursor_on_p;
      int x1;
-      x1 = draw_glyphs (w, w->phys_cursor.x, row, TEXT_AREA,
+      int hpos = w->phys_cursor.hpos;
-                        w->phys_cursor.hpos, w->phys_cursor.hpos + 1,
+      /* When the window is hscrolled, cursor hpos can legitimately be
+         out of bounds, but we draw the cursor at the corresponding
+         window margin in that case.  */
+      if (!row->reversed_p && hpos < 0)
+        hpos = 0;
+      if (row->reversed_p && hpos >= row->used[TEXT_AREA])
+        hpos = row->used[TEXT_AREA] - 1;
+      x1 = draw_glyphs (w, w->phys_cursor.x, row, TEXT_AREA, hpos, hpos + 1,
                        hl, 0);
      w->phys_cursor_on_p = on_p;
@@ -25276,6 +25305,14 @@ erase_phys_cursor (struct window *w)
       : (w->phys_cursor.hpos >= cursor_row->used[TEXT_AREA])))
    goto mark_cursor_off;
+  /* When the window is hscrolled, cursor hpos can legitimately be out
+     of bounds, but we draw the cursor at the corresponding window
+     margin in that case.  */
+  if (!cursor_row->reversed_p && hpos < 0)
+    hpos = 0;
+  if (cursor_row->reversed_p && hpos >= cursor_row->used[TEXT_AREA])
+    hpos = cursor_row->used[TEXT_AREA] - 1;
  /* If the cursor is in the mouse face area, redisplay that when
     we clear the cursor.  */
  if (! NILP (hlinfo->mouse_face_window)
@@ -25419,8 +25456,26 @@ update_window_cursor (struct window *w, int on)
     of being deleted.  */
  if (w->current_matrix)
    {
+      int hpos = w->phys_cursor.hpos;
+      int vpos = w->phys_cursor.vpos;
+      struct glyph_row *row;
+      if (vpos >= w->current_matrix->nrows
+          || hpos >= w->current_matrix->matrix_w)
+        return;
+      row = MATRIX_ROW (w->current_matrix, vpos);
+      /* When the window is hscrolled, cursor hpos can legitimately be
+         out of bounds, but we draw the cursor at the corresponding
+         window margin in that case.  */
+      if (!row->reversed_p && hpos < 0)
+        hpos = 0;
+      if (row->reversed_p && hpos >= row->used[TEXT_AREA])
+        hpos = row->used[TEXT_AREA] - 1;
      BLOCK_INPUT;
-      display_and_set_cursor (w, on, w->phys_cursor.hpos, w->phys_cursor.vpos,
+      display_and_set_cursor (w, on, hpos, vpos,
                              w->phys_cursor.x, w->phys_cursor.y);
      UNBLOCK_INPUT;
    }
@@ -25590,9 +25645,18 @@ show_mouse_face (Mouse_HLInfo *hlinfo, enum draw_glyphs_face draw)
      if (FRAME_WINDOW_P (f)
          && phys_cursor_on_p && !w->phys_cursor_on_p)
        {
+          int hpos = w->phys_cursor.hpos;
+          /* When the window is hscrolled, cursor hpos can legitimately be
+             out of bounds, but we draw the cursor at the corresponding
+             window margin in that case.  */
+          if (!row->reversed_p && hpos < 0)
+            hpos = 0;
+          if (row->reversed_p && hpos >= row->used[TEXT_AREA])
+            hpos = row->used[TEXT_AREA] - 1;
          BLOCK_INPUT;
-          display_and_set_cursor (w, 1,
+          display_and_set_cursor (w, 1, hpos, w->phys_cursor.vpos,
-                                  w->phys_cursor.hpos, w->phys_cursor.vpos,
                                  w->phys_cursor.x, w->phys_cursor.y);
          UNBLOCK_INPUT;
        }
@@ -25691,7 +25755,19 @@ coords_in_mouse_face_p (struct window *w, int hpos, int vpos)
 int
 cursor_in_mouse_face_p (struct window *w)
 {
-  return coords_in_mouse_face_p (w, w->phys_cursor.hpos, w->phys_cursor.vpos);
+  int hpos = w->phys_cursor.hpos;
+  int vpos = w->phys_cursor.vpos;
+  struct glyph_row *row = MATRIX_ROW (w->current_matrix, vpos);
+  /* When the window is hscrolled, cursor hpos can legitimately be out
+     of bounds, but we draw the cursor at the corresponding window
+     margin in that case.  */
+  if (!row->reversed_p && hpos < 0)
+    hpos = 0;
+  if (row->reversed_p && hpos >= row->used[TEXT_AREA])
+    hpos = row->used[TEXT_AREA] - 1;
+  return coords_in_mouse_face_p (w, hpos, vpos);
 }
@@ -28442,7 +28518,7 @@ To add a prefix to continuation lines, use `wrap-prefix'.  */);
  DEFVAR_INT ("overline-margin", overline_margin,
               doc: /* *Space between overline and text, in pixels.
 The default value is 2: the height of the overline (1 pixel) plus 1 pixel
-margin to the caracter height.  */);
+margin to the character height.  */);
  overline_margin = 2;
  DEFVAR_INT ("underline-minimum-offset",
diff --git a/src/xfaces.c b/src/xfaces.c
index 0ed6fa1d8e2..849ad6bbdf4 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -4189,12 +4189,12 @@ prepare_face_for_display (struct frame *f, struct face *face)
 static int
 color_distance (XColor *x, XColor *y)
 {
-  /* This formula is from a paper title `Colour metric' by Thiadmer Riemersma.
+  /* This formula is from a paper titled `Colour metric' by Thiadmer Riemersma.
     Quoting from that paper:
         This formula has results that are very close to L*u*v* (with the
         modified lightness curve) and, more importantly, it is a more even
-         algorithm: it does not have a range of colours where it suddenly
+         algorithm: it does not have a range of colors where it suddenly
         gives far from optimal results.
     See <http://www.compuphase.com/cmetric.htm> for more info.  */
diff --git a/src/xfns.c b/src/xfns.c
index 2359a1a82c2..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 ();
@@ -3691,7 +3691,7 @@ If omitted or nil, that stands for the selected frame's display.  */)
 DEFUN ("x-server-vendor", Fx_server_vendor, Sx_server_vendor, 0, 1, 0,
       doc: /* Return the "vendor ID" string of the X server of display TERMINAL.
-\(Labelling every distributor as a "vendor" embodies the false assumption
+\(Labeling every distributor as a "vendor" embodies the false assumption
 that operating systems cannot be developed and distributed noncommercially.)
 The optional argument TERMINAL specifies which display to ask about.
 TERMINAL should be a terminal object, a frame or a display name (a string).
diff --git a/src/xfont.c b/src/xfont.c
index 2c3ca911623..60e5aa6e98e 100644
--- a/src/xfont.c
+++ b/src/xfont.c
@@ -272,8 +272,8 @@ xfont_chars_supported (Lisp_Object chars, XFontStruct *xfont,
  return 0;
 }
-/* A hash table recoding which font supports which scritps.  Each key
+/* A hash table recoding which font supports which scripts.  Each key
-   is a vector of characteristic font propertis FOUNDRY to WIDTH and
+   is a vector of characteristic font properties FOUNDRY to WIDTH and
   ADDSTYLE, and each value is a list of script symbols.
   We assume that fonts that have the same value in the above
@@ -281,7 +281,7 @@ xfont_chars_supported (Lisp_Object chars, XFontStruct *xfont,
 static Lisp_Object xfont_scripts_cache;
-/* Re-usable vector to store characteristic font properites.   */
+/* Re-usable vector to store characteristic font properties.   */
 static Lisp_Object xfont_scratch_props;
 /* Return a list of scripts supported by the font of FONTNAME whose
diff --git a/src/xmenu.c b/src/xmenu.c
index 0dd652b566d..4b7bbfd73dc 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1304,7 +1304,7 @@ free_frame_menubar (FRAME_PTR f)
 #ifdef USE_MOTIF
      /* Removing the menu bar magically changes the shell widget's x
         and y position of (0, 0) which, when the menu bar is turned
-         on again, leads to pull-down menuss appearing in strange
+         on again, leads to pull-down menus appearing in strange
         positions near the upper-left corner of the display.  This
         happens only with some window managers like twm and ctwm,
         but not with other like Motif's mwm or kwm, because the
diff --git a/src/xselect.c b/src/xselect.c
index adee1872dba..4bfab4143cc 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -2355,7 +2355,7 @@ x_fill_property_data (Display *dpy, Lisp_Object data, void *ret, int format)
   F is the frame to be used to look up X atoms if the TYPE is XA_ATOM.
   DATA is a C array of values to be converted.
   TYPE is the type of the data.  Only XA_ATOM is special, it converts
-   each number in DATA to its corresponfing X atom as a symbol.
+   each number in DATA to its corresponding X atom as a symbol.
   FORMAT is 8, 16 or 32 and gives the size in bits for each C value to
   be stored in RET.
   SIZE is the number of elements in DATA.
diff --git a/src/xsettings.c b/src/xsettings.c
index d57f3b5be81..a8604ac5897 100644
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -121,7 +121,7 @@ store_font_name_changed (const char *newfont)
 }
 #endif /* HAVE_XFT */
-/* Map TOOL_BAR_STYLE from a string to its correspinding Lisp value.
+/* Map TOOL_BAR_STYLE from a string to its corresponding Lisp value.
   Return Qnil if TOOL_BAR_STYLE is not known.  */
 static Lisp_Object
diff --git a/src/xsmfns.c b/src/xsmfns.c
index 55daec73307..7deac7b14e4 100644
--- a/src/xsmfns.c
+++ b/src/xsmfns.c
@@ -462,7 +462,7 @@ x_session_initialize (struct x_display_info *dpyinfo)
      Vx_session_id = build_string (client_id);
 #ifdef USE_GTK
-      /* GTK creats a leader window by itself, but we need to tell
+      /* GTK creates a leader window by itself, but we need to tell
         it about our client_id.  */
      gdk_x11_set_sm_client_id (client_id);
 #else
diff --git a/src/xterm.c b/src/xterm.c
index fb77faa75fe..0e529714eb6 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -4184,7 +4184,7 @@ static Boolean xaw3d_arrow_scroll;
 /* Whether the drag scrolling maintains the mouse at the top of the
   thumb.  If not, resizing the thumb needs to be done more carefully
-   to avoid jerkyness.  */
+   to avoid jerkiness.  */
 static Boolean xaw3d_pick_top;
@@ -6120,7 +6120,7 @@ handle_one_xevent (struct x_display_info *dpyinfo, XEvent *eventptr,
          {
            /* Gnome shell does not iconify us when C-z is pressed.  It hides
               the frame.  So if our state says we aren't hidden anymore,
-               treat is as deiconfied.  */
+               treat it as deiconified.  */
            if (! f->async_iconified)
              SET_FRAME_GARBAGED (f);
            f->async_visible = 1;
diff --git a/src/xterm.h b/src/xterm.h
index e10a6bc34f0..1d2ce9a2d3c 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -330,7 +330,7 @@ struct x_display_info
  ptrdiff_t x_dnd_atoms_length;
  /* Extended window manager hints, Atoms supported by the window manager and
-     atoms for settig the window type.  */
+     atoms for setting the window type.  */
  Atom Xatom_net_supported, Xatom_net_supporting_wm_check;
  Atom *net_supported_atoms;
  int nr_net_supported_atoms;
author	Paul Eggert	2011-11-19 19:07:02 -0800
committer	Paul Eggert	2011-11-19 19:07:02 -0800
commit	615a3b8d0d2c88cd664f1e0beb5a32b5b8e08f90 (patch)
tree	e0458a9eac443c36a3a4bfa117fde01bbd6e4140 /src
parent	c3ca24d48c10fb771ee02eb58f7d49bd82d6306e (diff)
parent	e1dbe924b53c541fdf238a5a722b7177d5c8760b (diff)
download	emacs-615a3b8d0d2c88cd664f1e0beb5a32b5b8e08f90.tar.gz emacs-615a3b8d0d2c88cd664f1e0beb5a32b5b8e08f90.zip