[Emacs-diffs] xwidget bdd672b 3/5: Merge branch 'master' into xwidget

[Joakim Verona]

branch: xwidget
commit bdd672b275034e8c1c65992f2e21dac7cc6eba60
Merge: 5693f3d 2f908e0
Author: Joakim Verona <address@hidden>
Commit: Joakim Verona <address@hidden>

    Merge branch 'master' into xwidget
---
 src/ChangeLog                  |    4 ++++
 src/xdisp.c                    |    2 ++
 test/ChangeLog                 |   11 ++++++-----
 test/automated/package-test.el |   17 +++++++++++++++++
 4 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index a98c77f..a8b9c3b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-22  Eli Zaretskii  <address@hidden>
+
+       * xdisp.c (init_iterator): Restore a comment lost in transition.
+
 2015-01-22  Paul Eggert  <address@hidden>
 
        Use bool for boolean in xfont.c, xftfont.c, xgselect.c
diff --git a/src/xdisp.c b/src/xdisp.c
index 280be6b..aec6741 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -2752,6 +2752,8 @@ init_iterator (struct it *it, struct window *w,
        row = MATRIX_HEADER_LINE_ROW (w->desired_matrix);
     }
 
+  /* Clear IT, and set it->object and other IT's Lisp objects to Qnil.
+     Other parts of redisplay rely on that.  */
   memclear (it, sizeof *it);
   it->current.overlay_string_index = -1;
   it->current.dpvec_index = -1;
diff --git a/test/ChangeLog b/test/ChangeLog
index d63a561..af36b5d 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,13 +1,14 @@
+2015-01-20  Jorgen Schaefer  <address@hidden>
+
+       * automated/package-test.el (package-test-install-prioritized):
+       Re-add the test case and add priority to the correct repository
+       this time around.
+
 2015-01-21  Stefan Monnier  <address@hidden>
 
        * automated/cl-generic-tests.el (setf cl--generic-2): Make sure
        the setf can be used already in the body of the method.
 
-2015-01-20  Jorgen Schaefer  <address@hidden>
-
-       * automated/package-test.el (package-test-install-prioritized):
-       Remove test due to unreproducable failures.
-
 2015-01-20  Michal Nazarewicz  <address@hidden>
 
        * automated/descr-text-test.el: New file with tests for
diff --git a/test/automated/package-test.el b/test/automated/package-test.el
index 27a71c5..3ea13de 100644
--- a/test/automated/package-test.el
+++ b/test/automated/package-test.el
@@ -230,6 +230,23 @@ Must called from within a `tar-mode' buffer."
     (package-refresh-contents)
     (package-install 'simple-single)))
 
+(ert-deftest package-test-install-prioritized ()
+  "Install a lower version from a higher-prioritized archive."
+  (with-package-test ()
+    (let* ((newer-version (expand-file-name "data/package/newer-versions"
+                                            package-test-file-dir))
+           (package-archives `(("older" . ,package-test-data-dir)
+                               ("newer" . ,newer-version)))
+           (package-archive-priorities '(("older" . 100))))
+
+      (package-initialize)
+      (package-refresh-contents)
+      (package-install 'simple-single)
+
+      (let ((installed (cadr (assq 'simple-single package-alist))))
+        (should (version-list-= '(1 3)
+                                (package-desc-version installed)))))))
+
 (ert-deftest package-test-install-multifile ()
   "Check properties of the installed multi-file package."
   (with-package-test (:basedir "data/package" :install '(multi-file))