[elpa] externals/ement 8d55a6375d: Merge: v0.5.2

[ELPA Syncer]

branch: externals/ement
commit 8d55a6375dce7beda8a15e510cff670c588bc29b
Merge: f721fe3fb4 58ea59e80c
Author: Adam Porter <adam@alphapapa.net>
Commit: Adam Porter <adam@alphapapa.net>

    Merge: v0.5.2
---
 README.org | 5 +++++
 ement.el   | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/README.org b/README.org
index e8154b2108..29c3ad3c99 100644
--- a/README.org
+++ b/README.org
@@ -292,6 +292,11 @@ Note that, while ~matrix-client~ remains usable, and 
probably will for some time
 *Changes*
 + Improve ~ement-describe-room~ command (formatting, bindings).
 
+** 0.5.2
+
+*Fixes*
++ Apply ~ement-initial-sync-timeout~ properly (important for when the 
homeserver is slow to respond).
+
 ** 0.5.1
 
 *Fixes*
diff --git a/ement.el b/ement.el
index daa50f8cc5..ab12d38b44 100644
--- a/ement.el
+++ b/ement.el
@@ -257,7 +257,7 @@ the port, e.g.
         (let ((user-id (ement-user-id (ement-session-user session))))
           ;; HACK: If session is already in ement-sessions, this replaces it.  
I think that's okay...
           (setf (alist-get user-id ement-sessions nil nil #'equal) session)
-          (ement--sync session))
+          (ement--sync session :timeout ement-initial-sync-timeout))
       ;; Start password login flow.  Prompt for user ID and password
       ;; if not given (i.e. if not called interactively.)
       (unless user-id
@@ -461,7 +461,7 @@ a filter ID).  When unspecified, the value of
                                          (message "Ement: Sync %s (%s).  
Syncing again..."
                                                   reason (ement-user-id 
(ement-session-user session))))
                                        ;; Set QUIET to allow the just-printed 
message to remain visible.
-                                       (ement--sync session :quiet t)))
+                                       (ement--sync session :timeout timeout 
:quiet t)))
                                     (`(,code . ,message)
                                      (signal 'ement-api-error (list (format 
"Ement: Network error: %s: %s" code message) plz-error)))
                                     (_ (signal 'ement-api-error (list "Ement: 
Unrecognized network error" plz-error)))))