upstream

author: Joakim Verona 2011-11-22 15:46:22 +0100
committer: Joakim Verona 2011-11-22 15:46:22 +0100
commit: a9c1e05adddf6011c61c0df582c5f2ed423f35c8 (patch)
tree: 489fac119296416ba2f3530fd3bcb70efbbbdaa6 /src
parent: 40bb789236e486a3f36eefb2840c293369ce2af3 (diff)
parent: b5afc20930c91159a1cbf629bcaa7e251653dc74 (diff)
download: emacs-a9c1e05adddf6011c61c0df582c5f2ed423f35c8.tar.gz
emacs-a9c1e05adddf6011c61c0df582c5f2ed423f35c8.zip
70 files changed, 523 insertions, 374 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index e1854d7ffcd..a0f83560603 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,115 @@
+2011-11-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+        * process.c (wait_reading_process_output): Fix asynchrounous
+        GnuTLS socket handling on some versions of the GnuTLS library.
+        (wait_reading_process_output): Add comment and URL.
+2011-11-21  Jan Djärv  <jan.h.d@swipnet.se>
+        * xterm.c (x_clear_frame): Reinstate the XClearWindow call.
+2011-11-21  Chong Yidong  <cyd@gnu.org>
+        * window.c (Fnext_window, Fprevious_window): Doc fix.
+2011-11-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+        * window.c (get_phys_cursor_glyph): Fix Lisp_Object/int mixup.
+2011-11-20  Juanma Barranquero  <lekktu@gmail.com>
+        * nsfont.m (syms_of_nsfont) <ns-reg-to-script>: Fix typo.
+2011-11-20  Martin Rudalics  <rudalics@gmx.at>
+        * window.c (Fset_window_combination_limit): Rename argument
+        STATUS to LIMIT.
+        (Vwindow_combination_limit): Remove "status" from doc-string.
+2011-11-20  Andreas Schwab  <schwab@linux-m68k.org>
+        * m/ibms390.h: Remove.
+        * m/ibms390x.h: Don't include "ibms390.h".
+2011-11-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+        * fileio.c (Finsert_file_contents): Add missing gcpro1 variable.
+        Suggested by Dmitry Antipov <dmantipov@yandex.ru>.
+2011-11-20  Juanma Barranquero  <lekktu@gmail.com>
+        * casetab.c (Fset_case_table):
+        * charset.c (Fcharset_after): Fix typos.
+2011-11-20  Paul Eggert  <eggert@cs.ucla.edu>
+        Standardize on VIRT_ADDR_VARIES behavior (Bug#10042).
+        Otherwise, valgrind does not work on some platforms.
+        Problem reported by Andreas Schwab in
+        <http://lists.gnu.org/archive/html/emacs-devel/2011-11/msg00081.html>.
+        * puresize.h (pure, PURE_P): Always behave as if VIRT_ADDR_VARIES
+        is set, removing the need for VIRT_ADDRESS_VARIES.
+        (PURE_P): Use a more-efficient implementation that needs just one
+        comparison, not two: on x86-64 with GCC 4.6.2, this cut down the
+        number of instructions from 6 (xorl, cmpq, jge, xorl, cmpq, setge)
+        to 4 (xorl, subq, cmpq, setbe).
+        * alloc.c (pure): Always extern now, since that's the
+        VIRT_ADDR_VARIES behavior.
+        (PURE_POINTER_P): Use a single comparison, not two, for
+        consistency with the new puresize.h.
+        * lisp.h (PNTR_COMPARISON_TYPE): Remove; no longer needed.
+        * 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.
@@ -371,7 +483,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>
diff --git a/src/ChangeLog.1 b/src/ChangeLog.1
index efe77648458..7fef45f36da 100644
--- a/src/ChangeLog.1
+++ b/src/ChangeLog.1
@@ -2237,7 +2237,7 @@
        * data.c (Fset):
        If Vautoload_queue non-nil, record function and old definition
-        by consing onto Vautoload_qeueue.
+        by consing onto Vautoload_queue.
        * fns.c (Fprovide):
        If Vautoload_queue is non-nil, record old value of Vfeatures.
diff --git a/src/ChangeLog.10 b/src/ChangeLog.10
index 181b11b5a2b..99ab02577d5 100644
--- a/src/ChangeLog.10
+++ b/src/ChangeLog.10
@@ -6387,7 +6387,7 @@
 2005-11-20  Nick Roberts  <nickrob@snap.net.nz>
        * lisp.h: Use typedef when Lisp_Object is EMACS_INT so that
-        this type is recognised when debugging.
+        this type is recognized when debugging.
 2005-11-19  Andreas Schwab  <schwab@suse.de>
@@ -13398,7 +13398,7 @@
 2004-07-04  John Paul Wallington  <jpw@gnu.org>
        * fileio.c (read_file_name_completion_ignore_case): New variable.
-        (syms_of_fileio): Declare and initialise it.
+        (syms_of_fileio): Declare and initialize it.
        (Fread_file_name): Bind `completion-ignore-case' to respect it.
 2004-07-03  Eli Zaretskii  <eliz@gnu.org>
@@ -18755,7 +18755,7 @@
 2003-05-21  Dave Love  <fx@gnu.org>
-        [Merged from unicode branch.]
+        [Merged from Unicode branch.]
        * xfns.c (x_window, x_window): Use use_xim.
diff --git a/src/ChangeLog.11 b/src/ChangeLog.11
index 73ac5fd4e00..07d4f4ec116 100644
--- a/src/ChangeLog.11
+++ b/src/ChangeLog.11
@@ -4839,7 +4839,7 @@
 2010-08-13  Jason Rumney  <jasonr@gnu.org>
-        * w32menu.c (simple_dialog_show): Use unicode message box if available.
+        * w32menu.c (simple_dialog_show): Use Unicode message box if available.
        (MessageBoxW_Proc): New function typedef.
        (unicode-message-box): New function pointer.
        (globals_of_w32menu): Import it from user32.dll.  (Bug#5629)
@@ -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>
@@ -6604,9 +6604,9 @@
        * keyboard.c (input_available_signal): Declare.
        (kbd_buffer_nr_stored): New function.
        (kbd_buffer_store_event_hold): If kbd_buffer_nr_stored returns
-        more than KBD_BUFFER_SIZE/2, stop reding input (Bug#6571).
+        more than KBD_BUFFER_SIZE/2, stop reading input (Bug#6571).
        (kbd_buffer_get_event): If input is suspended and kbd_buffer_nr_stored
-        returns less than KBD_BUFFER_SIZE/4, resume reding input (Bug#6571).
+        returns less than KBD_BUFFER_SIZE/4, resume reading input (Bug#6571).
        (tty_read_avail_input): If input is on hold, return.
        Don't read more that free slots in kbd_buffer (Bug#6571).
@@ -7199,7 +7199,7 @@
 2010-06-27  Chong Yidong  <cyd@stupidchicken.com>
-        * xfns.c (Fx_create_frame): Don't consult X resouces when setting
+        * xfns.c (Fx_create_frame): Don't consult X resources when setting
        menu-bar-lines and tool-bar-lines.  Use menu-bar-mode and
        tool-bar-mode, which are now set using these X resources at
        startup, to determine the defaults (Bug#2249).
@@ -7683,7 +7683,7 @@
 2010-05-20  Juri Linkov  <juri@jurta.org>
-        * fileio.c (Fdelete_file): Change interative spec to use
+        * fileio.c (Fdelete_file): Change interactive spec to use
        `read-file-name' like in `find-file-read-args' where the default
        value is `default-directory' instead of `buffer-file-name'.
        http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00533.html
@@ -8991,8 +8991,8 @@
 2010-04-13  Jan Djärv  <jan.h.d@swipnet.se>
        * gtkutil.c (xg_set_geometry): Set geometry for PPosition also.
-        (x_wm_set_size_hint): Dont set position flags, gtk_window_parse_geometry
+        (x_wm_set_size_hint): Don't set position flags,
-        does that.
+        gtk_window_parse_geometry does that.
        * xfns.c (Fx_create_frame, x_create_tip_frame): Set default border width
        to zero.
@@ -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.
@@ -9864,8 +9864,8 @@
 2010-01-27  Jason Rumney  <jasonr@gnu.org>
-        * w32inevt.c (w32_kbd_patch_key): Save the unicode character.
+        * w32inevt.c (w32_kbd_patch_key): Save the Unicode character.
-        (key_event): Use unicode for characters 128 and higher (Bug#4567).
+        (key_event): Use Unicode for characters 128 and higher (Bug#4567).
 2010-01-27  Kenichi Handa  <handa@m17n.org>
@@ -11541,7 +11541,7 @@
        (syms_of_nsfont): Declare it.
        (ns_registry_to_script): New function.
        (ns_get_req_script): Call it.
-        (ns_findfonts): Don't give up on non-unicode registry.
+        (ns_findfonts): Don't give up on non-Unicode registry.
        * font.c (DEFAULT_ENCODING) [HAVE_NS]: Remove special case.
@@ -11923,7 +11923,7 @@
        * process.c (status_notify): Don't perform redisplay.
        (Fdelete_process, list_processes_1, process_send_signal):
-        Expliticly perform redisplay.
+        Explicitly perform redisplay.
        (wait_reading_process_output): Always check process status, but
        don't perform redisplay unless DO_DISPLAY is non-zero (Bug#2930).
@@ -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>
@@ -17147,10 +17147,10 @@
 2008-07-30  Jason Rumney  <jasonr@gnu.org>
-        * w32font.h (struct w32font_info): Use unicode version of textmetrics.
+        * w32font.h (struct w32font_info): Use Unicode version of textmetrics.
-        * w32font.c (w32font_encode_char): Leave as unicode if in range.
+        * w32font.c (w32font_encode_char): Leave as Unicode if in range.
-        (w32font_open_internal): Get unicode version of textmetrics.
+        (w32font_open_internal): Get Unicode version of textmetrics.
        Don't enable or disable glyph indices here.
        (w32font_open): Disable use of glyph indices.
@@ -19178,7 +19178,7 @@
 2008-06-10  Jason Rumney  <jasonr@gnu.org>
        * w32uniscribe.c (add_opentype_font_name_to_list):
-        Skip non unicode fonts.
+        Skip non Unicode fonts.
 2008-06-10  Chong Yidong  <cyd@stupidchicken.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.
@@ -19647,7 +19647,7 @@
        `raster' specified.
        (add_font_entity_to_list): Allow non-opentype truetype fonts back
        in the uniscribe backend, but disallow any font that has no
-        unicode subrange support.
+        Unicode subrange support.
 2008-05-29  Juanma Barranquero  <lekktu@gmail.com>
@@ -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.
@@ -21813,8 +21813,8 @@
 2008-03-06  Jason Rumney  <jasonr@gnu.org>
        * w32font.c (w32_registry): Take font_type argument.  Use ANSI
-        when charset not specified.  Only translate ANSI to unicode when
+        when charset not specified.  Only translate ANSI to Unicode when
-        font_type is truetype.
+        font_type is TrueType.
        (w32font_coverage_ok): New function.
        (add_font_entity_to_list): Use it to filter unsuitable fonts.
@@ -23463,10 +23463,10 @@
        (w32font_list, w32font_match): Use it.
        (w32font_open): Don't populate subranges.
        (w32font_has_char): Use script Lisp symbols, not subrange bitmask.
-        (w32font_encode_char): Always return unicode code-point as-is.
+        (w32font_encode_char): Always return Unicode code-point as-is.
        (w32font_text_extents): Supply a transformation matrix to
        GetGlyphOutline.  Never look up by glyph index.  Avoid looping
-        twice.  Use unicode version of GetTexExtentPoint32 instead of
+        twice.  Use Unicode version of GetTexExtentPoint32 instead of
        glyph index version.
        (set_fonts_frame): Remove.
        (w32_enumfont_pattern_entity): Add frame parameter, use it to
@@ -25081,7 +25081,7 @@
        * keymap.c (describe_vector): Handle default value of a char table.
        * fontset.c (fontset_face): Handle fallback fonts correctly.
-        (Ffontset_info): Return infomation about fallback fonts.
+        (Ffontset_info): Return information about fallback fonts.
 2008-02-01  Kenichi Handa  <handa@m17n.org>
@@ -25425,16 +25425,16 @@
        (pfnGetFontUnicodeRanges): New dynamically loaded function.
        (w32_initialize): Try to load it.
        (x_get_font_repertory): Use it if available.
-        (w32_encode_char): Add shortcut for unicode output.
+        (w32_encode_char): Add shortcut for Unicode output.
        * w32fns.c (w32_load_system_font): Default charset to -1.
-        (x_to_w32_charset): Match all fonts for unicode.
+        (x_to_w32_charset): Match all fonts for Unicode.
        (w32_to_x_charset): New parameter matching.  Don't return partial
        or wildcard charsets.
        (w32_to_all_x_charsets): Don't return partial or wildcard charsets.
-        (w32_codepage_for_font): Return CP_UNICODE for unicode.
+        (w32_codepage_for_font): Return CP_UNICODE for Unicode.
        (w32_to_x_font): Match charset to real charset.
-        (enum_font_cb2): Always list unicode versions.
+        (enum_font_cb2): Always list Unicode versions.
        * makefile.w32-in (temacs): Increase EMHEAP.
@@ -25458,7 +25458,7 @@
        * w32fns.c (Fx_create_frame, x_create_tip_frame): Use new version
        of x_new_fontset.
-        (w32_load_system_font): Initialize charset as unicode.
+        (w32_load_system_font): Initialize charset as Unicode.
        font_info.encoding becomes encoding_type.
        (w32_to_x_font): Use decode_coding_c_string in place of decode_coding.
        (x_to_w32_font): Use encode_coding_object in place of encode_coding.
@@ -27685,7 +27685,7 @@
        * xterm.c (handle_one_xevent): Revert to counting chars not bytes.
        * w32term.c (w32_read_socket) <WM_CHAR>: Decode characters outside
-        the unicode range available in MULE by locale-coding-system.
+        the Unicode range available in MULE by locale-coding-system.
        Improve dbcs lead byte detection.  Set event timestamp and modifiers
        earlier.
@@ -29136,7 +29136,7 @@
        * lisp.h (defvar_per_buffer, DEFVAR_PER_BUFFER):
        * lread.c (defvar_per_buffer):
-        * abbrev.c (syms_of_abbrev) <local-abbrev-tabl>: Move to buffer.c.
+        * abbrev.c (syms_of_abbrev) <local-abbrev-table>: Move to buffer.c.
        * window.c (candidate_window_p): Only consider as visible frames that
        are on the same terminal.
@@ -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.
@@ -30873,7 +30873,7 @@
 2007-06-17  Jason Rumney  <jasonr@gnu.org>
        * w32menu.c (add_menu_item): Don't use multibyte string functions on
-        unicode strings.
+        Unicode strings.
 2007-06-16  Juanma Barranquero  <lekktu@gmail.com>
@@ -30892,7 +30892,7 @@
 2007-06-14  Jason Rumney  <jasonr@gnu.org>
        * w32.c (get_process_times_fn): New function pointer.
-        (globals_of_w32): Intialize it if present in kernel32.dll.
+        (globals_of_w32): Initialize it if present in kernel32.dll.
        (w32_get_internal_run_time): New function.
        * editfns.c (Fget_internal_run_time) [WINDOWSNT]: Use it.
@@ -31298,7 +31298,7 @@
        (term_mouse_highlight, term_mouse_movement, term_mouse_position)
        (term_mouse_click, handle_one_term_event, Fterm_open_connection)
        (Fterm_close_connection): New functions.
-        (term_init): Initialise mouse_face_window.
+        (term_init): Initialize mouse_face_window.
 2007-05-19  Chong Yidong  <cyd@stupidchicken.com>
diff --git a/src/ChangeLog.2 b/src/ChangeLog.2
index 05e448c043c..62e3de22b09 100644
--- a/src/ChangeLog.2
+++ b/src/ChangeLog.2
@@ -1152,7 +1152,7 @@
 1987-07-29  Richard Mlynarik  (mly@prep)
-        * lread.c (init_read): Initialise load_in_progress.
+        * lread.c (init_read): Initialize load_in_progress.
 1987-07-28  Richard M. Stallman  (rms@prep)
@@ -2251,7 +2251,7 @@
 1987-01-16  Richard Mlynarik  (mly@prep)
        * xfns.c (Fx_set_{background,cursor,mouse}_color):
-        Initialise save_color.
+        Initialize save_color.
        * fileio.c, search.c, sysdep.c, filelock.c, editfns.c, process.c:
        Delete/replace unused/conditionalised variables
@@ -3002,7 +3002,7 @@
 1986-11-18  Richard Mlynarik  (mly@prep)
        * emacs.c (main):
-        Giving `inhibit_x_windows' an initialisation loses;
+        Giving `inhibit_x_windows' an initialization loses;
        do it explicitly.
        * xfns.c (Fx_rubber_band):
@@ -3291,7 +3291,7 @@
 1986-11-03  Richard Mlynarik  (mly@prep)
        * xterm.c (stufflines):
-        Initialise signal mask.
+        Initialize signal mask.
        * xterm.h:
        Add definition of sigmask
@@ -3346,7 +3346,7 @@
        New function.
        * window.c (Fset_window_hscroll):
-        Don't inhibit redisplay optimisations if hscroll is same.
+        Don't inhibit redisplay optimizations if hscroll is same.
        * ymakefile:
        rm ../etc/DOC to avoid make-docfile overwriting any files which
@@ -3358,7 +3358,7 @@
        VMS changes from Sasaki
        * termcap.c (tgetent):
-        Make sure `indirect' initialised.
+        Make sure `indirect' initialized.
        * xfns.c (grey_p and callers):
        New function to compensate for ugly chauvinistic American
@@ -3496,7 +3496,7 @@
        core-dump)
        Dike out global-minor-modes.  This wasn't actually being used by
-        anything (due to a bug) and wasn't even being initialised!
+        anything (due to a bug) and wasn't even being initialized!
        minor-mode-alist does what this thought it was doing.
 1986-10-11  Richard Mlynarik  (mly@prep)
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index cdfe63fc59c..cbf867829c7 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -6089,7 +6089,7 @@
        shrink below the minimum, this code would only try to delete it if
        it had a parent.  Well, even if the window doesn't have a parent,
        you want Fdelete_window to signal an error, since you're trying to
-        resize one of the undeleteable windows into nothingness.  So call
+        resize one of the undeletable windows into nothingness.  So call
        Fdelete_window even if the window doesn't have a parent.
        * window.c (MINSIZE): Add kludge so that the minibuffer is always
@@ -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.
@@ -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.
diff --git a/src/ChangeLog.4 b/src/ChangeLog.4
index 208d9c2cdb0..88c9e3dbf71 100644
--- a/src/ChangeLog.4
+++ b/src/ChangeLog.4
@@ -3656,7 +3656,7 @@
        * m/delta.h (BROKEN_CLOSEDIR): Added because closedir is interruptible.
        (HAVE_UNISTD_H): Deleted because configure takes care of it.
-        (C_SWITCH_MACHINE): Added optimisation options for gnu cc.
+        (C_SWITCH_MACHINE): Added optimization options for gnu cc.
 1993-12-17  Mike Long  (mike.long@analog.com)
@@ -5007,7 +5007,7 @@
        Change display code to handle the `invisible' text property.
        * dispnew.c (direct_output_for_insert): Fail if character
        just inserted has text properties.
-        (direct_ouput_forward_char): Fail if moving near invisible chars.
+        (direct_output_forward_char): Fail if moving near invisible chars.
        * indent.c (compute_motion): Compute correctly for invisible text.
        (vmotion): Take care of invisible newlines.
        * intervals.c (set_point): Ignore `invisible' property
diff --git a/src/ChangeLog.5 b/src/ChangeLog.5
index 1f21e9fb99c..ee79917a34d 100644
--- a/src/ChangeLog.5
+++ b/src/ChangeLog.5
@@ -3463,7 +3463,7 @@
        * lisp.h (running_asynch_code): New global flag.
        * emacs.c (running_asynch_code): New global flag.
-        (main): Initialise it.
+        (main): Initialize it.
        * process.c (read_process_output, exec_sentinel): Set and
        reset the running_asynch_code global flag and restore match data.
diff --git a/src/ChangeLog.6 b/src/ChangeLog.6
index 141a570040c..af97d0de7b4 100644
--- a/src/ChangeLog.6
+++ b/src/ChangeLog.6
@@ -1182,7 +1182,7 @@
        support in sys_select.
        (term_ntproc): New function.
-        (init_ntproc): New function to initialise socket support and make
+        (init_ntproc): New function to initialize socket support and make
        initial std handles non-inheritable.  Also ensure stdin, stdout
        and stderr have valid handles so that pipes and sockets can't
        inadvertently use fd 0, 1, or 2.
@@ -1440,7 +1440,7 @@
        Correctly detect when default_directory is absolute.
        Be strict when looking for MSDOS drive specifier; defer calling
        getdefdir.  Ignore drive specifier if name now has UNC prefix.
-        Correctly recognise if name is not absolute when trying simple
+        Correctly recognize if name is not absolute when trying simple
        method to expand; return original string if possible.
        Skip dir sep after ~ or ~user.
        Use getpwnam instead of HOME for ~user on NT.
diff --git a/src/ChangeLog.7 b/src/ChangeLog.7
index 73d0d45e9c1..fc97acdeb1e 100644
--- a/src/ChangeLog.7
+++ b/src/ChangeLog.7
@@ -5774,7 +5774,7 @@
        (w32_initialize): Set input mode.  Use w32_msg_worker instead
        of windows_msg_worker.  Dynamically link proportional scroll bar
-        functions and intialize proportional scroll bar variables.
+        functions and initialize proportional scroll bar variables.
        (syms_of_w32term): DEFVAR new variables.
        * w32term.h (w32_output): New fields menubar_widget, menubar_active,
@@ -10963,7 +10963,7 @@
 1996-08-28  Morten Welinder  <terra@diku.dk>
        * minibuf.c (Vhistory_length, Qhistory_length): New variables.
-        (syms_of_minibuf): Register and initialise these.
+        (syms_of_minibuf): Register and initialize these.
        (read_minibuf): Truncate history list if needed.
 1996-08-28  Richard Stallman  <rms@psilocin.gnu.ai.mit.edu>
diff --git a/src/ChangeLog.8 b/src/ChangeLog.8
index 00e4a1f62c8..e21af17657f 100644
--- a/src/ChangeLog.8
+++ b/src/ChangeLog.8
@@ -2723,7 +2723,7 @@
        (CURSOR_FACE_ID, MOUSE_FACE_ID): New.
        * xfaces.c (Qscroll_bar, Qcursor, Qborder, Qmouse): New.
-        (syms_of_xfaces): Intialize new symbols.
+        (syms_of_xfaces): Initialize new symbols.
        * fns.c (Fmakehash): Take one argument, test, make all the
        rest keyword arguments.
@@ -9227,7 +9227,7 @@
        * xdisp.c (store_frame_title_char): New function to store a
        single character for the frame title with re-allocation of
        frame_title_buf.
-        (init_xdisp): Intialize frame_title_.* variables to null.
+        (init_xdisp): Initialize frame_title_.* variables to null.
        * dispnew.c (quit_error_check): Removed.
@@ -12321,7 +12321,7 @@
        (enumfont_t): Remove unused head pointer.
        (enum_font_cb2): Dereference elfLogFont.
        (w32_list_bdf_fonts): New function.
-        (w32_list_fonts): Use one_w32_dispay_info instead of insisting on
+        (w32_list_fonts): Use one_w32_display_info instead of insisting on
        valid frame.  Remove MessageBox.  Support BDF fonts.
        (Fw32_find_bdf_fonts): New function.
        (syms_of_w32fns): Add Vw32_bdf_filename_alist and
@@ -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 9e7bd24f792..6f007992bef 100644
--- a/src/ChangeLog.9
+++ b/src/ChangeLog.9
@@ -5150,7 +5150,7 @@
 2000-11-27  Jason Rumney  <jasonr@gnu.org>
        * w32fns.c (w32_load_system_font): Always mark font as double byte
-        if codepage is unicode.
+        if codepage is Unicode.
 2000-11-27  Gerd Moellmann  <gerd@gnu.org>
diff --git a/src/alloc.c b/src/alloc.c
index 5d04bd77872..96d63f53cf9 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -203,9 +203,6 @@ static int malloc_hysteresis;
   remapping on more recent systems because this is less important
   nowadays than in the days of small memories and timesharing.  */
-#ifndef VIRT_ADDR_VARIES
-static
-#endif
 EMACS_INT pure[(PURESIZE + sizeof (EMACS_INT) - 1) / sizeof (EMACS_INT)] = {1,};
 #define PUREBEG (char *) pure
@@ -222,10 +219,7 @@ static ptrdiff_t pure_bytes_used_before_overflow;
 /* Value is non-zero if P points into pure space.  */
 #define PURE_POINTER_P(P)                                       \
-     (((PNTR_COMPARISON_TYPE) (P)                               \
+  ((uintptr_t) (P) - (uintptr_t) purebeg <= pure_size)
-       < (PNTR_COMPARISON_TYPE) ((char *) purebeg + pure_size)) \
-      && ((PNTR_COMPARISON_TYPE) (P)                            \
-          >= (PNTR_COMPARISON_TYPE) purebeg))
 /* Index in pure at which next pure Lisp object will be allocated.. */
diff --git a/src/bidi.c b/src/bidi.c
index e688637a408..e0337927ec5 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -51,7 +51,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
   A note about references to UAX#9 rules: if the reference says
   something like "X9/Retaining", it means that you need to refer to
-   rule X9 and to its modifications decribed in the "Implementation
+   rule X9 and to its modifications described in the "Implementation
   Notes" section of UAX#9, under "Retaining Format Codes".  */
 #include <config.h>
diff --git a/src/buffer.c b/src/buffer.c
index 90b43d29fc8..a327a1650f1 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -4400,7 +4400,7 @@ static int mmap_fd_1;
 static int mmap_page_size;
-/* 1 means mmap has been intialized.  */
+/* 1 means mmap has been initialized.  */
 static int mmap_initialized_p;
@@ -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/casetab.c b/src/casetab.c
index 3433b313c03..575a48ed146 100644
--- a/src/casetab.c
+++ b/src/casetab.c
@@ -95,7 +95,7 @@ CANONICALIZE maps each character to a canonical equivalent;
 any two characters that are related by case-conversion have the same
 canonical equivalent character; it may be nil, in which case it is
 deduced from DOWNCASE and UPCASE.
-EQUIVALENCES is a map that cyclicly permutes each equivalence class
+EQUIVALENCES is a map that cyclically permutes each equivalence class
 (of characters with the same canonical equivalent); it may be nil,
 in which case it is deduced from CANONICALIZE.  */)
  (Lisp_Object table)
diff --git a/src/ccl.c b/src/ccl.c
index 6366f1acb88..84d7a6a25ff 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
@@ -826,7 +826,7 @@ while (0)
   : (charset = CHARSET_FROM_ID ((id)), DECODE_CHAR (charset, (code))))
 /* Encode character C by some of charsets in CHARSET_LIST.  Set ID to
-   the id of the used charset, ENCODED to the resulf of encoding.
+   the id of the used charset, ENCODED to the result of encoding.
   Assume that we can use the variable `charset'.  */
 #define CCL_ENCODE_CHAR(c, charset_list, id, encoded)           \
diff --git a/src/character.c b/src/character.c
index a21760c8ab2..88b1f11b96b 100644
--- a/src/character.c
+++ b/src/character.c
@@ -669,7 +669,7 @@ str_as_multibyte (unsigned char *str, EMACS_INT len, EMACS_INT nbytes,
 }
 /* Parse unibyte string at STR of LEN bytes, and return the number of
-   bytes it may ocupy when converted to multibyte string by
+   bytes it may occupy when converted to multibyte string by
   `str_to_multibyte'.  */
 EMACS_INT
diff --git a/src/character.h b/src/character.h
index 09bcf17ab96..5ae6cb8c49c 100644
--- a/src/character.h
+++ b/src/character.h
@@ -596,7 +596,7 @@ sanitize_char_width (EMACS_INT width)
   ? ASCII_CHAR_WIDTH (c)       \
   : sanitize_char_width (XINT (CHAR_TABLE_REF (Vchar_width_table, c))))
-/* If C is a variation selector, return the index numnber of the
+/* If C is a variation selector, return the index of the
   variation selector (1..256).  Otherwise, return 0.  */
 #define CHAR_VARIATION_SELECTOR_P(c)            \
diff --git a/src/charset.c b/src/charset.c
index 266753f9d05..b6921a762b6 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -2082,7 +2082,7 @@ that case, find the charset from what supported by that coding system.  */)
 DEFUN ("charset-after", Fcharset_after, Scharset_after, 0, 1, 0,
       doc: /*
 Return charset of a character in the current buffer at position POS.
-If POS is nil, it defauls to the current point.
+If POS is nil, it defaults to the current point.
 If POS is out of range, the value is nil.  */)
  (Lisp_Object pos)
 {
diff --git a/src/chartab.c b/src/chartab.c
index 724b3076a11..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.  */
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/dispextern.h b/src/dispextern.h
index 006ceb31a5a..a45c5cc138f 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -2677,11 +2677,11 @@ struct redisplay_interface
  void (*flush_display) (struct frame *f);
  /* Flush the display of frame F if non-NULL.  This is called
-     during redisplay, and should be NULL on systems which flushes
+     during redisplay, and should be NULL on systems which flush
     automatically before reading input.  */
  void (*flush_display_optional) (struct frame *f);
-  /* Clear the mouse hightlight in window W, if there is any.  */
+  /* Clear the mouse highlight in window W, if there is any.  */
  void (*clear_window_mouse_face) (struct window *w);
  /* Set *LEFT and *RIGHT to the left and right overhang of GLYPH on
@@ -3154,6 +3154,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 700952f6ae3..b920693688c 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -438,18 +438,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
@@ -1087,37 +1076,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;
 }
@@ -4240,6 +4247,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/fileio.c b/src/fileio.c
index 44a85ab1977..7e75e6285f0 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -62,7 +62,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifdef DOS_NT
 /* On Windows, drive letters must be alphabetic - on DOS, the Netware
-   redirector allows the six letters between 'Z' and 'a' as well. */
+   redirector allows the six letters between 'Z' and 'a' as well.  */
 #ifdef MSDOS
 #define IS_DRIVE(x) ((x) >= 'A' && (x) <= 'z')
 #endif
@@ -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))))
@@ -3686,6 +3686,7 @@ variable `last-coding-system-used' to the coding system actually used.  */)
      int this_count = SPECPDL_INDEX ();
      int multibyte = ! NILP (BVAR (current_buffer, enable_multibyte_characters));
      Lisp_Object conversion_buffer;
+      struct gcpro gcpro1;
      conversion_buffer = code_conversion_save (1, multibyte);
@@ -3706,7 +3707,7 @@ variable `last-coding-system-used' to the coding system actually used.  */)
        {
          /* We read one bunch by one (READ_BUF_SIZE bytes) to allow
             quitting while reading a huge while.  */
-          /* try is reserved in some compilers (Microsoft C) */
+          /* `try'' is reserved in some compilers (Microsoft C).  */
          EMACS_INT trytry = min (total - how_much,
                                  READ_BUF_SIZE - unprocessed);
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/fontset.c b/src/fontset.c
index 34b2131832f..9697f62ea72 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -905,7 +905,7 @@ face_suitable_for_char_p (struct face *face, int c)
 /* Return ID of face suitable for displaying character C on frame F.
-   FACE must be reazlied for ASCII characters in advance.  Called from
+   FACE must be realized for ASCII characters in advance.  Called from
   the macro FACE_FOR_CHAR.  */
 int
@@ -1346,7 +1346,7 @@ accumulate_script_ranges (Lisp_Object arg, Lisp_Object range, Lisp_Object val)
   In FONTSET, set FONT_DEF in a fashion specified by ADD for
   characters in RANGE and ranges in SCRIPT_RANGE_LIST before RANGE.
-   The consumed ranges are poped up from SCRIPT_RANGE_LIST, and the
+   The consumed ranges are popped up from SCRIPT_RANGE_LIST, and the
   new SCRIPT_RANGE_LIST is stored in ARG.
   If ASCII is nil, don't set FONT_DEF for ASCII characters.  It is
diff --git a/src/frame.c b/src/frame.c
index c14f4db91da..039ed6543cb 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -374,7 +374,7 @@ make_frame (int mini_p)
    /* Use set_window_buffer, not Fset_window_buffer, and don't let
       hooks be run by it.  The reason is that the whole frame/window
-       arrangement is not yet fully intialized at this point.  Windows
+       arrangement is not yet fully initialized at this point.  Windows
       don't have the right size, glyph matrices aren't initialized
       etc.  Running Lisp functions at this point surely ends in a
       SEGV.  */
@@ -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;
@@ -1705,7 +1712,7 @@ If omitted, FRAME defaults to the currently selected frame.  */)
 }
 /* Update the display_time slot of the buffers shown in WINDOW
-   and all its descendents.  */
+   and all its descendants.  */
 static void
 make_frame_visible_1 (Lisp_Object window)
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 0b7fd41f5f6..7e6f5c3164d 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.
@@ -2363,7 +2363,7 @@ xg_create_one_menuitem (widget_value *item,
   HIGHLIGHT_CB is the callback to call when entering/leaving menu items.
   POP_UP_P is non-zero if we shall create a popup menu.
   MENU_BAR_P is non-zero if we shall create a menu bar.
-   ADD_TEAROFF_P is non-zero if we shall add a teroff menu item.  Ignored
+   ADD_TEAROFF_P is non-zero if we shall add a tearoff menu item.  Ignored
   if MENU_BAR_P is non-zero.
   TOPMENU is the topmost GtkWidget that others shall be placed under.
   It may be NULL, in that case we create the appropriate widget
@@ -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 e80f2b72102..8b61c7eefbc 100644
--- a/src/image.c
+++ b/src/image.c
@@ -7754,7 +7754,7 @@ imagemagick_load_image (struct frame *f, struct image *img,
    }
  /* Finally we are done manipulating the image.  Figure out the
-     resulting width/height and transfer ownerwship to Emacs.  */
+     resulting width/height and transfer ownership to Emacs.  */
  height = MagickGetImageHeight (image_wand);
  width = MagickGetImageWidth (image_wand);
@@ -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.  */
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 8b94ee6b5d1..bee91c6b5cf 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -4823,7 +4823,7 @@ const char *const lispy_function_keys[] =
    "ico-00",        /* VK_ICO_00         0xE4 */
    0,               /* VK_PROCESSKEY     0xE5 - used by IME */
    "ico-clear",     /* VK_ICO_CLEAR      0xE6 */
-    0,               /* VK_PACKET         0xE7  - used to pass unicode chars */
+    0,               /* VK_PACKET         0xE7  - used to pass Unicode chars */
    0,               /*                   0xE8 */
    "reset",         /* VK_OEM_RESET      0xE9 */
    "jump",          /* VK_OEM_JUMP       0xEA */
@@ -10153,7 +10153,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)
@@ -12120,7 +12120,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 6f9cf288f6d..b429ca968d7 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -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 5407956c202..2056b7caff8 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -947,7 +947,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)                                          \
@@ -1881,9 +1881,6 @@ typedef struct {
    CHECK_NATNUM (tmp);                 \
    XSETCDR ((x), tmp);                 \
  } while (0)
-/* Cast pointers to this type to compare them.  */
-#define PNTR_COMPARISON_TYPE uintptr_t
 /* Define a built-in function for calling from Lisp.
 `lname' should be the name to give the function in Lisp,
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/m/ibms390.h b/src/m/ibms390.h
deleted file mode 100644
index c309035dc5c..00000000000
--- a/src/m/ibms390.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Machine description file for IBM S390 in 32-bit mode
-Copyright (C) 1985-1986, 2001-2011 Free Software Foundation, Inc.
-This file is part of GNU Emacs.
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
-/* Define VIRT_ADDR_VARIES if the virtual addresses of
-   pure and impure space as loaded can vary, and even their
-   relative order cannot be relied on.
-   Otherwise Emacs assumes that text space precedes data space,
-   numerically.  */
-#define VIRT_ADDR_VARIES
diff --git a/src/m/ibms390x.h b/src/m/ibms390x.h
index 04092d6e1ac..5ea7974b052 100644
--- a/src/m/ibms390x.h
+++ b/src/m/ibms390x.h
@@ -17,8 +17,6 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
-#include "ibms390.h"
 #define BITS_PER_LONG 64
 #define BITS_PER_EMACS_INT 64
diff --git a/src/m/intel386.h b/src/m/intel386.h
index 16f0645715c..114b7fef963 100644
--- a/src/m/intel386.h
+++ b/src/m/intel386.h
@@ -19,7 +19,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifdef WINDOWSNT
-#define VIRT_ADDR_VARIES
 #define DATA_START      get_data_start ()
 #endif
@@ -28,4 +27,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* we cannot get the maximum address for brk */
 #define ULIMIT_BREAK_VALUE (32*1024*1024)
 #endif
diff --git a/src/m/template.h b/src/m/template.h
index 54fb0da9521..38649e8ac6d 100644
--- a/src/m/template.h
+++ b/src/m/template.h
@@ -21,14 +21,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
   does not define it automatically.
   Ones defined so far include m68k and many others */
-/* Define VIRT_ADDR_VARIES if the virtual addresses of
-   pure and impure space as loaded can vary, and even their
-   relative order cannot be relied on.
-   Otherwise Emacs assumes that text space precedes data space,
-   numerically.  */
-#define VIRT_ADDR_VARIES
 /* After adding support for a new machine, modify the large case
   statement in configure.in to recognize reasonable
   configuration names, and add a description of the system to
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/nsfont.m b/src/nsfont.m
index c4d9123faef..7d691ced6e1 100644
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -256,7 +256,7 @@ ns_char_width (NSFont *sfont, int c)
 /* Return whether set1 covers set2 to a reasonable extent given by pct.
-   We check, out of each 16 unicode char range containing chars in set2,
+   We check, out of each 16 Unicode char range containing chars in set2,
   whether at least one character is present in set1.
   This must be true for pct of the pairs to consider it covering. */
 static BOOL
@@ -297,7 +297,7 @@ static NSString
 /* Convert OTF 4-letter script code to emacs script name.  (Why can't
-   everyone just use some standard unicode names for these?) */
+   everyone just use some standard Unicode names for these?) */
 static NSString
 *ns_otf_to_script (Lisp_Object otf)
 {
@@ -329,7 +329,7 @@ static NSString
 /* Searches the :script, :lang, and :otf extra-bundle properties of the spec,
   plus registry regular property, for something that can be mapped to a
-   unicode script.  Empty string returned if no script spec found. */
+   Unicode script.  Empty string returned if no script spec found. */
 static NSString
 *ns_get_req_script (Lisp_Object font_spec)
 {
@@ -385,7 +385,7 @@ accumulate_script_ranges (Lisp_Object arg, Lisp_Object range, Lisp_Object val)
 }
-/* Use the unicode range information in Vchar_script_table to convert a script
+/* Use the Unicode range information in Vchar_script_table to convert a script
   name into an NSCharacterSet. */
 static NSCharacterSet
 *ns_script_to_charset (NSString *scriptName)
@@ -426,7 +426,7 @@ static NSCharacterSet
   If none are found, we reduce the percentage and try again, until 5%.
   This provides a font with at least some characters if such can be found.
   We don't use isSupersetOfSet: because (a) it doesn't work on Tiger, and
-   (b) need approximate match as fonts covering full unicode ranges are rare. */
+   (b) need approximate match as fonts covering full Unicode ranges are rare. */
 static NSSet
 *ns_get_covering_families (NSString *script, float pct)
 {
@@ -1292,7 +1292,7 @@ ns_uni_to_glyphs (struct nsfont_info *font_info, unsigned char block)
  if (!unichars || !(font_info->glyphs[block]))
    abort ();
-  /* create a string containing all unicode characters in this block */
+  /* create a string containing all Unicode characters in this block */
  for (idx = block<<8, i =0; i<0x100; idx++, i++)
    if (idx < 0xD800 || idx > 0xDFFF)
      unichars[i] = idx;
@@ -1487,5 +1487,5 @@ syms_of_nsfont (void)
  DEFSYM (Qroman, "roman");
  DEFSYM (Qmedium, "medium");
  DEFVAR_LISP ("ns-reg-to-script", Vns_reg_to_script,
-               doc: /* Internal use: maps font registry to unicode script. */);
+               doc: /* Internal use: maps font registry to Unicode script. */);
 }
diff --git a/src/nsterm.h b/src/nsterm.h
index 574d31c962a..52246caac84 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -470,7 +470,7 @@ struct nsfont_info
  XCharStruct max_bounds;
  /* we compute glyph codes and metrics on-demand in blocks of 256 indexed
     by hibyte, lobyte */
-  unsigned short **glyphs; /* map unicode index to glyph */
+  unsigned short **glyphs; /* map Unicode index to glyph */
  struct font_metrics **metrics;
 };
diff --git a/src/print.c b/src/print.c
index 1d6998d8f1a..0fdb750f370 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1637,7 +1637,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 53382d804f2..a02ba44ae71 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
@@ -4620,15 +4620,43 @@ wait_reading_process_output (int time_limit, int microsecs, int read_kbd,
             some data in the TCP buffers so that select works, but
             with custom pull/push functions we need to check if some
             data is available in the buffers manually.  */
-          if (nfds == 0 &&
+          if (nfds == 0)
-              wait_proc && wait_proc->gnutls_p /* Check for valid process.  */
+            {
-              /* Do we have pending data?  */
+              if (! wait_proc)
-              && emacs_gnutls_record_check_pending (wait_proc->gnutls_state) > 0)
+                {
-          {
+                  /* We're not waiting on a specific process, so loop
-              nfds = 1;
+                     through all the channels and check for data.
-              /* Set to Available.  */
+                     This is a workaround needed for some versions of
-              FD_SET (wait_proc->infd, &Available);
+                     the gnutls library -- 2.12.14 has been confirmed
-          }
+                     to need it.  See
+                     http://comments.gmane.org/gmane.emacs.devel/145074 */
+                  struct Lisp_Process *proc;
+                  for (channel = 0; channel < MAXDESC; ++channel)
+                    {
+                      if (! NILP (chan_process[channel]) &&
+                          (proc = XPROCESS (chan_process[channel])) != NULL &&
+                          proc->gnutls_p &&
+                          proc->infd &&
+                          emacs_gnutls_record_check_pending (proc->gnutls_state) > 0)
+                        {
+                          nfds++;
+                          FD_SET (proc->infd, &Available);
+                        }
+                    }
+                }
+              else
+                {
+                  /* Check this specific channel. */
+                  if (wait_proc->gnutls_p && /* Check for valid process.  */
+                      /* Do we have pending data?  */
+                      emacs_gnutls_record_check_pending (wait_proc->gnutls_state) > 0)
+                    {
+                      nfds = 1;
+                      /* Set to Available.  */
+                      FD_SET (wait_proc->infd, &Available);
+                    }
+                }
+            }
 #endif
        }
diff --git a/src/puresize.h b/src/puresize.h
index c26c496a757..4290c30c68d 100644
--- a/src/puresize.h
+++ b/src/puresize.h
@@ -75,21 +75,7 @@ extern void pure_write_error (void) NO_RETURN;
 /* Define PURE_P.  */
-#ifdef VIRT_ADDR_VARIES
-/* For machines where text and data can go anywhere
-   in virtual memory.  */
 extern EMACS_INT pure[];
 #define PURE_P(obj) \
- ((PNTR_COMPARISON_TYPE) XPNTR (obj) < (PNTR_COMPARISON_TYPE) ((char *) pure + PURESIZE) \
+  ((uintptr_t) XPNTR (obj) - (uintptr_t) pure <= PURESIZE)
-  && (PNTR_COMPARISON_TYPE) XPNTR (obj) >= (PNTR_COMPARISON_TYPE) pure)
-#else /* not VIRT_ADDR_VARIES */
-extern char my_edata[];
-#define PURE_P(obj) \
-  ((PNTR_COMPARISON_TYPE) XPNTR (obj) < (PNTR_COMPARISON_TYPE) my_edata)
-#endif /* VIRT_ADDRESS_VARIES */
diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index af5308ff7bb..8f5a0ab1fc7 100644
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -91,9 +91,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
   why it needed to be changed.  */
 #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
-/* Virtual addresses of pure and impure space can vary, as on Windows.  */
-#define VIRT_ADDR_VARIES
 /* Emacs supplies its own malloc, but glib (part of Gtk+) calls
   memalign and on Cygwin, that becomes the Cygwin-supplied memalign.
   As malloc is not the Cygwin malloc, the Cygwin memalign always
diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h
index 37199bcc29b..be457498add 100644
--- a/src/s/hpux10-20.h
+++ b/src/s/hpux10-20.h
@@ -100,14 +100,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
   header sections which lose when `static' is defined away, as it is
   on HP-UX.  (You get duplicate symbol errors on linking). */
 #undef _FILE_OFFSET_BITS
-/* Define VIRT_ADDR_VARIES if the virtual addresses of
-   pure and impure space as loaded can vary, and even their
-   relative order cannot be relied on.
-   Otherwise Emacs assumes that text space precedes data space,
-   numerically.  */
-#define VIRT_ADDR_VARIES
 /* The data segment on this machine always starts at address 0x40000000.  */
 #define DATA_SEG_BITS 0x40000000
diff --git a/src/search.c b/src/search.c
index a3b4e1dcbce..a6a0fddb137 100644
--- a/src/search.c
+++ b/src/search.c
@@ -1892,7 +1892,7 @@ boyer_moore (EMACS_INT n, unsigned char *base_pat,
                               || CHAR_HEAD_P (cursor[1]))
                              && (CHAR_HEAD_P (cursor[0])
                                  /* Check if this is the last byte of
-                                     a translable character.  */
+                                     a translatable character.  */
                                  || (translate_prev_byte1 == cursor[-1]
                                      && (CHAR_HEAD_P (translate_prev_byte1)
                                          || (translate_prev_byte2 == cursor[-2]
@@ -1991,7 +1991,7 @@ boyer_moore (EMACS_INT n, unsigned char *base_pat,
                           || CHAR_HEAD_P (ptr[1]))
                          && (CHAR_HEAD_P (ptr[0])
                              /* Check if this is the last byte of a
-                                 translable character.  */
+                                 translatable character.  */
                              || (translate_prev_byte1 == ptr[-1]
                                  && (CHAR_HEAD_P (translate_prev_byte1)
                                      || (translate_prev_byte2 == ptr[-2]
diff --git a/src/sound.c b/src/sound.c
index 39007574afc..4e9758d27df 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -267,7 +267,7 @@ struct sound
     read from the start of a sound file.  */
  char *header;
-  /* Number of bytes raed from sound file.  This is always <=
+  /* Number of bytes read from sound file.  This is always <=
     MAX_SOUND_HEADER_BYTES.  */
  int header_size;
diff --git a/src/sysdep.c b/src/sysdep.c
index d666f8dbb79..ae200308bf3 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -1663,7 +1663,7 @@ init_signals (void)
      sys_siglist[SIGQUIT] = "Quit";
 # endif
 # ifdef SIGRETRACT
-      sys_siglist[SIGRETRACT] = "Need to relinguish monitor mode";
+      sys_siglist[SIGRETRACT] = "Need to relinquish monitor mode";
 # endif
 # ifdef SIGSAK
      sys_siglist[SIGSAK] = "Secure attention";
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 4a6da46141c..434861320a5 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -2262,7 +2262,7 @@ w32_msg_pump (deferred_msg * msg_buf)
                 some third party shell extensions can cause it to be used in
                 system dialogs, which causes a crash if it is not initialized.
                 This is a known bug in Windows, which was fixed long ago, but
-                 the patch for XP is not publically available until XP SP3,
+                 the patch for XP is not publicly available until XP SP3,
                 and older versions will never be patched.  */
              CoInitialize (NULL);
              w32_createwindow ((struct frame *) msg.wParam);
@@ -2880,7 +2880,7 @@ w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
                      key.dwControlKeyState = modifiers;
                      add = w32_kbd_patch_key (&key);
-                      /* 0 means an unrecognised keycode, negative means
+                      /* 0 means an unrecognized keycode, negative means
                         dead key.  Ignore both.  */
                      while (--add >= 0)
                        {
@@ -2943,7 +2943,7 @@ w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
      break;
    case WM_IME_CHAR:
-      /* If we can't get the IME result as unicode, use default processing,
+      /* If we can't get the IME result as Unicode, use default processing,
         which will at least allow characters decodable in the system locale
         get through.  */
      if (!get_composition_string_fn)
diff --git a/src/w32font.c b/src/w32font.c
index bd58e7e757b..5cc37c0e74f 100644
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -462,7 +462,7 @@ w32font_has_char (Lisp_Object entity, int c)
   Return a glyph code of FONT for character C (Unicode code point).
   If FONT doesn't have such a glyph, return FONT_INVALID_CODE.
-   For speed, the gdi backend uses unicode (Emacs calls encode_char
+   For speed, the gdi backend uses Unicode (Emacs calls encode_char
   far too often for it to be efficient). But we still need to detect
   which characters are not supported by the font.
  */
@@ -620,7 +620,7 @@ w32font_text_extents (struct font *font, unsigned *code,
      total_width = size.cx;
    }
-  /* On 95/98/ME, only some unicode functions are available, so fallback
+  /* On 95/98/ME, only some Unicode functions are available, so fallback
     on doing a dummy draw to find the total width.  */
  if (!total_width)
    {
@@ -1153,7 +1153,7 @@ w32_enumfont_pattern_entity (Lisp_Object frame,
  else
    ASET (entity, FONT_SIZE_INDEX, make_number (0));
-  /* Cache unicode codepoints covered by this font, as there is no other way
+  /* Cache Unicode codepoints covered by this font, as there is no other way
     of getting this information easily.  */
  if (font_type & TRUETYPE_FONTTYPE)
    {
@@ -1514,7 +1514,7 @@ add_font_entity_to_list (ENUMLOGFONTEX *logical_font,
  /* Skip non matching fonts.  */
  /* For uniscribe backend, consider only truetype or opentype fonts
-     that have some unicode coverage.  */
+     that have some Unicode coverage.  */
  if (match_data->opentype_only
      && ((!(physical_font->ntmTm.ntmFlags & NTMFLAGS_OPENTYPE)
           && !(font_type & TRUETYPE_FONTTYPE))
@@ -1557,7 +1557,7 @@ add_font_entity_to_list (ENUMLOGFONTEX *logical_font,
      Lisp_Object spec_charset = AREF (match_data->orig_font_spec,
                                       FONT_REGISTRY_INDEX);
-      /* iso10646-1 fonts must contain unicode mapping tables.  */
+      /* iso10646-1 fonts must contain Unicode mapping tables.  */
      if (EQ (spec_charset, Qiso10646_1))
        {
          if (!is_unicode)
@@ -1572,7 +1572,7 @@ add_font_entity_to_list (ENUMLOGFONTEX *logical_font,
              && !(physical_font->ntmFontSig.fsUsb[0] & 0x007F001F))
            return 1;
        }
-      /* unicode-sip fonts must contain characters in unicode plane 2.
+      /* unicode-sip fonts must contain characters in Unicode plane 2.
         so look for bit 57 (surrogates) in the Unicode subranges, plus
         the bits for CJK ranges that include those characters.  */
      else if (EQ (spec_charset, Qunicode_sip))
@@ -1597,7 +1597,7 @@ add_font_entity_to_list (ENUMLOGFONTEX *logical_font,
            ASET (entity, FONT_REGISTRY_INDEX, spec_charset);
        }
      /* Otherwise if using the uniscribe backend, report ANSI and DEFAULT
-         fonts as unicode and skip other charsets.  */
+         fonts as Unicode and skip other charsets.  */
      else if (match_data->opentype_only)
        {
          if (logical_font->elfLogFont.lfCharSet == ANSI_CHARSET
@@ -1640,7 +1640,7 @@ x_to_w32_charset (char * lpcs)
  if (strncmp (lpcs, "*-#", 3) == 0)
    return atoi (lpcs + 3);
-  /* All Windows fonts qualify as unicode.  */
+  /* All Windows fonts qualify as Unicode.  */
  if (!strncmp (lpcs, "iso10646", 8))
    return DEFAULT_CHARSET;
@@ -1925,7 +1925,7 @@ w32_registry (LONG w32_charset, DWORD font_type)
 {
  char *charset;
-  /* If charset is defaulted, charset is unicode or unknown, depending on
+  /* If charset is defaulted, charset is Unicode or unknown, depending on
     font type.  */
  if (w32_charset == DEFAULT_CHARSET)
    return font_type == TRUETYPE_FONTTYPE ? Qiso10646_1 : Qunknown;
@@ -2080,7 +2080,7 @@ fill_in_logfont (FRAME_PTR f, LOGFONT *logfont, Lisp_Object font_spec)
        {
          Lisp_Object key, val;
          key = XCAR (tmp), val = XCDR (tmp);
-          /* Only use QCscript if charset is not provided, or is unicode
+          /* Only use QCscript if charset is not provided, or is Unicode
             and a single script is specified.  This is rather crude,
             and is only used to narrow down the fonts returned where
             there is a definite match.  Some scripts, such as latin, han,
diff --git a/src/w32menu.c b/src/w32menu.c
index 39d101e7bd5..9b2d014cd58 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -1219,7 +1219,7 @@ simple_dialog_show (FRAME_PTR f, Lisp_Object contents, Lisp_Object header)
     is_simple_dialog, we don't need to worry about checking contents
     to see what type of dialog to use.  */
-  /* Use unicode if possible, so any language can be displayed.  */
+  /* Use Unicode if possible, so any language can be displayed.  */
  if (unicode_message_box)
    {
      WCHAR *text, *title;
@@ -1476,7 +1476,7 @@ add_menu_item (HMENU menu, widget_value *wv, HMENU item)
                                          utf16_string);
      if (!return_value)
        {
-          /* On W9x/ME, unicode menus are not supported, though AppendMenuW
+          /* On W9x/ME, Unicode menus are not supported, though AppendMenuW
             apparently does exist at least in some cases and appears to be
             stubbed out to do nothing.  out_string is UTF-8, but since
             our standard menus are in English and this is only going to
@@ -1486,7 +1486,7 @@ add_menu_item (HMENU menu, widget_value *wv, HMENU item)
            AppendMenu (menu, fuFlags,
                        item != NULL ? (UINT) item: (UINT) wv->call_data,
                        out_string);
-          /* Don't use unicode menus in future.  */
+          /* Don't use Unicode menus in future.  */
          unicode_append_menu = NULL;
        }
diff --git a/src/w32proc.c b/src/w32proc.c
index 279816bcc3e..254a32503c4 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -122,12 +122,12 @@ new_child (void)
  for (cp = child_procs + (child_proc_count-1); cp >= child_procs; cp--)
    if (!CHILD_ACTIVE (cp))
-      goto Initialise;
+      goto Initialize;
  if (child_proc_count == MAX_CHILDREN)
    return NULL;
  cp = &child_procs[child_proc_count++];
- Initialise:
+ Initialize:
  memset (cp, 0, sizeof (*cp));
  cp->fd = -1;
  cp->pid = -1;
@@ -821,7 +821,7 @@ sys_spawnve (int mode, char *cmdname, char **argv, char **envp)
     The w32 GNU-based library from Cygnus doubles quotes to escape
     them, while MSVC uses backslash for escaping.  (Actually the MSVC
-     startup code does attempt to recognise doubled quotes and accept
+     startup code does attempt to recognize doubled quotes and accept
     them, but gets it wrong and ends up requiring three quotes to get a
     single embedded quote!)  So by default we decide whether to use
     quote or backslash as the escape character based on whether the
diff --git a/src/w32term.c b/src/w32term.c
index e9fa16ba325..a2ccdd21f7d 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -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.
@@ -5692,10 +5692,10 @@ x_make_frame_visible (struct frame *f)
      /* According to a report in emacs-devel 2008-06-03, SW_SHOWNORMAL
         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/w32uniscribe.c b/src/w32uniscribe.c
index 36197b3b28a..63da3b9e962 100644
--- a/src/w32uniscribe.c
+++ b/src/w32uniscribe.c
@@ -469,7 +469,7 @@ uniscribe_encode_char (struct font *font, int c)
  /* Non BMP characters must be handled by the uniscribe shaping
     engine as GDI functions (except blindly displaying lines of
-     unicode text) and the promising looking ScriptGetCMap do not
+     Unicode text) and the promising looking ScriptGetCMap do not
     convert surrogate pairs to glyph indexes correctly.  */
    {
      items = (SCRIPT_ITEM *) alloca (sizeof (SCRIPT_ITEM) * 2 + 1);
@@ -581,7 +581,7 @@ add_opentype_font_name_to_list (ENUMLOGFONTEX *logical_font,
      && font_type != TRUETYPE_FONTTYPE)
    return 1;
-  /* Skip fonts that have no unicode coverage.  */
+  /* Skip fonts that have no Unicode coverage.  */
  if (!physical_font->ntmFontSig.fsUsb[3]
      && !physical_font->ntmFontSig.fsUsb[2]
      && !physical_font->ntmFontSig.fsUsb[1]
diff --git a/src/w32xfns.c b/src/w32xfns.c
index fbbf11bd65c..fc2d5904d67 100644
--- a/src/w32xfns.c
+++ b/src/w32xfns.c
@@ -188,7 +188,7 @@ get_next_msg (W32Msg * lpmsg, BOOL bWait)
      }
      nQueue--;
-      /* Consolidate WM_PAINT messages to optimise redrawing.  */
+      /* Consolidate WM_PAINT messages to optimize redrawing.  */
      if (lpmsg->msg.message == WM_PAINT && nQueue)
        {
          int_msg * lpCur = lpHead;
@@ -441,4 +441,3 @@ void
 x_sync (void *f)
 {
 }
diff --git a/src/window.c b/src/window.c
index a7daa1353bd..728e811f304 100644
--- a/src/window.c
+++ b/src/window.c
@@ -467,10 +467,8 @@ Return nil if WINDOW has no previous sibling.  */)
  return decode_any_window (window)->prev;
 }
-DEFUN ("window-combination-limit", Fwindow_combination_limit, Swindow_combination_limit, 0, 1, 0,
+DEFUN ("window-combination-limit", Fwindow_combination_limit, Swindow_combination_limit, 1, 1, 0,
       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 t means that child windows of
 WINDOW are never \(re-)combined with WINDOW's siblings.  */)
@@ -480,18 +478,16 @@ WINDOW are never \(re-)combined with WINDOW's siblings.  */)
 }
 DEFUN ("set-window-combination-limit", Fset_window_combination_limit, Sset_window_combination_limit, 2, 2, 0,
-       doc: /* Set combination limit of window WINDOW to STATUS; return STATUS.
+       doc: /* Set combination limit of window WINDOW to LIMIT; return LIMIT.
-If WINDOW is omitted or nil, it defaults to the selected window.
+If LIMIT is nil, child windows of WINDOW can be recombined with
+WINDOW's siblings.  LIMIT t means that child windows of WINDOW are
-If STATUS is nil, child windows of WINDOW can be recombined with
-WINDOW's siblings.  STATUS t means that child windows of WINDOW are
 never \(re-)combined with WINDOW's siblings.  Other values are reserved
 for future use.  */)
-  (Lisp_Object window, Lisp_Object status)
+  (Lisp_Object window, Lisp_Object limit)
 {
  register struct window *w = decode_any_window (window);
-  w->combination_limit = status;
+  w->combination_limit = limit;
  return w->combination_limit;
 }
@@ -2187,7 +2183,7 @@ next_window (Lisp_Object window, Lisp_Object minibuf, Lisp_Object all_frames, in
 DEFUN ("next-window", Fnext_window, Snext_window, 0, 3, 0,
-       doc: /* Return window following WINDOW in cyclic ordering of windows.
+       doc: /* Return live window after WINDOW in the cyclic ordering of windows.
 WINDOW must be a live window and defaults to the selected one.  The
 optional arguments MINIBUF and ALL-FRAMES specify the set of windows to
 consider.
@@ -2226,7 +2222,7 @@ windows, eventually ending up back at the window you started with.
 DEFUN ("previous-window", Fprevious_window, Sprevious_window, 0, 3, 0,
-       doc: /* Return window preceding WINDOW in cyclic ordering of windows.
+       doc: /* Return live window before WINDOW in the cyclic ordering of windows.
 WINDOW must be a live window and defaults to the selected one.  The
 optional arguments MINIBUF and ALL-FRAMES specify the set of windows to
 consider.
@@ -5782,13 +5778,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 (XINT (w->hscroll))
+    {
+      /* 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;
+    }
-  if (w->phys_cursor.vpos >= 0
+  if (row->used[TEXT_AREA] > hpos
-      && w->phys_cursor.vpos < w->current_matrix->nrows
+      && 0 <= hpos)
-      && (row = MATRIX_ROW (w->current_matrix, w->phys_cursor.vpos),
+    glyph = row->glyphs[TEXT_AREA] + hpos;
-          row->enabled_p)
-      && row->used[TEXT_AREA] > w->phys_cursor.hpos)
-    glyph = row->glyphs[TEXT_AREA] + w->phys_cursor.hpos;
  else
    glyph = NULL;
@@ -6524,10 +6537,10 @@ sibling.
 Other values are reserved for future use.
-The value of this variable is also assigned to the combination-limit
+The value of this variable is also assigned to the combination limit of
-status of the new parent window.  The combination-limit status of a
+the new parent window.  The combination limit of a window can be
-window can be retrieved via the function `window-combination-limit' and
+retrieved via the function `window-combination-limit' and altered by the
-altered by the function `set-window-combination-limit'.  */);
+function `set-window-combination-limit'.  */);
  Vwindow_combination_limit = Qnil;
  defsubr (&Sselected_window);
diff --git a/src/window.h b/src/window.h
index de0f7307a51..df29ca1368f 100644
--- a/src/window.h
+++ b/src/window.h
@@ -268,7 +268,7 @@ struct window
    /* List of buffers re-shown in this window.  */
    Lisp_Object next_buffers;
-    /* An alist with parameteres.  */
+    /* An alist with parameters.  */
    Lisp_Object window_parameters;
    /* No Lisp data may follow below this point without changing
diff --git a/src/xdisp.c b/src/xdisp.c
index 747b91fa4ab..7c415e485b5 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1450,7 +1450,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))
                    {
@@ -14170,7 +14170,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)
@@ -15092,7 +15092,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 ();
@@ -17102,7 +17102,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.  */
@@ -18054,6 +18054,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.
@@ -18140,17 +18157,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;
@@ -24895,9 +24902,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.  */
@@ -24912,8 +24927,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;
@@ -25430,8 +25445,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;
@@ -25519,6 +25543,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)
@@ -25662,8 +25694,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;
    }
@@ -25833,9 +25883,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;
        }
@@ -25934,7 +25993,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);
 }
diff --git a/src/xfns.c b/src/xfns.c
index 6de412c4e68..c68149cce11 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 ();
@@ -5914,7 +5914,7 @@ the tool bar buttons.  */);
  x_gtk_whole_detached_tool_bar = 0;
  DEFVAR_BOOL ("x-gtk-use-system-tooltips", x_gtk_use_system_tooltips,
-    doc: /* *If non-nil with a Gtk+ built Emacs, the Gtk+ toolip is used.
+    doc: /* *If non-nil with a Gtk+ built Emacs, the Gtk+ tooltip is used.
 Otherwise use Emacs own tooltip implementation.
 When using Gtk+ tooltips, the tooltip face is not used.  */);
  x_gtk_use_system_tooltips = 1;
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/xterm.c b/src/xterm.c
index f8af8ae3df0..f750c00cea0 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -2972,9 +2972,7 @@ x_clear_frame (struct frame *f)
     follow an explicit cursor_to.  */
  BLOCK_INPUT;
-  /* The following call is commented out because it does not seem to accomplish
+  XClearWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f));
-     anything, apart from causing flickering during window resize.  */
-  /* XClearWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f)); */
  /* We have to clear the scroll bars.  If we have changed colors or
     something like that, then they should be notified.  */
@@ -4193,7 +4191,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;
@@ -8779,7 +8777,7 @@ x_wait_for_event (struct frame *f, int eventtype)
  pending_event_wait.f = f;
  pending_event_wait.eventtype = eventtype;
-  /* Set timeout to 0.1 second.  Hopefully not noticable.
+  /* Set timeout to 0.1 second.  Hopefully not noticeable.
     Maybe it should be configurable.  */
  EMACS_SET_SECS_USECS (tmo, 0, 100000);
  EMACS_GET_TIME (tmo_at);
author	Joakim Verona	2011-11-22 15:46:22 +0100
committer	Joakim Verona	2011-11-22 15:46:22 +0100
commit	a9c1e05adddf6011c61c0df582c5f2ed423f35c8 (patch)
tree	489fac119296416ba2f3530fd3bcb70efbbbdaa6 /src
parent	40bb789236e486a3f36eefb2840c293369ce2af3 (diff)
parent	b5afc20930c91159a1cbf629bcaa7e251653dc74 (diff)
download	emacs-a9c1e05adddf6011c61c0df582c5f2ed423f35c8.tar.gz emacs-a9c1e05adddf6011c61c0df582c5f2ed423f35c8.zip