2 files changed, 9 insertions, 1 deletions

diff --git a/lisp/electric.el b/lisp/electric.el
index a694665dbbf..8343d8c1b13 100644
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -501,7 +501,8 @@ This requotes when a quoting key is typed."
          (let ((backtick ?\`))
            (if (or (eq last-command-event ?\`)
                    (and (or electric-quote-context-sensitive
-                            electric-quote-replace-double)
+                            (and electric-quote-replace-double
+                                 (eq last-command-event ?\")))
                         (save-excursion
                           (backward-char)
                           (or (bobp) (bolp)
diff --git a/test/lisp/electric-tests.el b/test/lisp/electric-tests.el
index 83e0c678e3b..44bdbc7b8c8 100644
--- a/test/lisp/electric-tests.el
+++ b/test/lisp/electric-tests.el
@@ -735,6 +735,13 @@ baz\"\""
   :bindings '((electric-quote-replace-double . t))
   :test-in-comments nil :test-in-strings nil)
 
+(define-electric-pair-test electric-quote-replace-double-no-context-single
+  " " "-'" :expected-string " ’" :expected-point 3
+  :modes '(text-mode)
+  :fixture-fn #'electric-quote-local-mode
+  :bindings '((electric-quote-replace-double . t))
+  :test-in-comments nil :test-in-strings nil)
+
 ;; Simulate ‘markdown-mode’: it sets both ‘comment-start’ and
 ;; ‘comment-use-syntax’, but derives from ‘text-mode’.
 (define-electric-pair-test electric-quote-markdown-in-text