branch: externals/org
commit ce83328b023e988aa8cbb8e8743db35abc24134e
Author: Morgan Smith <[email protected]>
Commit: Ihor Radchenko <[email protected]>
Replace references to obsolete variables and functions
* doc/org-guide.org (Visibility Cycling):
* doc/org-manual.org (Global and local cycling, Internal archiving)
(Filtering in the agenda):
* lisp/ob-ref.el (org-babel-ref-index-list):
* lisp/ol.el (org-link-email-description-format):
* lisp/org-capture.el (org-capture-put-target-region-and-position):
* lisp/org-compat.el (org-show-block-all, org-flag-drawer)
(org-hide-block-toggle-maybe):
* lisp/org-mouse.el (org-mouse-popup-global-menu):
* lisp/org.el (org-properties-postprocess-alist, org-org-menu):
* lisp/ox-latex.el (org-latex-src-block-backend):
Replace references to obsolete functions and variables with their new alias.
---
doc/org-guide.org | 2 +-
doc/org-manual.org | 11 +++++++----
lisp/ob-ref.el | 2 +-
lisp/ol.el | 2 +-
lisp/org-capture.el | 2 +-
lisp/org-compat.el | 8 ++++----
lisp/org-mouse.el | 2 +-
lisp/org.el | 6 +++---
lisp/ox-latex.el | 2 +-
9 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/doc/org-guide.org b/doc/org-guide.org
index d10f4f51c0..ae8fe602de 100644
--- a/doc/org-guide.org
+++ b/doc/org-guide.org
@@ -162,7 +162,7 @@ visibility in the buffer.
: ,-> OVERVIEW -> CONTENTS -> SHOW ALL --.
: '--------------------------------------'
-- {{{kbd(C-u C-u C-u TAB)}}} (~org-show-all~) ::
+- {{{kbd(C-u C-u C-u TAB)}}} (~org-fold-show-all~) ::
Show all, including drawers.
diff --git a/doc/org-manual.org b/doc/org-manual.org
index 61bc764305..8f917a57e3 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -615,11 +615,12 @@ Org uses just two commands, bound to {{{kbd(TAB)}}} and
Switch back to the startup visibility of the buffer (see [[*Initial
visibility]]).
-- {{{kbd(C-u C-u C-u TAB)}}} (~org-show-all~) ::
+- {{{kbd(C-u C-u C-u TAB)}}} (~org-fold-show-all~) ::
#+cindex: show all, command
#+kindex: C-u C-u C-u TAB
#+findex: org-show-all
+ #+findex: org-fold-show-all
Show all, including drawers.
- {{{kbd(C-c C-r)}}} (~org-reveal~) ::
@@ -642,11 +643,12 @@ Org uses just two commands, bound to {{{kbd(TAB)}}} and
#+findex: org-show-branches
Expose all the headings of the subtree, but not their bodies.
-- {{{kbd(C-c TAB)}}} (~org-show-children~) ::
+- {{{kbd(C-c TAB)}}} (~org-fold-show-children~) ::
#+cindex: show children, command
#+kindex: C-c TAB
#+findex: org-show-children
+ #+findex: org-fold-show-children
Expose all direct children of the subtree. With a numeric prefix
argument {{{var(N)}}}, expose all children down to level
{{{var(N)}}}.
@@ -7806,7 +7808,7 @@ its location in the outline tree, but behaves in the
following way:
command (see [[*Visibility Cycling]]). You can force cycling archived
subtrees with {{{kbd(C-c C-TAB)}}}, or by setting the option
~org-cycle-open-archived-trees~. Also, normal outline commands, like
- ~org-show-all~, open archived subtrees.
+ ~org-fold-show-all~, open archived subtrees.
-
#+vindex: org-sparse-tree-open-archived-trees
@@ -9887,6 +9889,7 @@ filter elements are accumulated.
'(("Effort_ALL". "0 0:10 0:30 1:00 2:00 3:00 4:00")))
#+end_src
+ #+vindex: org-agenda-sort-noeffort-is-high
#+vindex: org-sort-agenda-noeffort-is-high
You can then filter for an effort by first typing an operator, one
of {{{kbd(<)}}}, {{{kbd(>)}}} and {{{kbd(=)}}}, and then the
@@ -9895,7 +9898,7 @@ filter elements are accumulated.
restricts to entries with effort smaller-or-equal, equal, or
larger-or-equal than the selected value. For application of the
operator, entries without a defined effort are treated according to
- the value of ~org-sort-agenda-noeffort-is-high~. To clear the
+ the value of ~org-agenda-sort-noeffort-is-high~. To clear the
filter, press {{{kbd(_)}}} twice (once to call the command again,
and once at the first prompt).
diff --git a/lisp/ob-ref.el b/lisp/ob-ref.el
index 6a76edaa7c..14c5ce4a9c 100644
--- a/lisp/ob-ref.el
+++ b/lisp/ob-ref.el
@@ -236,7 +236,7 @@ to \"0:-1\"."
(if (or (= 0 (length portion)) (string-match ind-re portion))
(mapcar
(lambda (n) (nth n lis))
- (apply 'org-number-sequence
+ (apply #'number-sequence
(if (and (> (length portion) 0) (match-string 2 portion))
(list
(funcall wrap (string-to-number (match-string 2
portion)))
diff --git a/lisp/ol.el b/lisp/ol.el
index 4f29beb644..a903870fb0 100644
--- a/lisp/ol.el
+++ b/lisp/ol.el
@@ -496,7 +496,7 @@ The following %-escapes will be replaced by corresponding
information:
%T full \"To\" field
%t first name in \"To\" field, address if no name
%c correspondent. Usually \"from NAME\", but if you sent it yourself, it
- will be \"to NAME\". See also the variable `org-from-is-user-regexp'.
+ will be \"to NAME\". See also the variable `org-link-from-user-regexp'.
%s subject
%d date
%m message-id.
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index cde9d991e6..f170212be4 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -1044,7 +1044,7 @@ for `entry'-type templates"))
(org-capture-put
:initial-target-region
;; Check if the buffer is currently narrowed
- (when (org-buffer-narrowed-p)
+ (when (buffer-narrowed-p)
(cons (point-min) (point-max))))
;; store the current point
(org-capture-put :initial-target-position (point)))
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index 7ca0a9481e..973f862e23 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -1253,7 +1253,7 @@ INCLUDE-LINKED is passed to `org-display-inline-images'."
(org-fold-show-all '(blocks)))
(make-obsolete 'org-show-block-all
- "use `org-show-all' instead."
+ "use `org-fold-show-all' instead."
"9.2")
(define-obsolete-function-alias 'org-get-tags-at 'org-get-tags "9.2")
@@ -1292,7 +1292,7 @@ When optional argument ELEMENT is a parsed drawer, as
returned by
When buffer positions BEG and END are provided, hide or show that
region as a drawer without further ado."
- (declare (obsolete "use `org-hide-drawer-toggle' instead." "9.4"))
+ (declare (obsolete "use `org-fold-hide-drawer-toggle' instead." "9.4"))
(if (and beg end) (org-fold-region beg end flag 'drawer)
(let ((drawer
(or element
@@ -1315,9 +1315,9 @@ region as a drawer without further ado."
(defun org-hide-block-toggle-maybe ()
"Toggle visibility of block at point.
-Unlike to `org-hide-block-toggle', this function does not throw
+Unlike to `org-fold-hide-block-toggle', this function does not throw
an error. Return a non-nil value when toggling is successful."
- (declare (obsolete "use `org-hide-block-toggle' instead." "9.4"))
+ (declare (obsolete "use `org-fold-hide-block-toggle' instead." "9.4"))
(interactive)
(org-fold-hide-block-toggle nil t))
diff --git a/lisp/org-mouse.el b/lisp/org-mouse.el
index d965b8ed55..cf303ee965 100644
--- a/lisp/org-mouse.el
+++ b/lisp/org-mouse.el
@@ -491,7 +491,7 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
`("Main Menu"
["Show Overview" org-mouse-show-overview t]
["Show Headlines" org-mouse-show-headlines t]
- ["Show All" org-show-all t]
+ ["Show All" org-fold-show-all t]
["Remove Highlights" org-remove-occur-highlights
:visible org-occur-highlights]
"--"
diff --git a/lisp/org.el b/lisp/org.el
index b859a08795..e3d0073c2e 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -3081,7 +3081,7 @@ and the clock summary:
(let ((clocksum (org-clock-sum-current-item))
(effort (org-duration-to-minutes
(org-entry-get (point) \"Effort\"))))
- (org-minutes-to-clocksum-string (- effort clocksum))))))"
+ (org-duration-from-minutes (- effort clocksum))))))"
:group 'org-properties
:version "24.1"
:type '(alist :key-type (string :tag "Property")
@@ -18683,12 +18683,12 @@ an argument, unconditionally call
`org-insert-heading'."
["Descriptive Links"
org-toggle-link-display
:style radio
- :selected org-descriptive-links
+ :selected org-link-descriptive
]
["Literal Links"
org-toggle-link-display
:style radio
- :selected (not org-descriptive-links)])
+ :selected (not org-link-descriptive)])
"--"
("TODO Lists"
["TODO/DONE/-" org-todo t]
diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index 22123fd334..a63013adf1 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -988,7 +988,7 @@ In addition, it is necessary to install pygments
passed to pdflatex.
The minted choice has possible repercussions on the preview of
-latex fragments (see `org-preview-latex-fragment'). If you run
+latex fragments (see `org-latex-preview'). If you run
into previewing problems, please consult
URL `https://orgmode.org/worg/org-tutorials/org-latex-preview.html'.
