[elpa] externals/plz c181fd1565 10/40: Tidy: Error handling in THEN function

[ELPA Syncer]

branch: externals/plz
commit c181fd1565726f755f47e9f285949ed9d060d39a
Author: Adam Porter <adam@alphapapa.net>
Commit: Adam Porter <adam@alphapapa.net>

    Tidy: Error handling in THEN function
---
 plz.el | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/plz.el b/plz.el
index c0cb93a3d7..639b5ea9a4 100644
--- a/plz.el
+++ b/plz.el
@@ -444,44 +444,43 @@ NOQUERY is passed to `make-process', which see."
                          (plz--narrow-to-body)
                          (when decode
                            (decode-coding-region (point) (point-max) 
coding-system))
-                         (let ((string (buffer-string)))
-                           (unless string
-                             (error "STRING IS NIL?!  STRING:%S" string))
-                           (funcall then string)))))
+                         (funcall then (or (buffer-string)
+                                           (make-plz-error :message (format 
"buffer-string is nil in buffer:%S" process-buffer)))))))
                     ('buffer (lambda ()
                                (funcall then (current-buffer))))
                     ('response (lambda ()
-                                 (let ((response (plz--response :decode-p 
decode)))
-                                   (unless response
-                                     (error "RESPONSE IS NIL?!  
BUFFER-CONTENTS:%S" (buffer-string)))
-                                   (funcall then response))))
+                                 (funcall then (or (plz--response :decode-p 
decode)
+                                                   (make-plz-error :message 
(format "response is nil for buffer:%S  buffer-string:%S"
+                                                                               
     process-buffer (buffer-string)))))))
                     ('file (lambda ()
                              (set-buffer-multibyte nil)
                              (plz--narrow-to-body)
                              (let ((filename (make-temp-file "plz-")))
                                (condition-case err
-                                   (write-region (point-min) (point-max) 
filename)
+                                   (progn
+                                     (write-region (point-min) (point-max) 
filename)
+                                     (funcall then filename))
                                  ;; In case of an error writing to the file, 
delete the temp file
                                  ;; and signal the error.  Ignore any errors 
encountered while
                                  ;; deleting the file, which would obscure the 
original error.
                                  (error (ignore-errors
                                           (delete-file filename))
-                                        (signal (car err) (cdr err))))
-                               (funcall then filename))))
+                                        (funcall then (make-plz-error :message 
(format "error while writing to file %S: %S" filename err))))))))
                     (`(file ,(and (pred stringp) filename))
                      (lambda ()
                        (set-buffer-multibyte nil)
                        (plz--narrow-to-body)
                        (condition-case err
-                           (write-region (point-min) (point-max) filename nil 
nil nil 'excl)
+                           (progn
+                             (write-region (point-min) (point-max) filename 
nil nil nil 'excl)
+                             (funcall then filename))
                          ;; Since we are creating the file, it seems sensible 
to delete it in case of an
                          ;; error while writing to it (e.g. a disk-full 
error).  And we ignore any errors
                          ;; encountered while deleting the file, which would 
obscure the original error.
                          (error (ignore-errors
                                   (when (file-exists-p filename)
                                     (delete-file filename)))
-                                (signal (car err) (cdr err))))
-                       (funcall then filename)))
+                                (funcall then (make-plz-error :message (format 
"error while writing to file %S: %S" filename err)))))))
                     ((pred functionp) (lambda ()
                                         (let ((coding-system (or 
(plz--coding-system) 'utf-8)))
                                           (plz--narrow-to-body)