Merge from emacs-24; up to 2014-03-21T08:51:02Z!eliz@gnu.org

diff --cc etc/NEWS
Simple merge

diff --cc lisp/ChangeLog
index 61f1737,4839c19..9fc13b3
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,31 -1,51 +1,79 @@@
+ 2014-03-21  Michael Albinus  <michael.albinus@gmx.de>
+ 
+       * net/tramp.el (tramp-methods): Add docstring for `tramp-login-env'
+       and `tramp-copy-env'.
+ 
+       * net/tramp-sh.el (tramp-methods) <sudo>: Add `tramp-login-env'.
+       (tramp-maybe-open-connection): Handle `tramp-login-env'.
+ 
+ 2014-03-21  Glenn Morris  <rgm@gnu.org>
+ 
+       * electric.el (electric-indent-post-self-insert-function): Add doc.
+ 
+ 2014-03-21  Dmitry Gutov  <dgutov@yandex.ru>
+ 
+       * emacs-lisp/package.el (package-compute-transaction):
+       Use `version-list-<=' to compare the requirement version against
+       the version of package already to be installed.  Update the error
+       message.  (Bug#16826)
+ 
+       * progmodes/ruby-mode.el (ruby-smie-rules):
+       Add indentation rule for ` @ '.  (Bug#17050)
+ 
+ 2014-03-21  Juanma Barranquero  <lekktu@gmail.com>
+ 
+       * align.el (align-regexp): Remove superfluous backslash.
+ 
+       * ffap.el (ffap-ftp-default-user, ffap-url-regexp)
+       (ffap-pass-wildcards-to-dired, dired-at-point-require-prefix)
+       (ffap-rfc-path, ffap-ftp-sans-slash-regexp, ffap-menu-regexp):
+       Fix docstring typos.
+       (ffap-next): Use C-u in docstring.
+       (ffap-machine-p, ffap-list-env, ffap-alist, ffap-alist)
+       (ffap-string-at-point-mode-alist, ffap-menu, ffap-menu-ask):
+       Remove superfluous backslashes.
+       (ffap-string-at-point): Reflow docstring.
+ 
+       * server.el (server-host): Reflow docstring.
+       (server-unload-function): Fix docstring typo.
+       (server-eval-at): Remove superfluous backslash.
+ 
+       * skeleton.el (skeleton-insert): Remove superfluous backslash.
+       (skeleton-insert): Doc fix.
+       (skeleton-insert): Reflow docstring.
+ 
+       * term/tty-colors.el (tty-color-alist, tty-modify-color-alist)
+       (tty-color-approximate, tty-color-by-index, tty-color-values)
+       (tty-color-desc): Remove superfluous backslashes.
+ 
 +2014-03-21  Glenn Morris  <rgm@gnu.org>
 +
 +      * cus-start.el (history-length): Bump :version.
 +
 +      * Makefile.in ($(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):
 +      Don't set `make-backup-files'.
 +
 +      * info.el (info--prettify-description): New function,
 +      to give info-finder descriptions consistent case, punctuation.
 +      (Info-finder-find-node): Use it.  Sort packages.
 +      Refer to "description" rather than "commentary".
 +
 +2014-03-21  Juanma Barranquero  <lekktu@gmail.com>
 +
 +      * frameset.el (frameset--print-register): New function.
 +      (frameset-to-register): Use it.
 +
 +2014-03-20  Juanma Barranquero  <lekktu@gmail.com>
 +
 +      * progmodes/hideif.el (hif-string-to-number): New function.
 +      (hif-tokenize): Use it to understand non-decimal floats.
 +
 +      * emacs-lisp/cl-extra.el (cl--map-overlays): Remove obsolete code.
 +
 +      * skeleton.el (skeleton-autowrap): Mark as obsolete.  Doc fix.
 +
  2014-03-20  Stefan Monnier  <monnier@iro.umontreal.ca>
  
        * electric.el (electric-newline-and-maybe-indent): New command.

diff --cc lisp/skeleton.el
Simple merge

diff --cc src/ChangeLog
index c3af549,dbfb143..59e3961
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,30 -1,15 +1,42 @@@
+ 2014-03-21  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+ 
+       Fix regression introduced by patch for Bug#10500.
+       * xterm.c (x_draw_image_relief): Respect Vtool_bar_button_margin.
+       * w32term.c (x_draw_image_relief): Likewise.
+ 
+ 2014-03-21  Martin Rudalics  <rudalics@gmx.at>
+ 
+       * w32fns.c (w32_wnd_proc): For WM_WINDOWPOSCHANGING don't
+       constrain frame size in SW_SHOWMAXIMIZED case so we can truly
+       maximize a frame for odd default fonts.
+ 
 +2014-03-21  Glenn Morris  <rgm@gnu.org>
 +
 +      * minibuf.c (history-length): Increase default from 30 to 100.
 +
 +2014-03-21  Daniel Colascione  <dancol@dancol.org>
 +
 +      * xterm.c (x_bitmap_icon): Stop reading the icon bitmap from disk
 +      every time we switch to minibuffer.
 +
 +      * alloc.c (lisp_align_malloc, allocate_string_data)
 +      (allocate_vectorlike): Allow mmap allocation of lisp objects.
 +      (pointers_fit_in_lispobj_p,mmap_lisp_allowed_p): New functions.
 +
 +2014-03-21  Eli Zaretskii  <eliz@gnu.org>
 +
 +      * w32fns.c (Fw32_shell_execute) [!CYGWIN]: Use ShellExecuteEx, to
 +      support more "verbs".
 +
 +2014-03-21  Daniel Colascione  <dancol@dancol.org>
 +
 +      Always prohibit dumping a dumped Emacs.
 +
 +      * emacs.c (might_dump): New variable.
 +      (Fdump_emacs): Always prohibit dumping of dumped Emacs.
 +      * lisp.h (might_dump): Declare.
 +      * unexcw.c (unexec): Remove now-redundant multiple-dump detection code.
 +
  2014-03-20  Paul Eggert  <eggert@cs.ucla.edu>
  
        * doc.c (store_function_docstring): Fix pointer signedness mismatch.

diff --cc src/w32fns.c
Simple merge

diff --cc src/xterm.c
Simple merge