Merge branch 'master' into xwidget

3 files changed, 67 insertions, 20 deletions

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);