[elpa] externals/plz 7d194533a2 1/2: Merge: v0.7.2

[ELPA Syncer]

branch: externals/plz
commit 7d194533a23654e757257f904def88f4b957cec8
Merge: e50ccf2c16 e98989a181
Author: Adam Porter <adam@alphapapa.net>
Commit: Adam Porter <adam@alphapapa.net>

    Merge: v0.7.2
---
 README.org |   5 ++++
 plz.el     |   4 +++
 plz.info   | 100 +++++++++++++++++++++++++++++++++++--------------------------
 3 files changed, 66 insertions(+), 43 deletions(-)

diff --git a/README.org b/README.org
index 7ebcb3a0a4..f5d855bc1c 100644
--- a/README.org
+++ b/README.org
@@ -183,6 +183,11 @@ You may also clear a queue with ~plz-clear~, which cancels 
any active or queued
 
 Nothing new yet.
 
+** 0.7.2
+
+*Fixes*
++ Don't delete preexisting files when downloading to a file.  
([[https://github.com/alphapapa/plz.el/pull/41][#41]]. Thanks to 
[[https://github.com/josephmturner][Joseph Turner]].)
+
 ** 0.7.1
 
 *Fixes*
diff --git a/plz.el b/plz.el
index 56faf9f84e..51b9bb0dd6 100644
--- a/plz.el
+++ b/plz.el
@@ -449,6 +449,8 @@ NOQUERY is passed to `make-process', which see.
                       (progn
                         (write-region (point-min) (point-max) filename)
                         (funcall then filename))
+                    (file-already-exists
+                     (funcall then (make-plz-error :message (format "error 
while writing to file %S: %S" filename err))))
                     ;; 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.
@@ -463,6 +465,8 @@ NOQUERY is passed to `make-process', which see.
               (progn
                 (write-region (point-min) (point-max) filename nil nil nil 
'excl)
                 (funcall then filename))
+            (file-already-exists
+             (funcall then (make-plz-error :message (format "error while 
writing to file %S: %S" filename err))))
             ;; 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.
diff --git a/plz.info b/plz.info
index acfdbf1a8c..7b6410e6e4 100644
--- a/plz.info
+++ b/plz.info
@@ -47,6 +47,7 @@ Usage
 Changelog
 
 * 0.8-pre: 08-pre.
+* 0.7.2: 072.
 * 0.7.1: 071.
 * 0.7: 07.
 * 0.6: 06.
@@ -295,6 +296,7 @@ File: README.info,  Node: Changelog,  Next: Credits,  Prev: 
Usage,  Up: Top
 * Menu:
 
 * 0.8-pre: 08-pre.
+* 0.7.2: 072.
 * 0.7.1: 071.
 * 0.7: 07.
 * 0.6: 06.
@@ -310,7 +312,7 @@ File: README.info,  Node: Changelog,  Next: Credits,  Prev: 
Usage,  Up: Top
 * 0.1: 01.
 
 
-File: README.info,  Node: 08-pre,  Next: 071,  Up: Changelog
+File: README.info,  Node: 08-pre,  Next: 072,  Up: Changelog
 
 3.1 0.8-pre
 ===========
@@ -318,9 +320,20 @@ File: README.info,  Node: 08-pre,  Next: 071,  Up: 
Changelog
 Nothing new yet.
 
 
-File: README.info,  Node: 071,  Next: 07,  Prev: 08-pre,  Up: Changelog
+File: README.info,  Node: 072,  Next: 071,  Prev: 08-pre,  Up: Changelog
 
-3.2 0.7.1
+3.2 0.7.2
+=========
+
+*Fixes*
+   • Don’t delete preexisting files when downloading to a file.  (#41
+     (https://github.com/alphapapa/plz.el/pull/41).  Thanks to Joseph
+     Turner (https://github.com/josephmturner).)
+
+
+File: README.info,  Node: 071,  Next: 07,  Prev: 072,  Up: Changelog
+
+3.3 0.7.1
 =========
 
 *Fixes*
@@ -330,7 +343,7 @@ File: README.info,  Node: 071,  Next: 07,  Prev: 08-pre,  
Up: Changelog
 
 File: README.info,  Node: 07,  Next: 06,  Prev: 071,  Up: Changelog
 
-3.3 0.7
+3.4 0.7
 =======
 
 *Changes*
@@ -373,7 +386,7 @@ File: README.info,  Node: 07,  Next: 06,  Prev: 071,  Up: 
Changelog
 
 File: README.info,  Node: 06,  Next: 054,  Prev: 07,  Up: Changelog
 
-3.4 0.6
+3.5 0.6
 =======
 
 *Additions*
@@ -391,7 +404,7 @@ File: README.info,  Node: 06,  Next: 054,  Prev: 07,  Up: 
Changelog
 
 File: README.info,  Node: 054,  Next: 053,  Prev: 06,  Up: Changelog
 
-3.5 0.5.4
+3.6 0.5.4
 =========
 
 *Fixes*
@@ -401,7 +414,7 @@ File: README.info,  Node: 054,  Next: 053,  Prev: 06,  Up: 
Changelog
 
 File: README.info,  Node: 053,  Next: 052,  Prev: 054,  Up: Changelog
 
-3.6 0.5.3
+3.7 0.5.3
 =========
 
 *Fixes*
@@ -412,7 +425,7 @@ File: README.info,  Node: 053,  Next: 052,  Prev: 054,  Up: 
Changelog
 
 File: README.info,  Node: 052,  Next: 051,  Prev: 053,  Up: Changelog
 
-3.7 0.5.2
+3.8 0.5.2
 =========
 
 *Fixes*
@@ -422,7 +435,7 @@ File: README.info,  Node: 052,  Next: 051,  Prev: 053,  Up: 
Changelog
 
 File: README.info,  Node: 051,  Next: 05,  Prev: 052,  Up: Changelog
 
-3.8 0.5.1
+3.9 0.5.1
 =========
 
 *Fixes*
@@ -432,8 +445,8 @@ File: README.info,  Node: 051,  Next: 05,  Prev: 052,  Up: 
Changelog
 
 File: README.info,  Node: 05,  Next: 04,  Prev: 051,  Up: Changelog
 
-3.9 0.5
-=======
+3.10 0.5
+========
 
 *Additions*
    • Struct ‘plz-queue’’s ‘finally’ slot, a function called when the
@@ -442,7 +455,7 @@ File: README.info,  Node: 05,  Next: 04,  Prev: 051,  Up: 
Changelog
 
 File: README.info,  Node: 04,  Next: 03,  Prev: 05,  Up: Changelog
 
-3.10 0.4
+3.11 0.4
 ========
 
 *Additions*
@@ -469,7 +482,7 @@ File: README.info,  Node: 04,  Next: 03,  Prev: 05,  Up: 
Changelog
 
 File: README.info,  Node: 03,  Next: 021,  Prev: 04,  Up: Changelog
 
-3.11 0.3
+3.12 0.3
 ========
 
 *Additions*
@@ -485,7 +498,7 @@ File: README.info,  Node: 03,  Next: 021,  Prev: 04,  Up: 
Changelog
 
 File: README.info,  Node: 021,  Next: 02,  Prev: 03,  Up: Changelog
 
-3.12 0.2.1
+3.13 0.2.1
 ==========
 
 *Fixes*
@@ -494,7 +507,7 @@ File: README.info,  Node: 021,  Next: 02,  Prev: 03,  Up: 
Changelog
 
 File: README.info,  Node: 02,  Next: 01,  Prev: 021,  Up: Changelog
 
-3.13 0.2
+3.14 0.2
 ========
 
 *Added*
@@ -503,7 +516,7 @@ File: README.info,  Node: 02,  Next: 01,  Prev: 021,  Up: 
Changelog
 
 File: README.info,  Node: 01,  Prev: 02,  Up: Changelog
 
-3.14 0.1
+3.15 0.1
 ========
 
 Initial release.
@@ -563,33 +576,34 @@ GPLv3
 
 Tag Table:
 Node: Top199
-Node: Installation1213
-Node: GNU ELPA1356
-Node: Manual1602
-Node: Usage1908
-Node: Examples2409
-Node: Functions3776
-Node: Queueing7473
-Node: Tips8856
-Node: Changelog9157
-Node: 08-pre9451
-Node: 0719558
-Node: 079774
-Node: 0611662
-Node: 05412273
-Node: 05312516
-Node: 05212832
-Node: 05113039
-Node: 0513291
-Node: 0413497
-Node: 0314405
-Node: 02114855
-Node: 0215006
-Node: 0115137
-Node: Credits15233
-Node: Development15599
-Node: Copyright assignment16113
-Node: License16701
+Node: Installation1227
+Node: GNU ELPA1370
+Node: Manual1616
+Node: Usage1922
+Node: Examples2423
+Node: Functions3790
+Node: Queueing7487
+Node: Tips8870
+Node: Changelog9171
+Node: 08-pre9479
+Node: 0729586
+Node: 0719885
+Node: 0710098
+Node: 0611986
+Node: 05412597
+Node: 05312840
+Node: 05213156
+Node: 05113363
+Node: 0513615
+Node: 0413823
+Node: 0314731
+Node: 02115181
+Node: 0215332
+Node: 0115463
+Node: Credits15559
+Node: Development15925
+Node: Copyright assignment16439
+Node: License17027
 
 End Tag Table