In with-temp-buffer-window don't evaluate BODY within with-current-buffer (Bug#16816).

[bpt/emacs.git] / lisp / elec-pair.el

diff --git a/lisp/elec-pair.el b/lisp/elec-pair.el
index bf02e5f..8562801 100644 (file)
--- a/lisp/elec-pair.el
+++ b/lisp/elec-pair.el
@@ -215,8 +215,9 @@ COMMAND-EVENT's pair.  UNCONDITIONAL indicates the variables
 `electric-pair-pairs' or `electric-pair-text-pairs' were used to
 lookup syntax.  STRING-OR-COMMENT-START indicates that point is
 inside a comment of string."
-  (let* ((pre-string-or-comment (nth 8 (save-excursion
-                                         (syntax-ppss (1- (point))))))
+  (let* ((pre-string-or-comment (or (bobp)
+                                    (nth 8 (save-excursion
+                                             (syntax-ppss (1- (point)))))))
          (post-string-or-comment (nth 8 (syntax-ppss (point))))
          (string-or-comment (and post-string-or-comment
                                  pre-string-or-comment))