[Emacs-diffs] trunk r116246: Fix `electric-pair-backward-delete-char' error at bob

[João Távora]

------------------------------------------------------------
revno: 116246
revision-id: address@hidden
parent: address@hidden
committer: João Távora <address@hidden>
branch nick: trunk
timestamp: Mon 2014-02-03 00:28:57 +0000
message:
  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.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/elec-pair.el              elecpair.el-20131227124533-yaq8recs0j0ggt67-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-02-02 22:21:33 +0000
+++ b/lisp/ChangeLog    2014-02-03 00:28:57 +0000
@@ -1,3 +1,8 @@
+2014-02-03  João Távora  <address@hidden>
+
+       * elec-pair.el (electric-pair-backward-delete-char): Don't error
+       when at beginning of (possibly narrowed) buffer.
+
 2014-02-02  Daniel Colascione  <address@hidden>
 
        * help-at-pt.el (help-at-pt-string,help-at-pt-maybe-display): Also

=== modified file 'lisp/elec-pair.el'
--- a/lisp/elec-pair.el 2014-01-05 02:56:08 +0000
+++ b/lisp/elec-pair.el 2014-02-03 00:28:57 +0000
@@ -174,13 +174,14 @@
   (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))