aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorTom Willemse2015-03-28 14:43:33 +0000
committerJoão Távora2015-03-28 15:16:13 +0000
commit40b3dcd2c06e30048be0bdc32861148a53660c90 (patch)
treeb3e8786fe490020562b306d42b193d8921e2127d /lisp
parentbe5e9348dc137d06655676e686f153cf33de4f28 (diff)
downloademacs-40b3dcd2c06e30048be0bdc32861148a53660c90.tar.gz
emacs-40b3dcd2c06e30048be0bdc32861148a53660c90.zip
New `electric-pair-local-mode'
Fixes: big#19528 * lisp/elec-pair.el (electric-pair-local-mode): New command. (electric-pair-mode): Mention `electric-pair-local-mode' in the docstring.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/elec-pair.el16
2 files changed, 21 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 488abb1b39b..40a57902d1d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12015-03-28 Tom Willemse <tom@ryuslash.org>
2
3 * elec-pair.el (electric-pair-local-mode): New command.
4 (electric-pair-mode): Mention `electric-pair-local-mode' in the
5 docstring.
6
12015-03-28 Jan Djärv <jan.h.d@swipnet.se> 72015-03-28 Jan Djärv <jan.h.d@swipnet.se>
2 8
3 * emacs-lisp/package.el (package-refresh-contents): Add a message at 9 * emacs-lisp/package.el (package-refresh-contents): Add a message at
diff --git a/lisp/elec-pair.el b/lisp/elec-pair.el
index 2cede62ab4f..562b29467c1 100644
--- a/lisp/elec-pair.el
+++ b/lisp/elec-pair.el
@@ -557,7 +557,8 @@ the mode if ARG is omitted or nil.
557 557
558Electric Pair mode is a global minor mode. When enabled, typing 558Electric Pair mode is a global minor mode. When enabled, typing
559an open parenthesis automatically inserts the corresponding 559an open parenthesis automatically inserts the corresponding
560closing parenthesis. (Likewise for brackets, etc.)." 560closing parenthesis. (Likewise for brackets, etc.). To toggle
561the mode in a single buffer, use `electric-pair-local-mode'."
561 :global t :group 'electricity 562 :global t :group 'electricity
562 (if electric-pair-mode 563 (if electric-pair-mode
563 (progn 564 (progn
@@ -571,6 +572,19 @@ closing parenthesis. (Likewise for brackets, etc.)."
571 (remove-hook 'self-insert-uses-region-functions 572 (remove-hook 'self-insert-uses-region-functions
572 #'electric-pair-will-use-region))) 573 #'electric-pair-will-use-region)))
573 574
575;;;###autoload
576(define-minor-mode electric-pair-local-mode
577 "Toggle `electric-pair-mode' only in this buffer."
578 :variable (buffer-local-value 'electric-pair-mode (current-buffer))
579 (cond
580 ((eq electric-pair-mode (default-value 'electric-pair-mode))
581 (kill-local-variable 'electric-pair-mode))
582 ((not (default-value 'electric-pair-mode))
583 ;; Locally enabled, but globally disabled.
584 (electric-pair-mode 1) ; Setup the hooks.
585 (setq-default electric-pair-mode nil) ; But keep it globally disabled.
586 )))
587
574(provide 'elec-pair) 588(provide 'elec-pair)
575 589
576;;; elec-pair.el ends here 590;;; elec-pair.el ends here