Fix `electric-pair-backward-delete-char' error at bob

* lisp/elec-pair.el (electric-pair-backward-delete-char): Don't error
when at beginning of (possibly narrowed) buffer.

2 files changed, 9 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9b692283d96..542e686dfe2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-03  João Távora  <joaotavora@gmail.com>
+
+        * elec-pair.el (electric-pair-backward-delete-char): Don't error
+        when at beginning of (possibly narrowed) buffer.
+
 2014-02-02  Daniel Colascione  <dancol@dancol.org>
 
         * help-at-pt.el (help-at-pt-string,help-at-pt-maybe-display): Also
diff --git a/lisp/elec-pair.el b/lisp/elec-pair.el
index a2d637e2aea..bf02e5fa273 100644
--- a/lisp/elec-pair.el
+++ b/lisp/elec-pair.el
@@ -174,13 +174,14 @@ non-nil, `backward-delete-char-untabify'."
   (interactive "*p\nP")
   (let* ((prev (char-before))
          (next (char-after))
-         (syntax-info (electric-pair-syntax-info prev))
+         (syntax-info (and prev
+                           (electric-pair-syntax-info prev)))
          (syntax (car syntax-info))
          (pair (cadr syntax-info)))
-    (when (and (if (functionp electric-pair-delete-adjacent-pairs)
+    (when (and next pair
+               (if (functionp electric-pair-delete-adjacent-pairs)
                    (funcall electric-pair-delete-adjacent-pairs)
                  electric-pair-delete-adjacent-pairs)
-               next
                (memq syntax '(?\( ?\" ?\$))
                (eq pair next))
       (delete-char 1 killflag))