branch: externals/org
commit 4063d4c2d7d5522fb505803a9cdc03bf3e67f4ec
Author: Marco Wahl <[email protected]>
Commit: Marco Wahl <[email protected]>
org: Rename for more consistency
* lisp/org.el (org-get-previous-sibling): Rename from
org-get-last-sibling to be more consistent with the rest of Emacs.
org-get-last-sibling stays as obsolete alias.
---
etc/ORG-NEWS | 6 ++++++
lisp/org-compat.el | 2 ++
lisp/org.el | 8 ++++----
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index ad6cfa3..f852dc1 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -423,6 +423,12 @@ custom completion functions.
*** Providing =directory-empty-p= from Emacs 28 as =org-directory-empty-p=
+*** =org-get-last-sibling= marked as obsolete
+
+Use =org-get-previous-sibling= instead. This is just a rename to have
+a more consistent naming. E.g. recall the pair of funtctions
+=next-line= / =previous-line=.
+
* Version 9.4
** Incompatible changes
*** Possibly broken internal file links: please check and fix
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index 4ee847b..b6d548a 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -772,6 +772,8 @@ context. See the individual commands for more information."
(define-obsolete-function-alias 'org-copy 'org-refile-copy "9.4")
+(define-obsolete-function-alias 'org-get-last-sibling
'org-get-previous-sibling "9.4")
+
;;;; Obsolete link types
(eval-after-load 'ol
diff --git a/lisp/org.el b/lisp/org.el
index 733dda4..4cd2118 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -6727,8 +6727,8 @@ This function is the default value of the hook
`org-cycle-hook'."
;; First, find a reasonable region to look at:
;; Start two siblings above, end three below
(let* ((beg (save-excursion
- (and (org-get-last-sibling)
- (org-get-last-sibling))
+ (and (org-get-previous-sibling)
+ (org-get-previous-sibling))
(point)))
(end (save-excursion
(and (org-get-next-sibling)
@@ -7620,7 +7620,7 @@ case."
(setq arg (prefix-numeric-value arg))
(org-preserve-local-variables
(let ((movfunc (if (> arg 0) 'org-get-next-sibling
- 'org-get-last-sibling))
+ 'org-get-previous-sibling))
(ins-point (make-marker))
(cnt (abs arg))
(col (current-column))
@@ -20659,7 +20659,7 @@ This is like outline-next-sibling, but invisible
headings are ok."
(unless (or (eobp) (< (funcall outline-level) level))
(point))))
-(defun org-get-last-sibling ()
+(defun org-get-previous-sibling ()
"Move to previous heading of the same level, and return point.
If there is no such heading, return nil."
(let ((opoint (point))
