From 3f1a47112713fe17ba0aec426a7fef0a1947e314 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 5 Jan 2025 00:53:32 -0500 Subject: [PATCH] refactor: replace point-at-{b,e}ol These were deprecated in 29.1. We'll switch to pol-bol and pos-eol if/when we drop 28.x support. --- lisp/doom-cli.el | 7 ++++--- lisp/lib/text.el | 2 +- modules/editor/fold/autoload/hideshow.el | 6 +++--- modules/email/mu4e/autoload/email.el | 2 +- modules/lang/cc/autoload.el | 2 +- modules/lang/org/autoload/org-tables.el | 2 +- modules/term/eshell/autoload/eshell.el | 2 +- 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/lisp/doom-cli.el b/lisp/doom-cli.el index 1eab579ac..b67d41880 100644 --- a/lisp/doom-cli.el +++ b/lisp/doom-cli.el @@ -2349,9 +2349,10 @@ The alist's CAR are lists of formatted switches plus their arguments, e.g. (let ((lead (current-indentation)) (buffer (current-buffer))) (while (not (eobp)) - (let ((heading (string-trim (buffer-substring (point-at-bol) (point-at-eol)))) - (beg (point-at-bol 2)) - end) + (let ((heading (string-trim + (buffer-substring (line-beginning-position) + (line-end-position)))) + (beg (line-beginning-position 2))) (forward-line 1) (while (and (not (eobp)) (/= (current-indentation) lead) diff --git a/lisp/lib/text.el b/lisp/lib/text.el index bac52294d..7839c1e58 100644 --- a/lisp/lib/text.el +++ b/lisp/lib/text.el @@ -270,7 +270,7 @@ line to beginning of line. Same as `evil-delete-back-to-indentation'." (funcall (if (fboundp 'evil-delete) #'evil-delete #'delete-region) - (point-at-bol) (point)) + (line-beginning-position) (point)) (unless empty-line-p (indent-according-to-mode)))) diff --git a/modules/editor/fold/autoload/hideshow.el b/modules/editor/fold/autoload/hideshow.el index 1ee7ff62f..554bf64b1 100644 --- a/modules/editor/fold/autoload/hideshow.el +++ b/modules/editor/fold/autoload/hideshow.el @@ -49,7 +49,7 @@ fails. If before is nil, it will return the first line where predicate fails, ot the last line where predicate holds." (save-excursion (goto-char start) - (goto-char (point-at-bol)) + (goto-char (line-beginning-position)) (let ((bnd (if (> 0 direction) (point-min) (point-max))) @@ -57,9 +57,9 @@ the last line where predicate holds." (when skip (forward-line direction)) (cl-loop while (and (/= (point) bnd) (funcall predicate base-indent)) do (progn - (when before (setq pt (point-at-bol))) + (when before (setq pt (line-beginning-position))) (forward-line direction) - (unless before (setq pt (point-at-bol))))) + (unless before (setq pt (line-beginning-position))))) pt))) (defun +fold-hideshow-indent-range (&optional point) diff --git a/modules/email/mu4e/autoload/email.el b/modules/email/mu4e/autoload/email.el index f4df26eeb..a52afe08e 100644 --- a/modules/email/mu4e/autoload/email.el +++ b/modules/email/mu4e/autoload/email.el @@ -225,7 +225,7 @@ is tomorrow. With two prefixes, select the deadline." (when (re-search-forward sec nil t) (let (org-M-RET-may-split-line (lev (org-outline-level)) - (folded-p (invisible-p (point-at-eol))) + (folded-p (invisible-p (line-end-position))) (from (plist-get msg :from))) (when (consp (car from)) ; Occurs when using mu4e 1.8+. (setq from (car from))) diff --git a/modules/lang/cc/autoload.el b/modules/lang/cc/autoload.el index a57d97cd9..8592db74c 100644 --- a/modules/lang/cc/autoload.el +++ b/modules/lang/cc/autoload.el @@ -113,7 +113,7 @@ the children of class at point." (pcase-let ((`(,depth . ,node) (pop tree))) (cl-destructuring-bind (&key uri range) (plist-get node :location) (insert (make-string depth ?\ ) (plist-get node :name) "\n") - (make-text-button (+ (point-at-bol 0) depth) (point-at-eol 0) + (make-text-button (+ (line-beginning-position 0) depth) (line-end-position 0) 'action (lambda (_arg) (interactive) (find-file (eglot--uri-to-path uri)) diff --git a/modules/lang/org/autoload/org-tables.el b/modules/lang/org/autoload/org-tables.el index 8ac85d087..c2e2cd061 100644 --- a/modules/lang/org/autoload/org-tables.el +++ b/modules/lang/org/autoload/org-tables.el @@ -61,7 +61,7 @@ re-align the table if necessary. (Necessary because org-mode has a (save-match-data (when (and (org-at-table-p) (not (org-region-active-p)) - (string-match-p "|" (buffer-substring (point-at-bol) (point))) + (string-match-p "|" (buffer-substring (line-beginning-position) (point))) (looking-at-p ".*?|")) (let ((pos (point)) (noalign (looking-at-p "[^|\n\r]* |")) diff --git a/modules/term/eshell/autoload/eshell.el b/modules/term/eshell/autoload/eshell.el index 0df42fbf9..5b95c761a 100644 --- a/modules/term/eshell/autoload/eshell.el +++ b/modules/term/eshell/autoload/eshell.el @@ -151,7 +151,7 @@ Once the eshell process is killed, the previous frame layout is restored." (cond ((modulep! :completion ivy) (require 'em-hist) (let* ((ivy-completion-beg (eshell-bol)) - (ivy-completion-end (point-at-eol)) + (ivy-completion-end (line-end-position)) (input (buffer-substring-no-properties ivy-completion-beg ivy-completion-end)))