forked from mirrors/org-mode
Rename attic to archive.
This commit is contained in:
parent
b7628661b1
commit
25198ae29c
|
@ -30,13 +30,13 @@
|
|||
|
||||
* lisp/org-agenda.el (org-agenda-list, org-timeline): Use the
|
||||
proper faces for dates in the agenda and timeline buffers.
|
||||
(org-agenda-archive-to-attic-sibling): New command.
|
||||
(org-agenda-archive-to-archive-sibling): New command.
|
||||
|
||||
* doc/org.texi (Moving subtrees): Document archiving to the attic
|
||||
* doc/org.texi (Moving subtrees): Document archiving to the archive
|
||||
sibling.
|
||||
|
||||
* lisp/org.el (org-attic-heading): New option.
|
||||
(org-archive-to-attic-sibling): New function.
|
||||
* lisp/org.el (org-archive-sibling-heading): New option.
|
||||
(org-archive-to-archive-sibling): New function.
|
||||
|
||||
2008-04-07 Carsten Dominik <dominik@science.uva.nl>
|
||||
|
||||
|
|
|
@ -75,10 +75,10 @@ the hierarchy, it will be used."
|
|||
:group 'org-archive
|
||||
:type 'string)
|
||||
|
||||
(defcustom org-attic-heading "Attic"
|
||||
"Name of the local attic sibling that is used to archive entries locally.
|
||||
(defcustom org-archive-sibling-heading "Archive"
|
||||
"Name of the local archive sibling that is used to archive entries locally.
|
||||
Locally means: in the tree, under a sibling.
|
||||
See `org-archive-to-attic-sibling' for more information."
|
||||
See `org-archive-to-archive-sibling' for more information."
|
||||
:group 'org-archive
|
||||
:type 'string)
|
||||
|
||||
|
@ -291,11 +291,11 @@ this heading."
|
|||
(concat "under heading: " heading)
|
||||
(concat "in file: " (abbreviate-file-name afile)))))))
|
||||
|
||||
(defun org-archive-to-attic-sibling ()
|
||||
"Archive the current heading by moving it under the attic sibling.
|
||||
The attic sibling is a sibling of the heading with the heading name
|
||||
`org-attic-heading and an `org-archive-tag' tag. If this sibling does
|
||||
not exist, it will be created at the end of the subtree."
|
||||
(defun org-archive-to-archive-sibling ()
|
||||
"Archive the current heading by moving it under the archive sibling.
|
||||
The archive sibling is a sibling of the heading with the heading name
|
||||
`org-archive-sibling-heading' and an `org-archive-tag' tag. If this
|
||||
sibling does not exist, it will be created at the end of the subtree."
|
||||
(interactive)
|
||||
(save-restriction
|
||||
(widen)
|
||||
|
@ -317,12 +317,12 @@ not exist, it will be created at the end of the subtree."
|
|||
(unless (re-search-forward
|
||||
(concat "^" (regexp-quote leader)
|
||||
"[ \t]*"
|
||||
org-attic-heading
|
||||
org-archive-sibling-heading
|
||||
"[ \t]*:"
|
||||
org-archive-tag ":") e t)
|
||||
(goto-char e)
|
||||
(or (bolp) (newline))
|
||||
(insert leader org-attic-heading "\n")
|
||||
(insert leader org-archive-sibling-heading "\n")
|
||||
(beginning-of-line 0)
|
||||
(org-toggle-tag org-archive-tag 'on))
|
||||
(beginning-of-line 1)
|
||||
|
|
Loading…
Reference in New Issue