2 files changed, 8 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9b6b370c452..a3d78dcddad 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-20  Juanma Barranquero  <lekktu@gmail.com>
+
+        * elec-pair.el (electric-pair-syntax-info): Do not check syntax
+        before the start of buffer/region (bug#16799).
+
 2014-02-20  Glenn Morris  <rgm@gnu.org>
 
         * isearch.el (search-invisible): Doc fix.
diff --git a/lisp/elec-pair.el b/lisp/elec-pair.el
index bf02e5fa273..8562801979d 100644
--- 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))