emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix "end of buffer" errors on backspace

Browse source
This commit is contained in:
Henrik Lissner 2018-09-21 00:52:53 -04:00
parent 92cf264b1b
commit a65868ba89
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/autoload/editor.el
View file

@ -1,7 +1,7 @@
;;; core/autoload/editor.el -*- lexical-binding: t; -*- ;;; core/autoload/editor.el -*- lexical-binding: t; -*-
;;;###autoload ;;;###autoload
(defun doom-surrounded-p (&optional pair inline balanced) (defun doom-surrounded-p (pair &optional inline balanced)
"Returns t if point is surrounded by a brace delimiter: {[( "Returns t if point is surrounded by a brace delimiter: {[(
If INLINE is non-nil, only returns t if braces are on the same line, and If INLINE is non-nil, only returns t if braces are on the same line, and
@ -9,7 +9,7 @@ whitespace is balanced on either side of the cursor.
If INLINE is nil, returns t if the opening and closing braces are on adjacent If INLINE is nil, returns t if the opening and closing braces are on adjacent
lines, above and below, with only whitespace in between." lines, above and below, with only whitespace in between."
(when-let* ((pair (or pair (sp-get-thing)))) (when pair
(let ((beg (plist-get pair :beg)) (let ((beg (plist-get pair :beg))
(end (plist-get pair :end)) (end (plist-get pair :end))
(pt (point))) (pt (point)))
@ -120,7 +120,7 @@ afterwards, kill line to beginning of line."
"Delete back to the previous column of whitespace, or as much whitespace as "Delete back to the previous column of whitespace, or as much whitespace as
possible, or just one char if that's not possible." possible, or just one char if that's not possible."
(interactive) (interactive)
(let* ((context (sp-get-thing)) (let* ((context (ignore-errors (sp-get-thing)))
(op (plist-get context :op)) (op (plist-get context :op))
(cl (plist-get context :cl)) (cl (plist-get context :cl))
open-len close-len) open-len close-len)
@ -191,7 +191,7 @@ possible, or just one char if that's not possible."
(and (> (- (skip-chars-backward " \t" (line-beginning-position))) 0) (and (> (- (skip-chars-backward " \t" (line-beginning-position))) 0)
(bolp)))) (bolp))))
(doom/backward-delete-whitespace-to-column)) (doom/backward-delete-whitespace-to-column))
((let* ((pair (sp-get-thing)) ((let* ((pair (ignore-errors (sp-get-thing)))
(op (plist-get pair :op)) (op (plist-get pair :op))
(cl (plist-get pair :cl)) (cl (plist-get pair :cl))
(beg (plist-get pair :beg)) (beg (plist-get pair :beg))