Merge branch 'master' into xwidget

12 files changed, 147 insertions, 87 deletions

diff --git a/ChangeLog b/ChangeLog
index 68d1391b96a..36edfe638d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2015-01-04  Paul Eggert  <eggert@cs.ucla.edu>
 
+        * INSTALL: Mention 'make WERROR_CFLAGS='.
+
         Clarify 'make info'
         * Makefile.in (info): Use GNU make conditional rather than
         an '@' rule with a shell conditional, so that the builder can
@@ -11,23 +13,12 @@
 
 2015-01-01  Paul Eggert  <eggert@cs.ucla.edu>
 
-        Fix copyright years by hand
-        These are dates that admin/update-copyright did not update, or
-        updated incorrectly.  Also, back out the copyright-date change to
-        doc/misc/texinfo.tex, as upstream hasn't updated that date yet.
-
-        Update copyright year to 2015
-        Run admin/update-copyright.
-
         Merge from gnulib, incorporating:
         2015-01-01 version-etc: new year
 
         * .gitattributes: New file.
 
-2015-01-01  Paul Eggert  <eggert@cs.ucla.edu>
-
-        * autogen.sh: Port better to non-GNU 'cp'.
-        Problem reported by Han Boetes.
+        * autogen.sh: Port better to non-GNU 'cp'.  Reported by Han Boetes.
 
 2014-12-31  Paul Eggert  <eggert@cs.ucla.edu>
 
@@ -56,32 +47,9 @@
 
 2014-12-25  Paul Eggert  <eggert@cs.ucla.edu>
 
-        Prefer stpcpy to strcat
-        * admin/merge-gnulib (GNULIB_MODULES): Add stpcpy.
+        Prefer stpcpy to strcat.
         * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
         * lib/stpcpy.c, m4/stpcpy.m4: New files, from gnulib.
-        * lib-src/ebrowse.c (sym_scope_1, operator_name, open_file):
-        * lib-src/emacsclient.c (get_server_config, set_local_socket)
-        (start_daemon_and_retry_set_socket):
-        * lib-src/etags.c (main, C_entries, relative_filename):
-        * lib-src/pop.c (sendline):
-        * lib-src/update-game-score.c (main):
-        * lwlib/xlwmenu.c (resource_widget_value):
-        * src/callproc.c (child_setup):
-        * src/dbusbind.c (xd_signature_cat):
-        * src/doc.c (get_doc_string, Fsnarf_documentation):
-        * src/editfns.c (Fuser_full_name):
-        * src/frame.c (xrdb_get_resource):
-        * src/gtkutil.c (xg_get_file_with_chooser):
-        * src/tparam.c (tparam1):
-        * src/xfns.c (xic_create_fontsetname):
-        * src/xrdb.c (gethomedir, get_user_db, get_environ_db):
-        * src/xsmfns.c (smc_save_yourself_CB):
-        Rewrite to avoid the need for strcat, typically by using stpcpy
-        and/or lispstpcpy.  strcat tends to be part of O(N**2) algorithms.
-        * src/doc.c (sibling_etc):
-        * src/xrdb.c (xdefaults):
-        Now a top-level static constant.
 
 2014-12-24  Stephen Leake  <stephen_leake@stephe-leake.org>
 
@@ -96,17 +64,12 @@
 
 2014-12-23  Paul Eggert  <eggert@cs.ucla.edu>
 
-        Merge from gnulib
+        Merge from gnulib.
         2014-12-20 utimens: remove unnecessary assert
         2014-12-16 stdalign: port better to HP compilers
         2014-12-16 stdalign: work around Apple GCC 4.0 bug
         * lib/stdalign.in.h, lib/utimens.c, m4/stdalign.m4: Update from gnulib.
 
-2014-12-14  Paul Eggert  <eggert@cs.ucla.edu>
-
-        Spelling fixes.  All uses changed.
-        * src/regex.c (analyze_first): Rename from analyze_first.
-
 2014-12-14  Glenn Morris  <rgm@gnu.org>
 
         * make-dist: No more lib-src/grep-changelog.
@@ -119,22 +82,20 @@
 
 2014-12-13  Paul Eggert  <eggert@cs.ucla.edu>
 
-        Git ignore lib/std*.h
         * .gitignore: Add lib/std*.h, to ignore stdarg.h, stdbool.h, and
         stddef.h.  Remove subsumed entries.
         Add !lib/std*.in.h, so as to not ignore the .in.h files.
 
 2014-12-13  Paul Eggert  <eggert@cs.ucla.edu>
 
-        Port commit-msg to mawk
-        Problem reported by Ted Zlatanov in:
+        Port commit-msg to mawk.  Reported by Ted Zlatanov in:
         http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg01093.html
         * build-aux/git-hooks/commit-msg (space, non_space, non_print):
         New vars.  Use them as approximations to POSIX bracket expressions,
         on implementations like mawk that do not support POSIX regexps.
 
-        Improve commit-msg messages and autosquash
-        Problem reported by Michal Nazarewicz in Bug#19337.
+        Improve commit-msg messages and autosquash.
+        Reported by Michal Nazarewicz in Bug#19337.
         * build-aux/git-hooks/commit-msg: Add "commit message" to
         diagnostics.  Distinguish better between tabs and other
         unprintable chars in diagnostics.  Don't complain if a prefix
@@ -143,7 +104,7 @@
 2014-12-13  Paul Eggert  <eggert@cs.ucla.edu>
 
         Port commit-message checking to FreeBSD 9.
-        This fixes a bug reported by Jan Djärv in:
+        Reported by Jan Djärv in:
         http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg00704.html
         along with some other issues I noticed while testing with FreeBSD.
         * build-aux/git-hooks/commit-msg: Prefer gawk if available.
@@ -158,7 +119,7 @@
 
 2014-12-12  Paul Eggert  <eggert@cs.ucla.edu>
 
-        Merge from gnulib
+        Merge from gnulib.
         2014-12-12 stddef: support C11's max_align_t
         2014-12-11 unistd: fix iOS check conditional
         2014-12-08 apply _GL_ATTRIBUTE_PURE to some inline functions
@@ -343,7 +304,7 @@
         build: port to GCC 4.6.4 + glibc 2.5
         On platforms this old, building with _FORTIFY_SOURCE equal to 2
         results in duplicate definitions of standard library functions.
-        Problem reported by Nelson H. F. Beebe.
+        Reported by Nelson H. F. Beebe.
         * configure.ac (_FORTIFY_SOURCE): Sort after GNULIB_PORTCHECK.
         By default, do not enable this unless GNULIB_PORTCHECK is defined.
         This better matches the original intent, which as I recall was to
@@ -1359,7 +1320,7 @@
         Fix problem with MAKE and xcrun configuration.
         * configure.ac: Don't set MAKE unless 'make' doesn't work.
         Set it only in the environment, not in the makefile.
-        Problem reported by Glenn Morris in:
+        Reported by Glenn Morris in:
         http://lists.gnu.org/archive/html/emacs-devel/2013-12/msg00969.html
 
 2013-12-27  Paul Eggert  <eggert@cs.ucla.edu>
@@ -3053,7 +3014,7 @@
         (bootstrap): Run ./configure, rather than trying to run config.status
         if it exists.  That builds src/epaths.h more reliably.
         Run autogen/copy_autogen if autogen.sh fails,
-        to create 'configure'; problem reported by Andreas Schwab in
+        to create 'configure'.  Reported by Andreas Schwab in
         <http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00438.html>.
         * autogen.sh: Exit with status 1 when failing due to missing tools,
         reverting the 2012-09-10 change to this file.
@@ -4385,8 +4346,7 @@
 
         Check pkg-config exit status when configuring (Bug#10626).
         * configure.in (PKG_CHECK_MODULES): Do not assume that pkg-config
-        works; check its exit status.  Problem reported by Jordi Gutiérrez
-        Hermoso in
+        works; check its exit status.  Reported by Jordi Gutiérrez Hermoso in
         <http://lists.gnu.org/archive/html/emacs-devel/2012-01/msg00787.html>.
 
 2012-04-07  Glenn Morris  <rgm@gnu.org>
@@ -4544,7 +4504,7 @@
         * configure.in (LIB_PTHREAD): Prepend -lpthread to LIBS (Bug#9852)
         if the library is found.  Otherwise, later configure-time tests,
         such as the test for pthread_sigmask, generate the wrong results
-        on some platforms.  Problem reported for FreeBSD by Nali Toja.
+        on some platforms.  Reported by Nali Toja for FreeBSD.
 
 2011-10-20  Paul Eggert  <eggert@cs.ucla.edu>
 
@@ -4775,7 +4735,7 @@
         * m4/pthread_sigmask.m4 (gl_FUNC_PTHREAD_SIGMASK): Omit gl_THREADLIB
         test, which runs afoul of Automake installations where, for example,
         /usr/share/aclocal contains a copy of gl_THREADLIB.
-        Problem reported by Sven Joachim in
+        Reported by Sven Joachim in
         <http://lists.gnu.org/archive/html/emacs-devel/2011-07/msg00529.html>.
         This is just a quick temporary fix, specific to Emacs; I'll work
         with the other gnulib maintainers to get a more-permanent fix.
@@ -5387,7 +5347,7 @@
 
         * arg-nonnull.h, c++defs.h, warn-on-use.h: Fix licenses.
         Sync from gnulib, which has been patched to fix the problem
-        with the license notices.  Problem reported by Glenn Morris in
+        with the license notices.  Reported by Glenn Morris in
         <http://lists.gnu.org/archive/html/emacs-devel/2011-02/msg00403.html>.
 
 2011-02-09  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -5541,7 +5501,7 @@
         used.  The code already assumed two's complement, so there's
         no need to test for alternatives.  All uses removed.
         (TYPE_MAXIMUM): Don't rely here on overflow behavior not defined by
-        the C standard.  Problem reported by Rich Felker in
+        the C standard.  Reported by Rich Felker in
         <http://lists.gnu.org/archive/html/bug-gnulib/2011-01/msg00488.html>.
         (twos_complement_arithmetic): Also check long_int and time_t.
         (time_t_avg, time_t_add_ok, time_t_int_add_ok): New functions.
diff --git a/INSTALL b/INSTALL
index 6850c7dfcdc..1ed26985477 100644
--- a/INSTALL
+++ b/INSTALL
@@ -312,7 +312,9 @@ Use --enable-gcc-warnings to enable compile-time checks that warn
 about possibly-questionable C code.  This is intended for developers
 and is useful with GNU-compatible compilers.  On a recent GNU system
 there should be no warnings; on older and on non-GNU systems the
-generated warnings may still be useful.
+generated warnings may still be useful, though you may prefer building
+with 'make WERROR_CFLAGS=' so that the warnings are not treated as
+errors.
 
 Use --enable-silent-rules to cause 'make' to chatter less.  This is
 helpful when combined with options like --enable-gcc-warnings that
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 83386061180..8c0c9759e87 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -30,6 +30,10 @@
 
         * update-copyright (emacsver): Change to emacsver.tex.in.
 
+2014-12-25  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * merge-gnulib (GNULIB_MODULES): Add stpcpy.
+
 2014-12-24  Glenn Morris  <rgm@gnu.org>
 
         * authors.el (authors-obsolete-files-regexps)
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index c8500d2f412..2739e3e509d 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -655,7 +655,7 @@ and also calls the functions in the list
 Normally, @code{write-region} displays the message @samp{Wrote
 @var{filename}} in the echo area.  This message is inhibited if
 @var{visit} is neither @code{t} nor @code{nil} nor a string, or if
-Emacs is operating in batch mode (@pxref{Batch mode}).  This
+Emacs is operating in batch mode (@pxref{Batch Mode}).  This
 feature is useful for programs that use files for internal purposes,
 files that the user does not need to know about.
 @end deffn
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 1795f021027..acbbd3a02df 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,5 +1,9 @@
 2015-01-04  Paul Eggert  <eggert@cs.ucla.edu>
 
+        'temacs -nw' should not call missing functions
+        * make-docfile.c (write_globals):
+        Declare Fframe_windows_min_size with ATTRIBUTE_CONST, too.  Sort.
+
         Less 'make' chatter for lib-src
         * Makefile.in (blessmail): Less 'make' chatter here.
 
@@ -11,6 +15,17 @@
         since GCC sometimes calls stpcpy when it sees strcpy, under
         optimization switches.
 
+2014-12-25  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * ebrowse.c (sym_scope_1, operator_name, open_file):
+        * emacsclient.c (get_server_config, set_local_socket)
+        (start_daemon_and_retry_set_socket):
+        * etags.c (main, C_entries, relative_filename):
+        * pop.c (sendline):
+        * update-game-score.c (main):
+        Rewrite to avoid the need for strcat, typically by using stpcpy
+        and/or lispstpcpy.  strcat tends to be part of O(N**2) algorithms.
+
 2014-12-14  Paul Eggert  <eggert@cs.ucla.edu>
 
         * etags.c (analyze_regex): Rename from analyse_regex.
@@ -140,8 +155,7 @@
 
 2014-05-26  Paul Eggert  <eggert@cs.ucla.edu>
 
-        Fix rcs2log problems with CVS.
-        Problem reported by Glenn Morris in
+        Fix rcs2log problems with CVS.  Reported by Glenn Morris in
         <http://lists.gnu.org/archive/html/emacs-devel/2014-05/msg00277.html>.
         Plus, fix some security and filename quoting problems.
         * rcs2log (logdir): Prefer mktemp if available.
@@ -3496,7 +3510,7 @@
 2004-04-17  Paul Eggert  <eggert@gnu.org>
 
         * rcs2log (Help): Clarify wording of the usage message.
-        Problem reported by Alan Mackenzie in
+        Reported by Alan Mackenzie in
         <http://mail.gnu.org/archive/html/bug-gnu-emacs/2004-04/msg00188.html>.
 
 2004-04-07  Stefan Monnier  <monnier@iro.umontreal.ca>
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 78becac6c8a..f74b3d516d1 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -658,9 +658,10 @@ write_globals (void)
           /* It would be nice to have a cleaner way to deal with these
              special hacks, too.  */
           if (strcmp (globals[i].name, "Fbyteorder") == 0
-              || strcmp (globals[i].name, "Ftool_bar_height") == 0
+              || strcmp (globals[i].name, "Fframe_windows_min_size") == 0
+              || strcmp (globals[i].name, "Fidentity") == 0
               || strcmp (globals[i].name, "Fmax_char") == 0
-              || strcmp (globals[i].name, "Fidentity") == 0)
+              || strcmp (globals[i].name, "Ftool_bar_height") == 0)
             fputs (" ATTRIBUTE_CONST", stdout);
 
           puts (";");
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index aa79a8d4b2e..f413526c0b2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2015-01-04  Dmitry Gutov  <dgutov@yandex.ru>
+
+        Add mouse interaction to xref.
+
+        * progmodes/xref.el (xref--button-map): New variable.
+        (xref--mouse-2): New command.
+        (xref--insert-xrefs): Add `mouse-face' and `keymap' properties to
+        the inserted references.
+
 2015-01-04  Paul Eggert  <eggert@cs.ucla.edu>
 
         Less 'make' chatter for lisp dir
@@ -1903,7 +1912,7 @@
 2014-11-18  Paul Eggert  <eggert@cs.ucla.edu>
 
         Port new time stamp handling to Emacs 23.2.
-        This fix is for Gnus.  Problem reported by Katsumi Yamaoka.
+        This fix is for Gnus.  Reported by Katsumi Yamaoka.
         * calendar/time-date.el (time-add, time-subtract, time-less-p):
         Use eval-and-compile, not eval-when-compile.
 
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index 7bc6500a8de..41b70c7eff2 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -405,6 +405,21 @@ WINDOW controls how the buffer is displayed:
 (defconst xref-buffer-name "*xref*"
   "The name of the buffer to show xrefs.")
 
+(defvar xref--button-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map [(control ?m)] #'xref-goto-xref)
+    (define-key map [mouse-1] #'xref-goto-xref)
+    (define-key map [mouse-2] #'xref--mouse-2)
+    map))
+
+(defun xref--mouse-2 (event)
+  "Move point to the button and show the xref definition."
+  (interactive "e")
+  (mouse-set-point event)
+  (forward-line 0)
+  (xref--search-property 'xref-location)
+  (xref-show-location-at-point))
+
 (defun xref--insert-xrefs (xref-alist)
   "Insert XREF-ALIST in the current-buffer.
 XREF-ALIST is of the form ((GROUP . (XREF ...)) ...).  Where
@@ -417,7 +432,9 @@ GROUP is a string for decoration purposes and XREF is an
                     (with-slots (description location) xref
                       (xref--insert-propertized
                        (list 'xref-location location
-                             'face 'font-lock-keyword-face)
+                             'face 'font-lock-keyword-face
+                             'mouse-face 'highlight
+                             'keymap xref--button-map)
                        description))
                     (when (or more1 more2)
                       (insert "\n")))))
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index 023804cdfe5..8d536f0b3ad 100644
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -5,6 +5,12 @@
         (AM_V_at, am__v_at_, am__v_at_0, am__v_at_1): New macros.
         (liblw.a): Use them.
 
+2014-12-25  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * xlwmenu.c (resource_widget_value):
+        Rewrite to avoid the need for strcat, typically by using stpcpy
+        and/or lispstpcpy.  strcat tends to be part of O(N**2) algorithms.
+
 2014-10-20  Glenn Morris  <rgm@gnu.org>
 
         * Merge in all changes up to 24.4 release.
diff --git a/src/ChangeLog b/src/ChangeLog
index b503a40640f..8cf269680de 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,14 @@
 2015-01-04  Paul Eggert  <eggert@cs.ucla.edu>
 
+        'temacs -nw' should not call missing functions
+        Without this patch, "temacs -nw" fails with the diagnostic
+        "emacs: Symbol's function definition is void: frame-windows-min-size"
+        and messes up the tty's state.
+        * frame.c (Fframe_windows_min_size): New placeholder function.
+        (syms_of_frame): Define it.
+        * window.c (Fwindow__sanitize_window_sizes): New placeholder.
+        (syms_of_window): Define it.
+
         Less 'make' chatter for lisp dir
         * Makefile.in (%.elc): Adjust to compile-onefile change in
         ../lisp/Makefile.in.
@@ -188,6 +197,24 @@
         (x_session_initialize, Fhandle_save_session):
         Prefer NILP (x) to EQ (x, Qnil).
 
+2014-12-25  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * callproc.c (child_setup):
+        * dbusbind.c (xd_signature_cat):
+        * doc.c (get_doc_string, Fsnarf_documentation):
+        * editfns.c (Fuser_full_name):
+        * frame.c (xrdb_get_resource):
+        * gtkutil.c (xg_get_file_with_chooser):
+        * tparam.c (tparam1):
+        * xfns.c (xic_create_fontsetname):
+        * xrdb.c (gethomedir, get_user_db, get_environ_db):
+        * xsmfns.c (smc_save_yourself_CB):
+        Rewrite to avoid the need for strcat, typically by using stpcpy
+        and/or lispstpcpy.  strcat tends to be part of O(N**2) algorithms.
+        * doc.c (sibling_etc):
+        * xrdb.c (xdefaults):
+        Now a top-level static constant.
+
 2014-12-23  Didier Verna  <didier@didierverna.net> (tiny change).
 
         * nsselect.m (Fns_selection_owner_p): Return a Lisp boolean, not a
@@ -595,7 +622,7 @@
 2014-11-29  Paul Eggert  <eggert@cs.ucla.edu>
 
         Improve clarity of USE_LSB_TAG definition.
-        Problem reported by Lee Duhem.  Suggestion by Andreas Schwab in:
+        Reported by Lee Duhem.  Suggested by Andreas Schwab in:
         http://lists.gnu.org/archive/html/emacs-devel/2014-11/msg02222.html
         * lisp.h (USE_LSB_TAG): Define in terms of the (simpler)
         VAL_MAX / 2 rather than in terms of the (more complicated)
@@ -621,7 +648,7 @@
 
 2014-11-27  Oscar Fuentes  <ofv@wanadoo.es>
 
-        * src/w32.c, src/w32heap.c, src/w32term.c:
+        * w32.c, w32heap.c, w32term.c:
         Use MINGW_W64 instead of _W64.
 
 2014-11-27  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -1091,7 +1118,7 @@
 
 2014-10-25  Noam Postavsky  <npostavs@users.sourceforget.net>
 
-        * src/w32proc.c (create_child): If calling a quoted batch file,
+        * w32proc.c (create_child): If calling a quoted batch file,
         pass NULL for exe.  (Bug#18745)
 
 2014-10-24  Eli Zaretskii  <eliz@gnu.org>
@@ -1510,7 +1537,7 @@
         On x86 platforms this works around GCC bug 63495
         <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63495>,
         and more generally should fix a portability problem in Emacs.
-        Problem reported by Stefan Monnier in:
+        Reported by Stefan Monnier in:
         http://lists.gnu.org/archive/html/emacs-devel/2014-10/msg00261.html
 
 2014-10-08  Leo Liu  <sdl.web@gmail.com>
@@ -2026,7 +2053,7 @@
 2014-09-23  Paul Eggert  <eggert@cs.ucla.edu>
 
         Fix SAFE_ALLOCA to not exhaust the stack when in a loop.
-        Problem reported by Dmitry Antipov in thread leading to:
+        Reported by Dmitry Antipov in thread leading to:
         http://lists.gnu.org/archive/html/emacs-devel/2014-09/msg00713.html
         This patch fixes only SAFE_ALLOCA, SAFE_NALLOCA, and SAFE_ALLOCA_LISP;
         the experimental local_* macros enabled by USE_LOCAL_ALLOCATORS
@@ -2359,7 +2386,7 @@
 2014-09-10  Paul Eggert  <eggert@cs.ucla.edu>
 
         Simplify lisp.h by removing the __COUNTER__ business.
-        Problem reported by Dmitry Antipov in:
+        Reported by Dmitry Antipov in:
         http://lists.gnu.org/archive/html/emacs-devel/2014-09/msg00220.html
         * lisp.h (make_local_vector, make_local_string)
         (build_local_string): Simplify by not bothering with __COUNTER__.
@@ -2390,7 +2417,7 @@
         * lisp.h (DEFINE_GDB_SYMBOL_ENUM): Remove.
         These can generate a constant with the correct value but the wrong
         width, which doesn't work as a printf argument.  All uses removed.
-        Problem reported by Dmitry Antipov in:
+        Reported by Dmitry Antipov in:
         http://lists.gnu.org/archive/html/emacs-devel/2014-09/msg00213.html
         (ENUMABLE): Remove; no longer needed.
         (ARRAY_MARK_FLAG_val, PSEUDOVECTOR_FLAG_val, VALMASK_val):
@@ -4881,7 +4908,7 @@
 2014-06-03  Paul Eggert  <eggert@cs.ucla.edu>
 
         * emacs.c: Include "sysselect.h", to define its inline functions.
-        Problem reported by Glenn Morris in:
+        Reported by Glenn Morris in:
         http://lists.gnu.org/archive/html/emacs-devel/2014-06/msg00077.html
 
         Do not require libXt-devel when building with gtk.
@@ -5981,7 +6008,7 @@
 2014-03-27  Paul Eggert  <eggert@cs.ucla.edu>
 
         Port recent signal-related changes to FreeBSD.
-        Problem reported by Herbert J. Skuhra.
+        Reported by Herbert J. Skuhra.
         * lisp.h (block_tty_out_signal, unblock_tty_out_signal):
         Move decls from here ...
         * syssignal.h: ... to here, so that lisp.h doesn't depend on signal.h.
@@ -6959,7 +6986,7 @@
 2014-01-20  Paul Eggert  <eggert@cs.ucla.edu>
 
         Avoid undefined behavior by initializing buffer redisplay bit.
-        Problem reported by Dmitry Antipov in
+        Reported by Dmitry Antipov in
         <http://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01756.html>.
         * buffer.c (Fget_buffer_create): Initialize redisplay bit.
 
@@ -8800,7 +8827,7 @@
 2013-11-21  Paul Eggert  <eggert@cs.ucla.edu>
 
         Fix some dependency problems that cause unnecessary recompiles.
-        Problem reported by RMS in
+        Reported by RMS in
         <http://lists.gnu.org/archive/html/emacs-devel/2013-11/msg00421.html>.
         * Makefile.in (OLDXMENU_TARGET, OLDXMENU, OLDXMENU_DEPS)
         (really-lwlib, really-oldXMenu, stamp-oldxmenu)
@@ -9545,8 +9572,7 @@
 
 2013-10-23  Paul Eggert  <eggert@cs.ucla.edu>
 
-        Port to Solaris 10 and its bundled GCC.
-        Problem reported by Timothy C. Burt.
+        Port to Solaris 10 and its bundled GCC.  Reported by Timothy C. Burt.
         * floatfns.c (isfinite, isnan): Redefine unconditionally.
 
 2013-10-21  Dmitry Antipov  <dmantipov@yandex.ru>
@@ -9950,7 +9976,7 @@
         so it shouldn't be used all the time.  Perhaps we need two
         flavors of 'eassert', one for where 'assume' is far more likely
         to help or to hurt; but that can be done later.
-        Problem reported by Dmitry Antipov in
+        Reported by Dmitry Antipov in
         <http://lists.gnu.org/archive/html/emacs-devel/2013-10/msg00276.html>.
         Also, don't include <verify.h>; no longer needed.
 
@@ -13678,8 +13704,7 @@
 
 2013-07-07  Paul Eggert  <eggert@cs.ucla.edu>
 
-        Port to Ubuntu 10 (Bug#14803).
-        Problem reported by T.V. Raman.
+        Port to Ubuntu 10 (Bug#14803).  Reported by T.V. Raman.
         * process.c (close_on_exec, accept4, process_socket):
         Define these if !HAVE_ACCEPT4, not if !SOCK_CLOEXEC.
 
@@ -13944,7 +13969,7 @@
         * emacs.c (malloc_enable_thread): Hoist extern decl to top level.
         (main) [HAVE_PTHREAD && !SYSTEM_MALLOC && !DOUG_LEA_MALLOC]:
         Invoke malloc_enable_thread even when not interactive.
-        Problem reported by Ken Brown in <http://bugs.gnu.org/14569#275>.
+        Reported by Ken Brown in <http://bugs.gnu.org/14569#275>.
         * process.c (init_process_emacs) [CYGWIN]: Tickle glib even
         in this case, since the underlying bug has now been fixed.
 
@@ -15169,7 +15194,7 @@
         * unexelf.c: Don't assume ElfW (Half) fits in int.
         (entry_address, find_section, unexec): Use ptrdiff_t, not int,
         when dealing with ElfW (Half) values, since they can exceed 2**31
-        on 64-bit OpenBSD hosts.  Problem reported privately by Han Boetes.
+        on 64-bit OpenBSD hosts.  Reported by Han Boetes (privately).
         (entry_address): Omit unused NUM arg.  All uses changed.
 
 2013-05-07  Juri Linkov  <juri@jurta.org>
diff --git a/src/frame.c b/src/frame.c
index 5a0d142afbb..9394ae481f5 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -334,10 +334,22 @@ predicates which report frame's specific UI-related capabilities.  */)
     return type;
 }
 
+/* Placeholder used by temacs -nw before window.el is loaded.  */
+DEFUN ("frame-windows-min-size", Fframe_windows_min_size,
+       Sframe_windows_min_size, 4, 4, 0,
+       doc: /* */)
+     (Lisp_Object frame, Lisp_Object horizontal,
+      Lisp_Object ignore, Lisp_Object pixelwise)
+{
+  return make_number (0);
+}
+
 static int
-frame_windows_min_size (Lisp_Object frame, Lisp_Object horizontal, Lisp_Object ignore, Lisp_Object pixelwise)
+frame_windows_min_size (Lisp_Object frame, Lisp_Object horizontal,
+                        Lisp_Object ignore, Lisp_Object pixelwise)
 {
-  return XINT (call4 (Qframe_windows_min_size, frame, horizontal, ignore, pixelwise));
+  return XINT (call4 (Qframe_windows_min_size, frame, horizontal,
+                      ignore, pixelwise));
 }
 
 
@@ -5081,6 +5093,7 @@ even if this option is non-nil.  */);
   defsubr (&Sframep);
   defsubr (&Sframe_live_p);
   defsubr (&Swindow_system);
+  defsubr (&Sframe_windows_min_size);
   defsubr (&Smake_terminal_frame);
   defsubr (&Shandle_switch_frame);
   defsubr (&Sselect_frame);
diff --git a/src/window.c b/src/window.c
index 65a837dbbad..4da33501323 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3017,6 +3017,14 @@ resize_root_window (Lisp_Object window, Lisp_Object delta, Lisp_Object horizonta
   return call5 (Qwindow_resize_root_window, window, delta, horizontal, ignore, pixelwise);
 }
 
+/* Placeholder used by temacs -nw before window.el is loaded.  */
+DEFUN ("window--sanitize-window-sizes", Fwindow__sanitize_window_sizes,
+       Swindow__sanitize_window_sizes, 2, 2, 0,
+       doc: /* */)
+     (Lisp_Object frame, Lisp_Object horizontal)
+{
+  return Qnil;
+}
 
 Lisp_Object
 sanitize_window_sizes (Lisp_Object frame, Lisp_Object horizontal)
@@ -7569,6 +7577,7 @@ displayed after a scrolling operation to be somewhat inaccurate.  */);
   defsubr (&Sset_window_display_table);
   defsubr (&Snext_window);
   defsubr (&Sprevious_window);
+  defsubr (&Swindow__sanitize_window_sizes);
   defsubr (&Sget_buffer_window);
   defsubr (&Sdelete_other_windows_internal);
   defsubr (&Sdelete_window_internal);