Merge from emacs-24; up to 2014-06-11T19:33:14Z!rgm@gnu.org

diff --cc admin/ChangeLog
index 4aacf00,1abbf36..d96368c
--- 1/admin/ChangeLog
--- 2/admin/ChangeLog
+++ b/admin/ChangeLog
@@@ -1,25 -1,9 +1,30 @@@
 -2014-06-24  Eli Zaretskii  <eliz@gnu.org>
++2014-06-26  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * notes/unicode: Some notes about what to do when a new Unicode
+       version is imported.
+ 
 -2014-06-24  Glenn Morris  <rgm@gnu.org>
 +2014-06-26  Glenn Morris  <rgm@gnu.org>
 +
 +      * authors.el: Move here from ../lisp/emacs-lisp.
 +
 +2014-06-25  Glenn Morris  <rgm@gnu.org>
 +
 +      * grammars/Makefile.in (${bovinedir}/c-by.el, ${bovinedir}/make-by.el):
 +      (${wisentdir}/js-wy.el, ${wisentdir}/python-wy.el):
 +      Replace with pattern rules.
 +      (${bovinedir}/scm-by.el, ${wisentdir}/javat-wy.el)
 +      (${cedetdir}/srecode/srt-wy.el): Use $<.
 +
 +      * unidata/Makefile.in (${top_srcdir}/src/macuvs.h): Make and load .elc.
 +      (.el.elc): Replace with pattern rule.
 +      (%.elc): New.
 +      (unidata.txt): Use $<.
 +      (compile): Remove.
 +      (${DSTDIR}/charprop.el): Use order-only prereqs rather than a sub-make.
 +
 +      * unidata/uvs.el (uvs-print-table-ivd): Fix free variable typo.
 +
 +2014-06-21  Glenn Morris  <rgm@gnu.org>
  
        * unidata/BidiMirroring.txt: Update to 7.0.0 (only comment changes).
        * unidata/UnicodeData.txt: Update to 7.0.0.

diff --cc admin/authors.el
Simple merge

diff --cc admin/notes/unicode
Simple merge

diff --cc lisp/ChangeLog
index 2ed99cd,34d057c..cd30ff3
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,73 -1,70 +1,129 @@@
 -2014-06-25  Leo Liu  <sdl.web@gmail.com>
+ 2014-06-26  Glenn Morris  <rgm@gnu.org>
+ 
+       * emacs-lisp/cl-macs.el (help-add-fundoc-usage):
+       Remove outdated declaration.
+ 
+       * emacs-lisp/authors.el (authors-valid-file-names)
+       (authors-renamed-files-alist): Additions.
+ 
 -2014-06-25  Stefan Monnier  <monnier@iro.umontreal.ca>
++2014-06-26  Leo Liu  <sdl.web@gmail.com>
+ 
+       * textmodes/picture.el (picture-set-tab-stops):
+       * ruler-mode.el (ruler-mode-mouse-add-tab-stop)
+       (ruler-mode-ruler): Fix to work with nil tab-stop-list.
+ 
+       * progmodes/asm-mode.el (asm-calculate-indentation): Use
+       indent-next-tab-stop.
+ 
+       * indent.el (indent-accumulate-tab-stops): New function.
+ 
 -2014-06-25  Stephen Berman  <stephen.berman@gmx.net>
++2014-06-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * emacs-lisp/package.el (package-list-unsigned): New var (bug#17625).
+       (package-desc-status): Obey it.
+ 
 -2014-06-25  Stefan Monnier  <monnier@iro.umontreal.ca>
++2014-06-26  Stephen Berman  <stephen.berman@gmx.net>
+ 
+       * calendar/todo-mode.el: Fix two bugs.
+       (todo-insert-item--basic): If user cancels item insertion to
+       another category before setting priority, show original category
+       whether it is in the same or a different file.
+       (todo-set-item-priority): After selecting category, instead of
+       moving point to top, which extends an active region, restore it.
+ 
 -2014-06-24  Juri Linkov  <juri@jurta.org>
++2014-06-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * help-fns.el (describe-function-1): Check file-name is a string before
+       calling help-fns--autoloaded-p (bug#17564).
+ 
 -2014-06-24  Stefan Monnier  <monnier@iro.umontreal.ca>
++2014-06-26  Juri Linkov  <juri@jurta.org>
+ 
+       * desktop.el (desktop-auto-save-enable)
+       (desktop-auto-save-disable): New functions.
+       (desktop-save-mode, desktop-auto-save-timeout): Use them.
+       (desktop-read): Disable the autosave before loading the desktop,
+       and enable afterwards.  (Bug#17351)
+ 
 -2014-06-24  Eli Zaretskii  <eliz@gnu.org>
++2014-06-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       Fix some indentation problem with \; and pipes (bug#17842).
+       * progmodes/sh-script.el (sh-mode-syntax-table): Set syntax of ;|&.
+       (sh-smie--default-forward-token, sh-smie--default-backward-token):
+       New functions.
+       (sh-smie-sh-forward-token, sh-smie-sh-backward-token)
+       (sh-smie-rc-forward-token, sh-smie-rc-backward-token): Use them.
+       (sh-smie-sh-rules): Fix indentation of a pipe at BOL.
+ 
 +2014-06-26  Glenn Morris  <rgm@gnu.org>
  
 -      * international/fontset.el (script-representative-chars):
 -      Add representative characters for scripts added in Unicode 7.0.
 -      (otf-script-alist): Synchronize with the latest registry of OTF
 -      script tags.
 +      * emacs-lisp/find-func.el (find-function-C-source-directory):
 +      Use file-accessible-directory-p.
  
 -      * international/characters.el (char-script-table): Update for
 -      scripts added and codepoint ranges changed in Unicode 7.0.
 +      * ps-samp.el: Make it slightly less awful.
 +      (ps-rmail-mode-hook, ps-gnus-article-prepare-hook, ps-vm-mode-hook):
 +      (ps-gnus-summary-setup, ps-info-mode-hook): Use [print] key.
 +      Only set local values.
 +      (ps-article-subject, ps-article-author): Use standard functions
 +      like mail-fetch-field.
 +      (ps-info-file, ps-info-node): Use match-string.
 +      (ps-jts-ps-setup, ps-jack-setup): Remove, merging into...
 +      (ps-samp-ps-setup): ... new function.
  
 -2014-06-23  Leo Liu  <sdl.web@gmail.com>
 +      * progmodes/idlw-shell.el (idlwave-shell-make-temp-file):
 +      Optimize away code unneeded on any modern Emacs.
 +
 +      * emacs-lisp/authors.el: Move to ../admin.
 +
 +      * emacs-lisp/ert.el (ert-summarize-tests-batch-and-exit): New.
 +
 +2014-06-25  Glenn Morris  <rgm@gnu.org>
 +
 +      * Makefile.in ($(lisp)/progmodes/cc-defs.elc)
 +      ($(lisp)/progmodes/cc-fonts.elc, $(lisp)/progmodes/cc-langs.elc)
 +      ($(lisp)/progmodes/cc-vars.elc): Drop hand-written deps on non-cc
 +      files.  They are not relevant to the original issue (bug#1004),
 +      and cause unnecessary recompilation (bug#2151).
 +
 +2014-06-25  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * play/landmark.el: Use lexical-binding and avoid `intangible'.
 +      (landmark--last-pos): New var.
 +      (landmark--intangible-chars): New const.
 +      (landmark--intangible): New function.
 +      (landmark-mode, landmark-move): Use it.
 +      (landmark-mode): Remove properties.
 +      (landmark-plot-square, landmark-point-square, landmark-goto-xy)
 +      (landmark-cross-qtuple):
 +      Don't worry about `intangible' any more.
 +      (landmark-click, landmark-point-y): Same; and don't assume point-min==1.
 +      (landmark-init-display): Don't set `intangible' and `point-entered'.
 +      (square): Remove.  Inline it instead.
 +      (landmark--distance): Rename from `distance'.
 +      (landmark-calc-distance-of-robot-from): Rename from
 +      calc-distance-of-robot-from.
 +      (landmark-calc-smell-internal): Rename from calc-smell-internal.
 +
 +2014-06-25  Dmitry Antipov  <dmantipov@yandex.ru>
 +
 +      * files.el (dir-locals-find-file, file-relative-name):
 +      * info.el (Info-complete-menu-item):
 +      * minibuffer.el (completion-table-subvert): Prefer string-prefix-p
 +      to compare-strings to avoid out-of-range errors.
 +      * subr.el (string-prefix-p): Adjust to match strict range
 +      checking in compare-strings.
 +
 +2014-06-24  Leonard Randall  <leonard.a.randall@gmail.com>  (tiny change)
 +
 +      * textmodes/reftex-parse.el (reftex-using-biblatex-p): Make search
 +      for comment lines non-greedy and stopping at newlines to fix stack
 +      overflows with large files.
 +
 +2014-06-24  Eli Barzilay  <eli@barzilay.org>
 +
 +      * calculator.el (calculator-last-input): Drop 'ascii-character property
 +      lookup.
 +
 +2014-06-24  Leo Liu  <sdl.web@gmail.com>
  
        * align.el (align-adjust-col-for-rule): Unbreak due to defaulting
        tab-stop-list to nil.  (Bug#16381)

diff --cc lisp/emacs-lisp/cl-macs.el
Simple merge

diff --cc lisp/emacs-lisp/package.el
Simple merge

diff --cc lisp/gnus/ChangeLog
index 68cbe14,993bbbb..7589d15
--- 1/lisp/gnus/ChangeLog
--- 2/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@@ -1,4 -1,8 +1,8 @@@
 -2014-06-22  Andreas Schwab  <schwab@linux-m68k.org>
+ 2014-06-26  Glenn Morris  <rgm@gnu.org>
+ 
+       * mm-util.el (help-function-arglist): Remove outdated declaration.
+ 
 +2014-06-24  Andreas Schwab  <schwab@linux-m68k.org>
  
        * html2text.el (html2text-get-attr): Rewrite to handle spaces in quoted
        attribute values.  (Bug#17834)

diff --cc lisp/gnus/mm-util.el
Simple merge

diff --cc lisp/help-fns.el
Simple merge

diff --cc lisp/progmodes/sh-script.el
Simple merge

diff --cc lisp/ruler-mode.el
Simple merge

diff --cc lisp/url/ChangeLog
index b445ff6,4880bfe..b8e34ea
--- 1/lisp/url/ChangeLog
--- 2/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@@ -1,8 -1,12 +1,16 @@@
 -2014-05-09  Michael Albinus  <michael.albinus@gmx.de>
+ 2014-06-26  Leo Liu  <sdl.web@gmail.com>
+ 
+       * url-http.el (url-http-end-of-headers): Remove duplicate defvar.
+ 
+       * url-handlers.el (url-http-parse-response): Remove unused autoload.
+       (url-insert-file-contents): Condition on url-http-response-status
+       for the HTTP/S specific part.  (Bug#17549)
+ 
 +2014-05-14  Glenn Morris  <rgm@gnu.org>
 +
 +      * url-util.el (url-make-private-file): Use with-file-modes.
 +
 +2014-05-12  Michael Albinus  <michael.albinus@gmx.de>
  
        * url-handlers.el (url-file-handler-load-in-progress): New defvar.
        (url-file-handler): Use it, in order to avoid recursive load.

diff --cc lisp/url/url-handlers.el
Simple merge

diff --cc lisp/url/url-http.el
Simple merge

diff --cc test/ChangeLog
index 01cd55d,3bd41a2..ffa0aae
--- 1/test/ChangeLog
--- 2/test/ChangeLog
+++ b/test/ChangeLog
@@@ -1,35 -1,9 +1,41 @@@
 -2014-06-25  Stefan Monnier  <monnier@iro.umontreal.ca>
++2014-06-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * automated/package-test.el (package-test-update-listing)
+       (package-test-update-archives, package-test-describe-package):
+       Adjust tests according to new package-list-unsigned.
+ 
 +2014-06-26  Glenn Morris  <rgm@gnu.org>
 +
 +      * automated/ert-tests.el (no-byte-compile): Set it.  (Bug#17851)
 +
 +      * automated/eieio-tests.el (no-byte-compile): Set it.  (Bug#17852)
 +
 +      * automated/Makefile.in: Simplify and parallelize.  (Bug#15991)
 +      (XARGS_LIMIT, BYTE_COMPILE_EXTRA_FLAGS)
 +      (setwins, compile-targets, compile-main, compile-clean): Remove.
 +      (GREP_OPTIONS): Unexport.
 +      (.el.elc): Replace with pattern rule.
 +      (%.elc, %.log): New pattern rules.
 +      (ELFILES, LOGFILES): New variables.
 +      (check): Depend on LOGFILES.  Call ert-summarize-tests-batch-and-exit.
 +      (clean, mostlyclean): New rules.
 +      (bootstrap-clean): Simplify.
 +      (bootstrap-clean, distclean): Depend on clean.
 +
 +2014-06-25  Glenn Morris  <rgm@gnu.org>
 +
 +      * automated/flymake-tests.el (flymake-tests--current-face):
 +      Sleep for longer.  Avoid querying.
 +
 +2014-06-25  Dmitry Antipov  <dmantipov@yandex.ru>
 +
 +      * automated/fns-tests.el (fns-tests-compare-string): New test.
 +
 +2014-06-24  Michael Albinus  <michael.albinus@gmx.de>
 +
 +      * automated/tramp-tests.el (tramp-test26-process-file): Extend test
 +      according to Bug#17815.
 +
  2014-06-21  Fabián Ezequiel Gallina  <fgallina@gnu.org>
  
        * automated/python-tests.el (python-util-strip-string-1): New test.

diff --cc test/automated/package-test.el
Simple merge