From: Noam Postavsky <npostavs@gmail.com>
Date: Sun, 4 Jun 2017 03:41:53 +0000 (-0400)
Subject: * lisp/subr.el (read-passwd): Don't delete return value (Bug#22027).
X-Git-Tag: emacs-26.0.90~521^2~162
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=882f81fdb4ffba773af775d6d6f8920f23163e72;p=emacs.git

* lisp/subr.el (read-passwd): Don't delete return value (Bug#22027).
---

diff --git a/lisp/subr.el b/lisp/subr.el
index 0dce02de8ba..ef00286b341 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2268,7 +2268,7 @@ by doing (clear-string STRING)."
                 (second (read-passwd "Confirm password: " nil default)))
             (if (equal first second)
                 (progn
-                  (and (arrayp second) (clear-string second))
+                  (and (arrayp second) (not (eq first second)) (clear-string second))
                   (setq success first))
               (and (arrayp first) (clear-string first))
               (and (arrayp second) (clear-string second))