2 files changed, 5 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7cc7f0b05f1..d09e3a4174d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-09  Leo Liu  <sdl.web@gmail.com>
+
+        * subr.el (read-passwd): Disable show-paren-mode.  (Bug#16091)
+
 2013-12-08  Dmitry Gutov  <dgutov@yandex.ru>
 
         * progmodes/js.el (js-auto-indent-flag): Remove, was unused.
diff --git a/lisp/subr.el b/lisp/subr.el
index 6b1e99f337c..d86469dd158 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2038,6 +2038,7 @@ by doing (clear-string STRING)."
             (setq-local select-active-regions nil)
             (use-local-map read-passwd-map)
             (setq-local inhibit-modification-hooks nil) ;bug#15501.
+            (setq-local show-paren-mode nil)            ;bug#16091.
             (add-hook 'after-change-functions hide-chars-fun nil 'local))
         (unwind-protect
             (let ((enable-recursive-minibuffers t))