Commit b5cf7fc4 authored by Chong Yidong's avatar Chong Yidong
Browse files

Fix electric-pair-mode/delete-selection-mode interaction.

* lisp/electric.el (electric-pair-post-self-insert-function): Fix pair
insertion in empty-region case.

Fixes: debbugs:11520
parent 22e983b7
2012-07-14 Chong Yidong <cyd@gnu.org>
* electric.el (electric-pair-post-self-insert-function): Fix pair
insertion in empty-region case (Bug#11520).
2012-07-14 Chong Yidong <cyd@gnu.org>
 
* bindings.el: Consolidate ctl-x-r-map bindings. Bind
......
......@@ -322,12 +322,13 @@ This can be convenient for people who find it easier to hit ) than C-f."
((and (memq syntax '(?\( ?\" ?\$)) (use-region-p))
(if (> (mark) (point))
(goto-char (mark))
;; We already inserted the open-paren but at the end of the region,
;; so we have to remove it and start over.
(delete-char -1)
(save-excursion
;; We already inserted the open-paren but at the end of the
;; region, so we have to remove it and start over.
(delete-char -1)
(save-excursion
(goto-char (mark))
(insert last-command-event)))
;; Do not insert after `save-excursion' marker (Bug#11520).
(insert-before-markers last-command-event)))
(insert closer))
;; Backslash-escaped: no pairing, no skipping.
((save-excursion
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment