aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo Liu2013-12-09 10:38:42 +0800
committerLeo Liu2013-12-09 10:38:42 +0800
commitd64643b40f1837c27cc1b44b9155ab20a1d9d016 (patch)
treecba1f0ab1c4c98bb237f08ac091a0889c3d0b37d
parent1b9b6fbb5cfa6d6cf3401a6cc08e47cd6e83a41a (diff)
downloademacs-d64643b40f1837c27cc1b44b9155ab20a1d9d016.tar.gz
emacs-d64643b40f1837c27cc1b44b9155ab20a1d9d016.zip
* subr.el (read-passwd): Disable show-paren-mode.
Fixes: debbugs:16091
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/subr.el1
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 @@
12013-12-09 Leo Liu <sdl.web@gmail.com>
2
3 * subr.el (read-passwd): Disable show-paren-mode. (Bug#16091)
4
12013-12-08 Dmitry Gutov <dgutov@yandex.ru> 52013-12-08 Dmitry Gutov <dgutov@yandex.ru>
2 6
3 * progmodes/js.el (js-auto-indent-flag): Remove, was unused. 7 * 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)."
2038 (setq-local select-active-regions nil) 2038 (setq-local select-active-regions nil)
2039 (use-local-map read-passwd-map) 2039 (use-local-map read-passwd-map)
2040 (setq-local inhibit-modification-hooks nil) ;bug#15501. 2040 (setq-local inhibit-modification-hooks nil) ;bug#15501.
2041 (setq-local show-paren-mode nil) ;bug#16091.
2041 (add-hook 'after-change-functions hide-chars-fun nil 'local)) 2042 (add-hook 'after-change-functions hide-chars-fun nil 'local))
2042 (unwind-protect 2043 (unwind-protect
2043 (let ((enable-recursive-minibuffers t)) 2044 (let ((enable-recursive-minibuffers t))