merge master

6 files changed, 51 insertions, 7 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 7b286ccb8bf..b503a40640f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,29 @@
+2015-01-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Less 'make' chatter for lisp dir
+        * Makefile.in (%.elc): Adjust to compile-onefile change in
+        ../lisp/Makefile.in.
+
+        batch write-region no longer says "Wrote FOO"
+        This cuts down on 'make' chatter a bit.
+        * fileio.c (Fwrite_region):
+        Don't output "Wrote /whatever/foo.elc" if noninteractive.
+
+2015-01-03  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Revert previous change to produce_composite_glyph
+        * term.c (produce_composite_glyph): Revert previous change (Bug#19496).
+
+        Pacify gcc -Wparentheses
+        * frame.c (x_set_frame_parameters): Add parens (Bug#19428).
+
+2015-01-03  Martin Rudalics  <rudalics@gmx.at>
+
+        * frame.c (x_set_frame_parameters): Call Fset_frame_size only if
+        f->can_x_set_window_size is true.
+        * xterm.c (x_set_window_size_1): Call change_frame_size with
+        text sizes instead of pixel sizes (Bug#19428).
+
 2015-01-01  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (pos_visible_p): Fix up the X coordinate for
@@ -21,6 +47,24 @@
         * sysdep.c [WINDOWSNT]: Include sys/socket.h, without which this
         file doesn't compile on MS-Windows.
 
+2014-12-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Allow return value of system-name to vary.  (Bug#19438)
+        * filelock.c (current_lock_owner):
+        * xrdb.c (get_environ_db):
+        * xterm.c (same_x_server):
+        * xterm.c (x_term_init):
+        Prefer (system-name) to system-name, and avoid naming
+        locals 'system-name'.
+        * editfns.c (cached_system_name): New static var.
+        (init_and_cache_system_name): New function.
+        (init_editfns, Fsystem_name): Use it.
+        (syms_of_editfns): Initialize it and Vsystem_name to the same value.
+        * sysdep.c [HAVE_SOCKETS]: Don't include <sys/socket.h>, <netdb.h>.
+        (h_errno) [TRY_AGAIN && !HAVE_H_ERRNO]: Remove decl.
+        (init_system_name) [HAVE_SOCKETS]: Don't canonicalize the name.
+        Don't create a new string if the current value is already correct.
+
 2014-12-28  Paul Eggert  <eggert@cs.ucla.edu>
 
         Fix produce_composite_width typo
diff --git a/src/Makefile.in b/src/Makefile.in
index e73a4054191..9bd86d54793 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -646,7 +646,7 @@ tags: TAGS ../lisp/TAGS $(lwlibdir)/TAGS
 ## bootstrap-emacs$(EXEEXT) as an order-only prerequisite.
 
 %.elc: %.el | bootstrap-emacs$(EXEEXT)
-        @$(MAKE) -C ../lisp compile-onefile THEFILE=$< EMACS="$(bootstrap_exe)"
+        @$(MAKE) -C ../lisp EMACS="$(bootstrap_exe)" THEFILE=$< $<c
 
 ## VCSWITNESS points to the file that holds info about the current checkout.
 ## We use it as a heuristic to decide when to rebuild loaddefs.el.
diff --git a/src/fileio.c b/src/fileio.c
index b04d99809a6..0f0fd1a5c8d 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4741,8 +4741,8 @@ Optional fifth argument VISIT, if t or a string, means
 If VISIT is a string, it is a second file name;
   the output goes to FILENAME, but the buffer is marked as visiting VISIT.
   VISIT is also the file name to lock and unlock for clash detection.
-If VISIT is neither t nor nil nor a string,
-  that means do not display the \"Wrote file\" message.
+If VISIT is neither t nor nil nor a string, or if Emacs is in batch mode,
+  do not display the \"Wrote file\" message.
 The optional sixth arg LOCKNAME, if non-nil, specifies the name to
   use for locking and unlocking, overriding FILENAME and VISIT.
 The optional seventh arg MUSTBENEW, if non-nil, insists on a check
@@ -5109,7 +5109,7 @@ write_region (Lisp_Object start, Lisp_Object end, Lisp_Object filename,
       return Qnil;
     }
 
-  if (!auto_saving)
+  if (!auto_saving && !noninteractive)
     message_with_string ((NUMBERP (append)
                           ? "Updated %s"
                           : ! NILP (append)
diff --git a/src/frame.c b/src/frame.c
index 13b05c6b0fd..5a0d142afbb 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -3219,7 +3219,7 @@ x_set_frame_parameters (struct frame *f, Lisp_Object alist)
 
     if ((width_change && width != FRAME_TEXT_WIDTH (f))
         || (height_change && height != FRAME_TEXT_HEIGHT (f))
-        || f->new_height || f->new_width)
+        || (f->can_x_set_window_size && (f->new_height || f->new_width)))
       {
         /* If necessary provide default values for HEIGHT and WIDTH.  Do
            that here since otherwise a size change implied by an
diff --git a/src/term.c b/src/term.c
index 74879ecc3f5..48447bce5fd 100644
--- a/src/term.c
+++ b/src/term.c
@@ -1736,7 +1736,7 @@ produce_composite_glyph (struct it *it)
     {
       struct composition *cmp = composition_table[it->cmp_it.id];
 
-      it->pixel_width = cmp->pixel_width;
+      it->pixel_width = cmp->width;
     }
   else
     {
diff --git a/src/xterm.c b/src/xterm.c
index 88962f640d5..14d04b8f671 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -9557,7 +9557,7 @@ x_set_window_size_1 (struct frame *f, bool change_gravity,
     x_wait_for_event (f, ConfigureNotify);
   else
     {
-      change_frame_size (f, pixelwidth, pixelheight, false, true, false, true);
+      change_frame_size (f, width, height, false, true, false, true);
       x_sync (f);
     }
 }