From 2614e5321639008dc75f740236769d1e9213aae2 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Sun, 21 Aug 2022 14:04:52 +0200 Subject: [PATCH] Rename newly-added eol/bol functions to pos-eol/pos-bol * lisp/emacs-lisp/shortdoc.el (buffer): * doc/lispref/positions.texi (Text Lines): Adjust. * src/editfns.c (Fpos_bol): Rename from Fpos. (Fpos_eol): Rename from Feol. --- doc/lispref/positions.texi | 4 ++-- etc/NEWS | 2 +- lisp/emacs-lisp/shortdoc.el | 8 ++++---- src/editfns.c | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/lispref/positions.texi b/doc/lispref/positions.texi index 53846ed2971..7945232bf8f 100644 --- a/doc/lispref/positions.texi +++ b/doc/lispref/positions.texi @@ -387,12 +387,12 @@ Return the position that @code{(end-of-line @var{count})} would move to. @end defun -@defun bol &optional count +@defun pos-bol &optional count Like @code{line-beginning-position}, but ignores fields (and is more efficient). @end defun -@defun eol &optional count +@defun pos-eol &optional count Like @code{line-end-position}, but ignores fields (and is more efficient). @end defun diff --git a/etc/NEWS b/etc/NEWS index 0274e3b1535..c41b7ac6e82 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -2589,7 +2589,7 @@ patcomp.el, pc-mode.el, pc-select.el, s-region.el, and sregex.el. * Lisp Changes in Emacs 29.1 +++ -** New functions 'eol' and 'bol'. +** New functions 'pos-eol' and 'pos-bol'. These are like 'line-end-position' and 'line-beginning-position' (respectively), but ignore fields (and are more efficient). diff --git a/lisp/emacs-lisp/shortdoc.el b/lisp/emacs-lisp/shortdoc.el index acf294ede14..6fb6100bd2d 100644 --- a/lisp/emacs-lisp/shortdoc.el +++ b/lisp/emacs-lisp/shortdoc.el @@ -941,10 +941,10 @@ A FUNC form can have any number of `:no-eval' (or `:no-value'), :eval (point-min)) (point-max :eval (point-max)) - (eol - :eval (eol)) - (bol - :eval (bol)) + (pos-eol + :eval (pos-eol)) + (pos-bol + :eval (pos-bol)) (bolp :eval (bolp)) (eolp diff --git a/src/editfns.c b/src/editfns.c index 16262381999..febc9f8fdaa 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -729,7 +729,7 @@ bol (Lisp_Object n, ptrdiff_t *out_count) return charpos; } -DEFUN ("bol", Fbol, Sbol, 0, 1, 0, +DEFUN ("pos-bol", Fpos_bol, Spos_bol, 0, 1, 0, doc: /* Return the position of the first character on the current line. With optional argument N, scan forward N - 1 lines first. If the scan reaches the end of the buffer, return that position. @@ -784,7 +784,7 @@ eol (Lisp_Object n) NULL); } -DEFUN ("eol", Feol, Seol, 0, 1, 0, +DEFUN ("pos-eol", Fpos_eol, Spos_eol, 0, 1, 0, doc: /* Return the position of the last character on the current line. With argument N not nil or 1, move forward N - 1 lines first. If scan reaches end of buffer, return that position. @@ -4642,8 +4642,8 @@ with an optional argument LOCK non-nil. */); defsubr (&Sline_beginning_position); defsubr (&Sline_end_position); - defsubr (&Sbol); - defsubr (&Seol); + defsubr (&Spos_bol); + defsubr (&Spos_eol); defsubr (&Ssave_excursion); defsubr (&Ssave_current_buffer); -- 2.39.5