merge master

35 files changed, 330 insertions, 119 deletions

diff --git a/ChangeLog b/ChangeLog
index 3182c6c8ff0..68d1391b96a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2015-01-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Clarify 'make info'
+        * Makefile.in (info): Use GNU make conditional rather than
+        an '@' rule with a shell conditional, so that the builder can
+        see the submake.
+
+        Less 'make' chatter for VCSWITNESS
+        * Makefile.in (dirstate, VCSWITNESS): New macros.
+        (src): Use them to lessen 'make' chatter.
+
 2015-01-01  Paul Eggert  <eggert@cs.ucla.edu>
 
         Fix copyright years by hand
@@ -28,39 +39,6 @@
         Be less chatty when not verbose.
         ($(srcdir)/src/stamp-h.in): Simplify with '$@'.
 
-2014-12-29  Paul Eggert  <eggert@cs.ucla.edu>
-
-        system-name's returned value can vary
-        Also, the system-name variable is now obsolete.
-        Fixes Bug#19438.
-        * doc/lispref/os.texi (System Environment):
-        * etc/NEWS: Document this.
-        * doc/misc/efaq.texi:
-        (Displaying the current file name in the titlebar):
-        * lisp/desktop.el (desktop-save-frameset):
-        * lisp/dnd.el (dnd-get-local-file-uri):
-        * lisp/gnus/message.el (message-make-fqdn):
-        * lisp/gnus/nnvirtual.el (nnvirtual-retrieve-headers)
-        (nnvirtual-update-xref-header):
-        * lisp/nxml/rng-uri.el (rng-uri-file-name-1):
-        * lisp/org/org-clock.el (org-clock-save):
-        * src/filelock.c (current_lock_owner):
-        * src/xrdb.c (get_environ_db):
-        * src/xterm.c (same_x_server):
-        * src/xterm.c (x_term_init):
-        Prefer (system-name) to system-name, and avoid naming
-        locals 'system-name'.
-        * doc/misc/smtpmail.texi (Server workarounds): Fix grammar.
-        * lisp/startup.el (system-name): Now an obsolete variable.
-        * src/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.
-        * src/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>
 
         * build-aux/git-hooks/commit-msg: Allow tabs.
diff --git a/Makefile.in b/Makefile.in
index b8d914b3bd7..4cdd293ebd4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -389,15 +389,13 @@ lib lib-src lisp nt: Makefile
 # repository pull. In git there is no single file that guarantees
 # this, but the local log for the current head should be close enough.
 #
-# Note the use of single quotes in the value of vcswitness.
-# This passes an unexpanded $srcdir to src's Makefile, which then
+# Pass an unexpanded $srcdir to src's Makefile, which then
 # expands it using its own value of srcdir (which points to the
 # source directory of src/).
+dirstate = .git/logs/HEAD
+VCSWITNESS = $(if $(wildcard $(srcdir)/$(dirstate)),$$(srcdir)/../$(dirstate))
 src: Makefile
-        dirstate='.git/logs/HEAD';                              \
-        vcswitness='$$(srcdir)/../'$$dirstate;                          \
-        [ -r "$(srcdir)/$$dirstate" ] || vcswitness='';                 \
-        $(MAKE) -C $@ all VCSWITNESS="$$vcswitness"
+        $(MAKE) -C $@ VCSWITNESS='$(VCSWITNESS)' all
 
 blessmail: Makefile src
         $(MAKE) -C lib-src maybe-blessmail
@@ -1045,11 +1043,9 @@ uninstall-ps: $(UNINSTALL_PS)
 # and it's not worth it.  This case is only relevant if you download a
 # release, then change the .texi files.
 info:
-        @if test "$(HAVE_MAKEINFO)" = "no"; then \
-          echo "Configured --without-makeinfo, not building manuals" ; \
-        else \
-          $(MAKE) info-real info-dir; \
-        fi
+  ifneq ($(HAVE_MAKEINFO),no)
+        $(MAKE) info-real info-dir
+  endif
 
 ## build-aux/make-info-dir expects only certain dircategories.
 check-info: info
diff --git a/admin/ChangeLog b/admin/ChangeLog
index d7025657e78..83386061180 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,17 @@
+2015-01-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Less 'make' chatter for admin/grammars
+        * grammars/Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN)
+        (am__v_GEN_, am__v_GEN_0, am__v_GEN_1, AM_V_at, am__v_at_)
+        (am__v_at_0, am__v_at_1): New macros, from src/Makefile.in.
+        (${bovinedir}/%-by.el, ${bovinedir}/scm-by.el)
+        (${cedetdir}/semantic/%-wy.el, ${wisentdir}/%-wy.el)
+        (${wisentdir}/javat-wy.el, ${cedetdir}/srecode/srt-wy.el): Use them.
+
+        Less chatter in batch mode
+        * unidata/unidata-gen.el (unidata-gen-files):
+        Don't output messages like "Generating ..." in batch mode.
+
 2015-01-02  Paul Eggert  <eggert@cs.ucla.edu>
 
         Less 'make' chatter for unidata
diff --git a/admin/grammars/Makefile.in b/admin/grammars/Makefile.in
index b88521f4b47..6b54ecca237 100644
--- a/admin/grammars/Makefile.in
+++ b/admin/grammars/Makefile.in
@@ -28,6 +28,19 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
 
+# 'make' verbosity.
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 =
+
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
+
 # Prevent any settings in the user environment causing problems.
 unexport EMACSDATA EMACSDOC EMACSPATH
 
@@ -68,30 +81,30 @@ wisent: ${WISENT}
 
 ## c-by.el, make-by.el.
 ${bovinedir}/%-by.el: ${srcdir}/%.by
-        [ ! -f "$@" ] || chmod +w "$@"
-        ${make_bovine} -o "$@" $<
+        $(AM_V_GEN)[ ! -f "$@" ] || chmod +w "$@"
+        $(AM_V_at)${make_bovine} -o "$@" $<
 
 ${bovinedir}/scm-by.el: ${srcdir}/scheme.by
-        [ ! -f "$@" ] || chmod +w "$@"
-        ${make_bovine} -o "$@" $<
+        $(AM_V_GEN)[ ! -f "$@" ] || chmod +w "$@"
+        $(AM_V_at)${make_bovine} -o "$@" $<
 
 ## grammar-wy.el
 ${cedetdir}/semantic/%-wy.el: ${srcdir}/%.wy
-        [ ! -f "$@" ] || chmod +w "$@"
-        ${make_wisent} -o "$@" $<
+        $(AM_V_GEN)[ ! -f "$@" ] || chmod +w "$@"
+        $(AM_V_at)${make_wisent} -o "$@" $<
 
 ## js-wy.el, python-wy.el
 ${wisentdir}/%-wy.el: ${srcdir}/%.wy
-        [ ! -f "$@" ] || chmod +w "$@"
-        ${make_wisent} -o "$@" $<
+        $(AM_V_GEN)[ ! -f "$@" ] || chmod +w "$@"
+        $(AM_V_at)${make_wisent} -o "$@" $<
 
 ${wisentdir}/javat-wy.el: ${srcdir}/java-tags.wy
-        [ ! -f "$@" ] || chmod +w "$@"
-        ${make_wisent} -o "$@" $<
+        $(AM_V_GEN)[ ! -f "$@" ] || chmod +w "$@"
+        $(AM_V_at)${make_wisent} -o "$@" $<
 
 ${cedetdir}/srecode/srt-wy.el: ${srcdir}/srecode-template.wy
-        [ ! -f "$@" ] || chmod +w "$@"
-        ${make_wisent} -o "$@" $<
+        $(AM_V_GEN)[ ! -f "$@" ] || chmod +w "$@"
+        $(AM_V_at)${make_wisent} -o "$@" $<
 
 
 .PHONY: distclean bootstrap-clean maintainer-clean extraclean
diff --git a/admin/unidata/unidata-gen.el b/admin/unidata/unidata-gen.el
index ca3bae1070a..8af6fa0dd72 100644
--- a/admin/unidata/unidata-gen.el
+++ b/admin/unidata/unidata-gen.el
@@ -1329,7 +1329,7 @@ Property value is a symbol `o' (Open), `c' (Close), or `n' (None)."
           (insert (format "(define-char-code-property '%S %S\n  %S)\n"
                           prop basename docstring))
           (with-temp-buffer
-            (message "Generating %s..." file)
+            (or noninteractive (message "Generating %s..." file))
             (when (file-exists-p file)
               (insert-file-contents file)
               (goto-char (point-max))
@@ -1356,7 +1356,7 @@ Property value is a symbol `o' (Open), `c' (Close), or `n' (None)."
                         ";; End:\n\n"
                         (format ";; %s ends here\n" basename)))
             (write-file file)
-            (message "Generating %s...done" file))))
+            (or noninteractive (message "Generating %s...done" file)))))
       (message "Writing %s..." charprop-file)
       (insert ";; Local Variables:\n"
               ";; coding: utf-8\n"
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index ce97b4d1e9b..941be3cf582 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+        batch write-region no longer says "Wrote FOO"
+        * files.texi (Writing to Files): Document this.
+
 2014-12-31  Paul Eggert  <eggert@cs.ucla.edu>
 
         Less 'make' chatter for Emacs doc
@@ -14,6 +19,10 @@
         `temp-buffer-resize-mode', `temp-buffer-max-height' and
         `temp-buffer-max-width'.
 
+2014-12-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * os.texi (System Environment): Update for system-name changes.
+
 2014-12-27  Glenn Morris  <rgm@gnu.org>
 
         * control.texi (Pattern matching case statement):
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index 51d13692fe5..c8500d2f412 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -653,8 +653,9 @@ and also calls the functions in the list
 @xref{Format Conversion}.
 
 Normally, @code{write-region} displays the message @samp{Wrote
-@var{filename}} in the echo area.  If @var{visit} is neither @code{t}
-nor @code{nil} nor a string, then this message is inhibited.  This
+@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
 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/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 70c68f0ba0c..5057fb91f0b 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -12,6 +12,16 @@
         (${buildinfodir}/efaq%.info, efaq%.html):
         Use them.
 
+2014-12-31  Filipp Gunbin  <fgunbin@fastmail.fm>
+
+        * info.texi (Create Info buffer): Mention info-display-manual prefix.
+
+2014-12-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * efaq.texi (Displaying the current file name in the titlebar):
+        Prefer (system-name) to system-name.
+        * smtpmail.texi (Server workarounds): Fix grammar.
+
 2014-12-18  Eric Abrahamsen  <eric@ericabrahamsen.net>
 
         * gnus.texi (Gnus Registry Setup): Explain pruning changes. Mention
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 28160449ee6..c72c560ec9c 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+        batch write-region no longer says "Wrote FOO"
+        * NEWS: Document this.
+
 2014-12-30  Paul Eggert  <eggert@cs.ucla.edu>
 
         * PROBLEMS: Omit obsolete mention of FQDNs.
diff --git a/etc/NEWS b/etc/NEWS
index ca63ff17b44..ac42a9ff6dc 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -551,6 +551,9 @@ system's name has changed or if the Emacs process has changed systems,
 and to avoid long waits it no longer consults DNS to canonicalize the
 name.  The variable `system-name' is now obsolete.
 
++++
+** Function `write-region' no longer outputs "Wrote FILE" in batch mode.
+
 ---
 ** New utilities in subr-x.el:
 *** New macros `if-let' and `when-let' allow defining bindings and to
diff --git a/leim/ChangeLog b/leim/ChangeLog
index c8586224ab0..4bda9a64335 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,12 @@
+2015-01-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Less 'make' chatter for leim
+        * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_)
+        (am__v_GEN_0, am__v_GEN_1, AM_V_at, am__v_at_, am__v_at_0)
+        (am__v_at_1): New macros, from src/Makefile.in.
+        (${leimdir}/quail/%.el, misc_convert, ${leimdir}/leim-list.el)
+        (${leimdir}/ja-dic/ja-dic.el): Use them.
+
 2014-12-14  Paul Eggert  <eggert@cs.ucla.edu>
 
         * SKK-DIC/SKK-JISYO.L: Update to version 1.1216.
diff --git a/leim/Makefile.in b/leim/Makefile.in
index 721565ea5bd..573acf7678c 100644
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -29,6 +29,19 @@ srcdir=@srcdir@
 # Where the generated files go.
 leimdir = ${srcdir}/../lisp/leim
 
+# 'make' verbosity.
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 =
+
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
+
 # Prevent any settings in the user environment causing problems.
 unexport EMACSDATA EMACSDOC EMACSPATH
 
@@ -88,11 +101,12 @@ ${leimdir}/quail ${leimdir}/ja-dic:
 
 ## All of TIT_GB and TIT_BIG5.
 ${leimdir}/quail/%.el: ${srcdir}/CXTERM-DIC/%.tit
-        ${RUN_EMACS} -l titdic-cnv \
+        $(AM_V_GEN)${RUN_EMACS} -l titdic-cnv \
           -f batch-titdic-convert -dir ${leimdir}/quail $<
 
 
-misc_convert = ${RUN_EMACS} -l titdic-cnv -f batch-miscdic-convert -dir ${leimdir}/quail
+misc_convert = $(AM_V_GEN)${RUN_EMACS} \
+  -l titdic-cnv -f batch-miscdic-convert -dir ${leimdir}/quail
 
 ## CTLau.el, CTLau-b5.el.
 ${leimdir}/quail/CT%.el: ${srcdir}/MISC-DIC/CT%.html
@@ -114,16 +128,16 @@ ${leimdir}/quail/tsang-%.el ${leimdir}/quail/quick-%.el: ${srcdir}/MISC-DIC/cang
 leim-list.el: ${leimdir}/leim-list.el
 
 ${leimdir}/leim-list.el: ${srcdir}/leim-ext.el ${TIT_MISC}
-        rm -f $@
-        ${RUN_EMACS} -l international/quail \
+        $(AM_V_GEN)rm -f $@
+        $(AM_V_at)${RUN_EMACS} -l international/quail \
           --eval "(update-leim-list-file (unmsys--file-name \"${leimdir}\"))"
-        sed -n -e '/^[^;]/p' -e 's/^;\(;*\)inc /;\1 /p' < $< >> $@
+        $(AM_V_at)sed -n -e '/^[^;]/p' -e 's/^;\(;*\)inc /;\1 /p' < $< >> $@
 
 
 ${leimdir}/ja-dic/ja-dic.el: | $(leimdir)/ja-dic
 
 ${leimdir}/ja-dic/ja-dic.el: $(srcdir)/SKK-DIC/SKK-JISYO.L
-        $(RUN_EMACS) -batch -l ja-dic-cnv \
+        $(AM_V_GEN)$(RUN_EMACS) -batch -l ja-dic-cnv \
           -f batch-skkdic-convert -dir "$(leimdir)/ja-dic" "$<"
 
 
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index eb2b1f3a94c..1795f021027 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Less 'make' chatter for lib-src
+        * Makefile.in (blessmail): Less 'make' chatter here.
+
 2014-12-27  Eli Zaretskii  <eliz@gnu.org>
 
         * Makefile.in (etags_libs, ebrowse${EXEEXT}, profile${EXEEXT})
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 485e2d2eacc..22a5ecad8d8 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -223,8 +223,8 @@ $(EXE_FILES): ../lib/libgnu.a
 ## Only used if we need blessmail, but no harm in always defining.
 ## This makes the actual blessmail executable.
 blessmail: $(srcdir)/../lisp/mail/blessmail.el
-        $(EMACS) $(EMACSOPT) -l $<
-        chmod +x $@
+        $(AM_V_GEN)$(EMACS) $(EMACSOPT) -l $<
+        $(AM_V_at)chmod +x $@
 
 ## This checks if we need to run blessmail.
 ## Do not charge ahead and do it!  Let the installer decide.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9d5416c5cea..aa79a8d4b2e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,51 @@
+2015-01-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Less 'make' chatter for lisp dir
+        * Makefile.in (THEFILE): Define to be 'no-such-file' by default,
+        to make it clearer that the caller must specify it.
+        (compile-onefile): Remove, replacing by ...
+        ($(THEFILE)c): ... new rule.  This lets us use AM_V_GEN here.
+        ($(THEFILE)c, .el.elc, $(MH_E_DIR)/mh-loaddefs.el)
+        ($(TRAMP_DIR)/tramp-loaddefs.el, $(CAL_DIR)/cal-loaddefs.el)
+        ($(CAL_DIR)/diary-loaddefs.el, $(CAL_DIR)/hol-loaddefs.el):
+        Use AM_V_GEN to lessen 'make' chatter.
+        (.el.elc): Omit duplicate comment.
+
+        Less 'make' chatter in batch mode
+        * emacs-lisp/autoload.el (autoload-generate-file-autoloads):
+        * emacs-lisp/bytecomp.el (byte-compile-file):
+        * files.el (save-buffer, basic-save-buffer):
+        * international/quail.el (quail-update-leim-list-file):
+        Don't output messages like "Generating ..." in batch mode.
+
+2015-01-04  Dmitry Gutov  <dgutov@yandex.ru>
+
+        Unbreak `mouse-action' property in text buttons.
+
+        * button.el (push-button): Fix regression from 2012-12-06.
+
+2015-01-03  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * progmodes/xref.el (xref-marker-stack-empty-p): New function.
+
+        * menu-bar.el (menu-bar-goto-menu): Use it.
+
+2015-01-03  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * progmodes/xref.el (xref--window-configuration): New variable.
+        (xref-show-location-at-point): New command.
+        (xref--restore-window-configuration): New function.
+        (xref-next-line, xref-prev-line): Delegate to
+        `xref-show-location-at-point'.
+        (xref--location-at-point): Don't signal the error.
+        (xref-goto-xref): Do that here instead.
+        (xref--xref-buffer-mode): Add `xref--restore-window-configuration'
+        to `pre-command-hook'.
+        (xref--xref-buffer-mode-map): Don't remap `next-line' and
+        `previous-line'.  Additionally bind `xref-next-line' and
+        `xref-prev-line' to `n' and `p' respectively.  Bind
+        `xref-show-location-at-point' to `C-o'.
+
 2015-01-01  Eli Zaretskii  <eliz@gnu.org>
 
         * tool-bar.el (tool-bar-local-item)
@@ -59,6 +107,12 @@
 
         * obsolete/pc-select.el (pc-selection-mode): Use system-type.
         This is instead of system-name, which is both wrong here and obsolete.
+        * desktop.el (desktop-save-frameset):
+        * dnd.el (dnd-get-local-file-uri):
+        * nxml/rng-uri.el (rng-uri-file-name-1):
+        Prefer (system-name) to system-name, and avoid naming
+        locals 'system-name'.
+        * startup.el (system-name): Now an obsolete variable.  (Bug#19438)
 
 2014-12-29  Dmitry Gutov  <dgutov@yandex.ru>
 
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 67855baf9f3..565ca77de3b 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -257,12 +257,10 @@ TAGS: $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3) $(lisptagsfiles4)
 # src/Makefile.in to rebuild a particular Lisp file, no questions asked.
 # Use byte-compile-refresh-preloaded to try and work around some of
 # the most common problems of not bootstrapping from a clean state.
-.PHONY: compile-onefile
-compile-onefile:
-        @echo Compiling $(THEFILE)
-        @# Use byte-compile-refresh-preloaded to try and work around some of
-        @# the most common bootstrapping problems.
-        @$(emacs) $(BYTE_COMPILE_FLAGS) \
+THEFILE = no-such-file
+.PHONY: $(THEFILE)c
+$(THEFILE)c:
+        $(AM_V_GEN)$(emacs) $(BYTE_COMPILE_FLAGS) \
                 -l bytecomp -f byte-compile-refresh-preloaded \
                 -f batch-byte-compile $(THEFILE)
 
@@ -278,12 +276,7 @@ compile-onefile:
 # An old-fashioned suffix rule, which, according to the GNU Make manual,
 # cannot have prerequisites.
 .el.elc:
-        @echo Compiling $<
-        @# The BIG_STACK_OPTS are only needed to byte-compile the byte-compiler
-        @# files, which is normally done in compile-first, but may also be
-        @# recompiled via this rule.
-        @$(emacs) $(BYTE_COMPILE_FLAGS) \
-                -f batch-byte-compile $<
+        $(AM_V_GEN)$(emacs) $(BYTE_COMPILE_FLAGS) -f batch-byte-compile $<
 
 .PHONY: compile-first compile-main compile compile-always
 
@@ -404,7 +397,7 @@ MH_E_SRC = $(MH_E_DIR)/mh-acros.el $(MH_E_DIR)/mh-alias.el    \
 .PHONY: mh-autoloads
 mh-autoloads: $(MH_E_DIR)/mh-loaddefs.el
 $(MH_E_DIR)/mh-loaddefs.el: $(MH_E_SRC)
-        $(emacs) -l autoload \
+        $(AM_V_GEN)$(emacs) -l autoload \
            --eval "(setq generate-autoload-cookie \";;;###mh-autoload\")" \
            --eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \
            -f batch-update-autoloads $(MH_E_DIR)
@@ -421,7 +414,7 @@ TRAMP_SRC = $(TRAMP_DIR)/tramp.el    $(TRAMP_DIR)/tramp-adb.el	\
         $(TRAMP_DIR)/tramp-uu.el     $(TRAMP_DIR)/trampver.el
 
 $(TRAMP_DIR)/tramp-loaddefs.el: $(TRAMP_SRC)
-        $(emacs) -l autoload \
+        $(AM_V_GEN)$(emacs) -l autoload \
            --eval "(setq generate-autoload-cookie \";;;###tramp-autoload\")" \
            --eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \
            -f batch-update-autoloads $(TRAMP_DIR)
@@ -442,19 +435,19 @@ CAL_SRC = $(CAL_DIR)/cal-bahai.el $(CAL_DIR)/cal-china.el  \
         $(CAL_DIR)/solar.el
 
 $(CAL_DIR)/cal-loaddefs.el: $(CAL_SRC)
-        $(emacs) -l autoload \
+        $(AM_V_GEN)$(emacs) -l autoload \
            --eval "(setq generate-autoload-cookie \";;;###cal-autoload\")" \
            --eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \
            -f batch-update-autoloads $(CAL_DIR)
 
 $(CAL_DIR)/diary-loaddefs.el: $(CAL_SRC) $(CAL_DIR)/cal-loaddefs.el
-        $(emacs) -l autoload \
+        $(AM_V_GEN)$(emacs) -l autoload \
            --eval "(setq generate-autoload-cookie \";;;###diary-autoload\")" \
            --eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \
            -f batch-update-autoloads $(CAL_DIR)
 
 $(CAL_DIR)/hol-loaddefs.el: $(CAL_SRC) $(CAL_DIR)/diary-loaddefs.el
-        $(emacs) -l autoload \
+        $(AM_V_GEN)$(emacs) -l autoload \
            --eval "(setq generate-autoload-cookie \";;;###holiday-autoload\")" \
            --eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \
            -f batch-update-autoloads $(CAL_DIR)
diff --git a/lisp/button.el b/lisp/button.el
index 2836b89020a..189a1c23a4d 100644
--- a/lisp/button.el
+++ b/lisp/button.el
@@ -449,7 +449,7 @@ return t."
           (if (posn-string posn)
               ;; mode-line, header-line, or display string event.
               (button-activate (posn-string posn) t)
-            (push-button (posn-point posn)) t)))
+            (push-button (posn-point posn) t))))
     ;; POS is just normal position
     (let ((button (button-at (or pos (point)))))
       (when button
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index e9d13b86c29..073d923a178 100644
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -539,7 +539,7 @@ Return non-nil if and only if FILE adds no autoloads to OUTFILE
                                (autoload-find-file file))
         ;; Obey the no-update-autoloads file local variable.
         (unless no-update-autoloads
-          (message "Generating autoloads for %s..." file)
+          (or noninteractive (message "Generating autoloads for %s..." file))
           (setq load-name
                 (if (stringp generated-autoload-load-name)
                     generated-autoload-load-name
@@ -623,7 +623,8 @@ Return non-nil if and only if FILE adds no autoloads to OUTFILE
                        (nth 5 (file-attributes relfile))))
                     (insert ";;; Generated autoloads from " relfile "\n")))
                 (insert generate-autoload-section-trailer))))
-          (message "Generating autoloads for %s...done" file))
+          (or noninteractive
+              (message "Generating autoloads for %s...done" file)))
         (or visited
             ;; We created this buffer, so we should kill it.
             (kill-buffer (current-buffer))))
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 4c694adfa23..1acd4fe76b2 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1858,7 +1858,7 @@ The value is non-nil if there were no errors, nil if errors."
                 ;; recompiled).  Previously this was accomplished by
                 ;; deleting target-file before writing it.
                 (rename-file tempfile target-file t)
-                (message "Wrote %s" target-file))
+                (or noninteractive (message "Wrote %s" target-file)))
             ;; This is just to give a better error message than write-region
             (signal 'file-error
                     (list "Opening output file"
diff --git a/lisp/files.el b/lisp/files.el
index 22362ca13ca..80b538c3267 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -4663,7 +4663,7 @@ See the subroutine `basic-save-buffer' for more information."
     ;; then Rmail-mbox never displays it due to buffer swapping.  If
     ;; the test is ever re-introduced, be sure to handle saving of
     ;; Rmail files.
-    (if (and modp (buffer-file-name))
+    (if (and modp (buffer-file-name) (not noninteractive))
         (message "Saving file %s..." (buffer-file-name)))
     (basic-save-buffer)
     (and modp (memq arg '(4 64)) (setq buffer-backed-up nil))))
@@ -4805,7 +4805,7 @@ Before and after saving the buffer, this function runs
           ;; Support VC `implicit' locking.
           (vc-after-save)
           (run-hooks 'after-save-hook))
-      (message "(No changes need to be saved)"))))
+      (or noninteractive (message "(No changes need to be saved)")))))
 
 ;; This does the "real job" of writing a buffer into its visited file
 ;; and making a backup file.  This is what is normally done
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 73fe41f01f2..73a0de76a1f 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,10 @@
+2014-12-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * message.el (message-make-fqdn):
+        * nnvirtual.el (nnvirtual-retrieve-headers)
+        (nnvirtual-update-xref-header): Prefer (system-name) to system-name,
+        and avoid naming locals 'system-name'.
+
 2014-12-29  Lars Ingebrigtsen  <larsi@gnus.org>
 
         * mm-decode.el (mm-shr): Bind `shr-width' to `fill-column' so that
diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index f194b93526e..2755fd68bef 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -2985,7 +2985,7 @@ of each directory."
         quail-dirs list-buf pkg-list pos)
     (if (not (file-writable-p leim-list))
         (error "Can't write to file \"%s\"" leim-list))
-    (message "Updating %s ..." leim-list)
+    (or noninteractive (message "Updating %s ..." leim-list))
     (setq list-buf (find-file-noselect leim-list))
 
     ;; At first, clean up the file.
@@ -3077,7 +3077,7 @@ of each directory."
       (let ((coding-system-for-write 'utf-8))
         (save-buffer 0)))
     (kill-buffer list-buf)
-    (message "Updating %s ... done" leim-list)))
+    (or noninteractive (message "Updating %s ... done" leim-list))))
 
 (defun quail-advice (args)
   "Advise users about the characters input by the current Quail package.
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 7d7e4660fb5..67cb3273d23 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -381,6 +381,7 @@
 
     (bindings--define-key menu [xref-pop]
       '(menu-item "Back" xref-pop-marker-stack
+                  :visible (not (xref-marker-stack-empty-p))
                   :help "Back to the position of the last search"))
 
     (bindings--define-key menu [xref-apropos]
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 7b87933935c..081da5db73b 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * org-clock.el (org-clock-save): Prefer (system-name) to system-name.
+
 2014-10-29  Paul Eggert  <eggert@cs.ucla.edu>
 
         Simplify use of current-time and friends.
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index a5ff5ee55ad..7bc6500a8de 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -301,6 +301,10 @@ backward."
       (let ((marker (ring-remove ring)))
         (set-marker marker nil nil)))))
 
+(defun xref-marker-stack-empty-p ()
+  "Return t if the marker stack is empty; nil otherwise."
+  (ring-empty-p xref--marker-ring))
+
 
 (defun xref--goto-location (location)
   "Set buffer and point according to xref-location LOCATION."
@@ -328,6 +332,8 @@ WINDOW controls how the buffer is displayed:
 
 ;; The xref buffer is used to display a set of xrefs.
 
+(defvar-local xref--window-configuration nil)
+
 (defun xref--display-position (pos other-window recenter-arg)
   ;; show the location, but don't hijack focus.
   (with-selected-window (display-buffer (current-buffer) other-window)
@@ -341,46 +347,56 @@ WINDOW controls how the buffer is displayed:
         (xref--display-position (point) t 1))
     (user-error (message (error-message-string err)))))
 
-(defun xref--next-line (backward)
-  (let ((loc (xref--search-property 'xref-location backward)))
+(defun xref-show-location-at-point ()
+  "Display the source of xref at point in the other window, if any."
+  (interactive)
+  (let ((loc (xref--location-at-point)))
     (when loc
-      (save-window-excursion
-        (xref--show-location loc)
-        (sit-for most-positive-fixnum)))))
+      (setq xref--window-configuration (current-window-configuration))
+      (xref--show-location loc))))
+
+(defun xref--restore-window-configuration ()
+  (when xref--window-configuration
+    (set-window-configuration xref--window-configuration)
+    (setq xref--window-configuration nil)))
 
 (defun xref-next-line ()
   "Move to the next xref and display its source in the other window."
   (interactive)
-  (xref--next-line nil))
+  (xref--search-property 'xref-location)
+  (xref-show-location-at-point))
 
 (defun xref-prev-line ()
   "Move to the previous xref and display its source in the other window."
   (interactive)
-  (xref--next-line t))
+  (xref--search-property 'xref-location t)
+  (xref-show-location-at-point))
 
 (defun xref--location-at-point ()
-  (or (get-text-property (point) 'xref-location)
-      (error "No reference at point")))
+  (get-text-property (point) 'xref-location))
 
 (defvar-local xref--window nil)
 
 (defun xref-goto-xref ()
   "Jump to the xref at point and bury the xref buffer."
   (interactive)
-  (let ((loc (xref--location-at-point))
+  (let ((loc (or (xref--location-at-point)
+                 (error "No reference at point")))
         (window xref--window))
     (quit-window)
     (xref--pop-to-location loc window)))
 
 (define-derived-mode xref--xref-buffer-mode fundamental-mode "XREF"
   "Mode for displaying cross-references."
-  (setq buffer-read-only t))
+  (setq buffer-read-only t)
+  (add-hook 'pre-command-hook #'xref--restore-window-configuration nil t))
 
 (let ((map xref--xref-buffer-mode-map))
   (define-key map (kbd "q") #'quit-window)
-  (define-key map [remap next-line] #'xref-next-line)
-  (define-key map [remap previous-line] #'xref-prev-line)
+  (define-key map (kbd "n") #'xref-next-line)
+  (define-key map (kbd "p") #'xref-prev-line)
   (define-key map (kbd "RET") #'xref-goto-xref)
+  (define-key map (kbd "C-o") #'xref-show-location-at-point)
 
   ;; suggested by Johan Claesson "to further reduce finger movement":
   (define-key map (kbd ".") #'xref-next-line)
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index 12b3a0599cf..023804cdfe5 100644
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,3 +1,10 @@
+2015-01-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Less 'make' chatter for lwlib
+        * Makefile.in (AM_V_GEN, am__v_GEN_, am__v_GEN_0, am__v_GEN_1)
+        (AM_V_at, am__v_at_, am__v_at_0, am__v_at_1): New macros.
+        (liblw.a): Use them.
+
 2014-10-20  Glenn Morris  <rgm@gnu.org>
 
         * Merge in all changes up to 24.4 release.
diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in
index 37ffd5521e9..1f332e92939 100644
--- a/lwlib/Makefile.in
+++ b/lwlib/Makefile.in
@@ -59,6 +59,16 @@ am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 am__v_CC_0 = @echo "  CC      " $@;
 am__v_CC_1 =
 
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 =
+
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
+
 DEPDIR = deps
 ## -MMD -MF $(DEPDIR)/$*.d if AUTO_DEPEND; else empty.
 DEPFLAGS = @DEPFLAGS@
@@ -84,9 +94,9 @@ all: liblw.a
         $(AM_V_CC)$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $<
 
 liblw.a: $(OBJS)
-        rm -f $@
-        $(AR) $(ARFLAGS) $@ $(OBJS)
-        $(RANLIB) $@
+        $(AM_V_GEN)rm -f $@
+        $(AM_V_at)$(AR) $(ARFLAGS) $@ $(OBJS)
+        $(AM_V_at)$(RANLIB) $@
 
 globals_h = ../src/globals.h
 $(globals_h):
diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog
index d6a824ba467..52b873a65b0 100644
--- a/oldXMenu/ChangeLog
+++ b/oldXMenu/ChangeLog
@@ -1,3 +1,10 @@
+2015-01-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Less 'make' chatter for oldXMenu
+        * Makefile.in (AM_V_GEN, am__v_GEN_, am__v_GEN_0, am__v_GEN_1)
+        (AM_V_at, am__v_at_, am__v_at_0, am__v_at_1): New macros.
+        (libXMenu11.a): Use them.
+
 2014-10-20  Glenn Morris  <rgm@gnu.org>
 
         * Merge in all changes up to 24.4 release.
diff --git a/oldXMenu/Makefile.in b/oldXMenu/Makefile.in
index cd1cb50655e..ef2a3600a6b 100644
--- a/oldXMenu/Makefile.in
+++ b/oldXMenu/Makefile.in
@@ -101,6 +101,16 @@ am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 am__v_CC_0 = @echo "  CC      " $@;
 am__v_CC_1 =
 
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 =
+
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
+
 DEPDIR = deps
 ## -MMD -MF $(DEPDIR)/$*.d if AUTO_DEPEND; else empty.
 DEPFLAGS = @DEPFLAGS@
@@ -118,9 +128,9 @@ ALL_CFLAGS=$(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \
         $(AM_V_CC)$(CC) -c ${ALL_CFLAGS} $<
 
 libXMenu11.a: $(OBJS) $(EXTRA)
-        $(RM) $@
-        $(AR) $(ARFLAGS) $@ $(OBJS) $(EXTRA)
-        $(RANLIB) $@
+        $(AM_V_GEN)$(RM) $@
+        $(AM_V_at)$(AR) $(ARFLAGS) $@ $(OBJS) $(EXTRA)
+        $(AM_V_at)$(RANLIB) $@
 
 ## Insert either autodeps.mk (if AUTO_DEPEND), else deps.mk.
 @oldxmenu_deps_frag@
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);
     }
 }