Merge branch master of git.sv.gnu.org:/srv/git/emacs.

diff --cc lisp/ChangeLog
index adcdcd9d0b84ca447c396703c63522257fa81b5e,71889ceffe2fb7e54a27718267aee9ead03a534f..5297877189e8cab441c0e96eb3363ec56e17d279
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,7 -1,103 +1,107 @@@
 +2015-01-07  K. Handa  <handa@gnu.org>
 +
 +      * international/ccl.el (define-ccl-program): Improve the docstring.
 +
+ 2015-01-06  Sam Steingold  <sds@gnu.org>
+ 
+       * shell.el (shell-display-buffer-actions): Remove,
+       use `display-buffer-alist' instead.
+ 
+ 2015-01-05  Dmitry Gutov  <dgutov@yandex.ru>
+ 
+       * progmodes/xref.el (xref--insert-xrefs): Add `help-echo' property
+       to the references.
+ 
+ 2015-01-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * minibuffer.el (completion-category-defaults): New var.
+       Set unicode-name to use substring completion.
+       (completion-category-defaults): Set it to nil.
+ 
+ 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
+       * 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)
+       (tool-bar-local-item-from-menu): Call force-mode-line-update to
+       make sure the tool-bar changes show on display.
+ 
+ 2015-01-01  Michael Albinus  <michael.albinus@gmx.de>
+ 
+       Sync with Tramp 2.2.11.
+ 
+       * net/tramp-compat.el (top): Require cl-macs for Emacs 22.
+       Make an alias for `default-toplevel-value' if it doesn't exist.
+ 
+       * net/tramp-smb.el (tramp-smb-handle-copy-directory):
+       Use `tramp-compat-delete-directory'.
+ 
+       * net/trampver.el: Update release number.
+ 
+ 2015-01-01  Filipp Gunbin  <fgunbin@fastmail.fm>
+ 
+       * autorevert.el (auto-revert-handler): Fix auto-revert-tail-mode
+       for remote files.  (Bug#19449)
+ 
+ 2015-01-01  Simen Heggestøyl  <simenheg@gmail.com>  (tiny change)
+ 
+       * textmodes/css-mode.el (scss-mode): Fix typo (bug#19446).
+ 
  2014-12-31  Paul Eggert  <eggert@cs.ucla.edu>
  
        Less 'make' chatter in lisp directory

diff --cc lisp/international/ccl.el
Simple merge