Merge branch 'trunk' into xwidget

Conflicts:
	src/xdisp.c

1 files changed, 99 insertions, 1 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index 9ccb1f4bc89..d69155a27ff 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,101 @@
+2013-07-13  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+
+        * automated/python-tests.el (python-imenu-create-index-2)
+        (python-imenu-create-index-3): New tests.
+
+2013-07-11  Glenn Morris  <rgm@gnu.org>
+
+        * automated/ert-tests.el: Require cl-lib at runtime too.
+        (ert-test-special-operator-p): Use cl-gensym rather than ert-- version.
+        (ert-test-remprop, ert-test-remove-if-not, ert-test-remove*)
+        (ert-test-set-functions, ert-test-gensym)
+        (ert-test-coerce-to-vector, ert-test-string-position)
+        (ert-test-mismatch): Remove tests.
+        * automated/cl-lib.el: New, split from ert-tests.el.
+
+        * automated/ruby-mode-tests.el (ruby-deftest-move-to-block):
+        Goto point-min.
+        (works-on-do, zero-is-noop, ok-with-three, ok-with-minus-two)
+        (ruby-move-to-block-skips-percent-literal)
+        (ruby-move-to-block-skips-heredoc)
+        (ruby-move-to-block-moves-from-else-to-if)
+        (ruby-beginning-of-defun-does-not-fold-case)
+        (ruby-end-of-defun-skips-to-next-line-after-the-method):
+        Replace goto-line with forward-line/goto-char.
+        (ruby-move-to-block-does-not-fold-case): Remove unneeded end-of-buffer.
+
+        * automated/package-test.el (makeinfo-buffer): Autoload.
+        (compilation-in-progress, tar-parse-info, tar-header-name): Declare.
+        (package-test-install-texinfo): Don't require makeinfo.
+
+        * automated/files.el: Stop "local variables" confusion.
+
+        * automated/flymake-tests.el (flymake-tests): Remove unused group.
+
+        * automated/icalendar-tests.el (icalendar-tests--do-test-cycle):
+        Use with-current-buffer.
+
+        * automated/undo-tests.el (undo-test-buffer-modified)
+        (undo-test-file-modified): New tests.
+
+2013-07-09  Michael Albinus  <michael.albinus@gmx.de>
+
+        * automated/file-notify-tests.el (file-notify-test00-availability):
+        Set :expected-result.
+        (file-notify-test01-add-watch, file-notify-test01-add-watch-remote)
+        (file-notify-test02-events, file-notify-test02-events-remote)
+        (file-notify-test03-autorevert, file-notify-test03-autorevert-remote):
+        Skip when `file-notify-support' is nil.  (Bug#14823)
+
+2013-07-09  Glenn Morris  <rgm@gnu.org>
+
+        * automated/inotify-test.el (inotify-add-watch, inotify-rm-watch):
+        Declare.
+        (inotify-file-watch-simple): Silence compiler.
+
+        * automated/python-tests.el (python-indent-block-enders):
+        Make it actually test something.
+
+        * automated/package-x-test.el: Require package-test when compiling.
+
+        * automated/add-log-tests.el, automated/advice-tests.el:
+        * automated/imenu-test.el, automated/package-x-test.el:
+        * automated/python-tests.el, automated/ruby-mode-tests.el:
+        * automated/xml-parse-tests.el: Explictly require ert.
+
+2013-07-08  Kenichi Handa  <handa@gnu.org>
+
+        * automated/decoder-tests.el (decoder-tests-prefer-utf-8-read):
+        Use with-ccoding-priority to avoid side-effect (Bug#14781).
+
+2013-07-05  Michael Albinus  <michael.albinus@gmx.de>
+
+        * automated/file-notify-tests.el
+        (file-notify-test-remote-temporary-file-directory): Use
+        `null-device' on w32.
+        (file-notify--test-tmpfile, file-notify--test-tmpfile1)
+        (file-notify--test-results, file-notify--test-event)
+        (file-notify--deftest-remote, file-notify--event-test)
+        (file-notify--test-event-handler)
+        (file-notify--test-make-temp-name): Renamed, in order to mark them
+        internal.
+        (tramp-message-show-message, tramp-read-passwd): Tweak them for
+        better fitting in noninteractive tests.
+        (file-notify-test00-availability): Renamed from `file-notify-test0'.
+        (file-notify-test01-add-watch): Renamed from `file-notify-test1'.
+        Use `temporary-file-directory '.
+        (file-notify-test01-add-watch-remote): New test.
+        (file-notify-test02-events): Renamed from `file-notify-test2'.
+        (file-notify-test02-events-remote): Renamed from `file-notify-test3'.
+        (file-notify-test03-autorevert): Renamed from
+        `file-notify-test4'.  Use timeouts.
+        (file-notify-test03-autorevert-remote): Renamed from
+        `file-notify-test5'.
+
+2013-07-04  Michael Albinus  <michael.albinus@gmx.de>
+
+        * automated/file-notify-tests.el: New package.
+
 2013-06-28  Kenichi Handa  <handa@gnu.org>
 
         * automated/decoder-tests.el (decoder-tests-gen-file): New arg FILE.
@@ -43,7 +141,7 @@
         Use it to create separate tests for each element, so we run them
         all rather than stopping at the first error.
 
-2013-06-24  Glenn Morris  <rgm@fencepost.gnu.org>
+2013-06-24  Glenn Morris  <rgm@gnu.org>
 
         * automated/occur-tests.el (occur-tests):
         Update for 2013-05-29 change to occur header line.