2 files changed, 11 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fb1eae49dba..15ed6d89943 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 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
         copy-rectangle-as-kill to C-x r w.
 
diff --git a/lisp/electric.el b/lisp/electric.el
index 5f1445577e9..3108a0ed4c0 100644
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -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