svn commit: r1735825 - /subversion/branches/1.9.x/subversion/libsvn_subr/prompt.c

[danielsh]

Author: danielsh
Date: Sat Mar 19 22:16:21 2016
New Revision: 1735825

URL: http://svn.apache.org/viewvc?rev=1735825&view=rev
Log:
Revert r1735680, which was intended for trunk.

Modified:
    subversion/branches/1.9.x/subversion/libsvn_subr/prompt.c

Modified: subversion/branches/1.9.x/subversion/libsvn_subr/prompt.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/libsvn_subr/prompt.c?rev=1735825&r1=1735824&r2=1735825&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/libsvn_subr/prompt.c (original)
+++ subversion/branches/1.9.x/subversion/libsvn_subr/prompt.c Sat Mar 19 
22:16:21 2016
@@ -831,8 +831,9 @@ plaintext_prompt_helper(svn_boolean_t *m
         {
           if (err->apr_err == SVN_ERR_CANCELLED)
             {
+              svn_error_clear(err);
               *may_save_plaintext = FALSE;
-              return err;
+              return SVN_NO_ERROR;
             }
           else
             return err;