Mercurial > emacs

comparison lisp/org/org-archive.el @ 96044:c1ef445563bb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2008-06-17 Carsten Dominik <dominik@science.uva.nl> * org-colview.el (org-columns-next-allowed-value): Bug fix. * org-colview-xemacs.el (org-columns-next-allowed-value): Bug fix. * org-agenda.el (org-agenda-get-closed): Get the end time into the agenda prefix as well. * org-publish.el (org-publish-org-index): Make a properly indented list. * org.el (org-calendar-agenda-action-key): New option. (org-get-cursor-date): New function. (org-mark-entry-for-agenda-action): New command. (org-overriding-default-time): New variable. (org-read-date): Respect `org-overriding-default-time'. * org-remember.el (org-remember-apply-template): Respect the ovverriding default time. * org-agenda.el (org-agenda-action-marker): New variable. (org-agenda-action): New command. (org-agenda-do-action): New function. 2008-06-17 Carsten Dominik <dominik@science.uva.nl> * org.el (org-schedule, org-deadline): Protect scheduled and deadline tasks against changes that accidently remove the repeater. Also show a message with the new date when done. 2008-06-17 Carsten Dominik <dominik@science.uva.nl> * org.el (org-beginning-of-line): Cater for the case when there are tags but no headline text. (org-align-tags-here): Convert to tabs only when indent-tabs-mode it set. 2008-06-17 Carsten Dominik <dominik@science.uva.nl> * org-mhe.el (org-mhe-get-message-folder-from-index): Make sure the return value is nil instead of "nil" when there is no match. * org-exp.el (org-insert-centered): Use fill-column instead of 80. (org-export-as-ascii): Use string-width to measure the width of the heading. * org.el (org-diary-to-ical-string): No longer kill buffer FROMBUF, this is now done by the caller. * org-exp.el (org-print-icalendar-entries): Move the call to `org-diary-to-ical-string' out of the loop, and kill the buffer afterwords. * org-remember.el (org-remember-visit-immediately): Position cursor after moving to the note. (org-remember-apply-template): Use a text property to record the cursor position. (org-remember-handler): Align tags after pasting the note. 2008-06-17 Carsten Dominik <dominik@science.uva.nl> * org-bbdb.el (org-bbdb-follow-anniversary-link): New function. * org-agenda.el (org-agenda-open-link): If there is an org-bbdb-name property in the current line, jump to that bbdb entry. * org-bbdb.el (org-bbdb-anniversaries): Add the bbdb-name as a text property, so that the agenda knows where this entry comes from. * org-agenda.el (org-agenda-clock-in): Fixed bug in the interaction between clocking-in from the agenda, and automatic task state switching. * org-macs.el (org-with-point-at): Bug fix in macro defintion. * org.el (org-beginning-of-line, org-end-of-line): Make sure the zmacs-region stays after this command in XEmacs. 2008-06-17 Carsten Dominik <dominik@science.uva.nl> * org.el (org-scan-tags): Allow new values for ACTION parameter. * org-remember.el (org-remember-templates): Fix bug in customization type definition. * org.el (org-map-entries): New function. 2008-06-17 Carsten Dominik <dominik@science.uva.nl> * org-agenda.el (org-agenda-skip-comment-trees): New option. (org-agenda-skip): Respect `org-agenda-skip-comment-trees'. 2008-06-17 Carsten Dominik <dominik@science.uva.nl> * org-remember.el (org-jump-to-target-location): New variable. (org-remember-apply-template): Set `org-remember-apply-template' if requested by template. (org-remember-handler): Start an idle timer to jump to remember location. * org-exp.el (org-get-current-options): Add the FILETAGS setting. * org.el (org-set-regexps-and-options): Fix bug with parsing of file tags. (org-get-tags-at): Add the content of `org-file-tags'. * org-exp.el (org-export-handle-comments): Fix bug with several comment lines after each other. (org-number-to-roman, org-number-to-counter): New functions. (org-export-section-number-format): New option. 2008-06-17 Carsten Dominik <dominik@science.uva.nl> * org-exp.el (org-export-protect-examples): Catch the case of a missing end_example line. * org.el (org-set-regexps-and-options): Set `org-file-properties' and `org-file-tags' to nil. * org-colview.el (org-columns-next-allowed-value): Handle next argument NTH to directly select a value. * org-colview-xemacs.el (org-columns-next-allowed-value): Handle next argument NTH to directly select a value. 2008-06-17 Carsten Dominik <dominik@science.uva.nl> * org-agenda.el (org-agenda-scheduled-leaders): Fix docstring. 2008-06-17 Carsten Dominik <dominik@science.uva.nl> * org.el (org-columns-ellipses): New option. 2008-06-17 Carsten Dominik <dominik@science.uva.nl> * org-colview.el (org-columns-add-ellipses): New function. (org-columns-compact-links): New function. (org-columns-cleanup-item): Call `org-columns-compact-links'. (org-columns-display-here): Call `org-agenda-columns-cleanup-item' when in agenda. (org-columns-edit-value): Fixed bug with editing values from agenda column view. (org-columns-redo): Also redo the agenda itself. 2008-06-17 Carsten Dominik <dominik@science.uva.nl> * org-agenda.el (org-agenda-columns-remove-prefix-from-item): New option. * org-colview.el (org-agenda-columns-cleanup-item): New function. * org-exp.el (org-export-ascii-preprocess): Renamed from `org-export-ascii-clean-string'. (org-export-kill-licensed-text) (org-export-define-heading-targets) (org-export-handle-invisible-targets) (org-export-target-internal-links) (org-export-remove-or-extract-drawers) (org-export-remove-archived-trees) (org-export-protect-quoted-subtrees) (org-export-protect-verbatim, org-export-protect-examples) (org-export-select-backend-specific-text) (org-export-mark-blockquote-and-verse) (org-export-remove-comment-blocks-and-subtrees) (org-export-handle-comments, org-export-mark-radio-links) (org-export-remove-special-table-lines) (org-export-normalize-links) (org-export-concatenate-multiline-links) (org-export-concatenate-multiline-emphasis): New functions, obtained from spliiting the export preprocessor. * org-table.el (org-table-recalculate): Improve error message if the row number is invalid. 2008-06-17 Carsten Dominik <dominik@science.uva.nl> * org-archive.el (org-archive-save-context-info): Fix bugs in customization setup and docstring. * org-exp.el (org-export-html-style): Changed the size of in the <pre> element to 90%. 2008-06-17 Carsten Dominik <dominik@science.uva.nl> * org.el (org-find-src-example-start): Function removed. (org-edit-src-find-region-and-lang): New function. 2008-06-17 Carsten Dominik <dominik@science.uva.nl> * org.el (org-edit-src-exit): New function. (org-exit-edit-mode): New minor mode. * org-exp.el (org-export-preprocess-string): Fix bug with removing comment-like lines from protected examples. * org.el (org-edit-src-example, org-find-src-example-start) (org-protect-source-example, org-edit-special): New functions. 2008-06-17 Carsten Dominik <dominik@science.uva.nl> * org-publish.el (org-publish-project-alist): Fix typo in docstring. (org-publish-project-alist): Handle :index-title property. 2008-06-17 Carsten Dominik <dominik@science.uva.nl> * org-export-latex.el (org-export-as-latex): Make sure region bounds are correct. Parse subtree properties relating to export. * org-exp.el (org-export-add-options-to-plist): New function. (org-infile-export-plist): Use `org-export-add-options-to-plist'. 2008-06-17 Carsten Dominik <dominik@science.uva.nl> * org.el (org-default-properties): Add EXPORT_FILE_NAME and EXPORT_TITLE. * org-exp.el (org-export-get-title-from-subtree) (org-export-as-ascii, org-export-as-html): Make sure the original region-beginning and region-end are used, even after moving point. (org-export-get-title-from-subtree): Also try the EXPORT_TITLE property. * org-remember.el (org-remember-last-stored-marker): New variable. (org-remember-goto-last-stored): Use `org-goto-marker-or-bmk'. (org-remember-handler): Also use marker to remember last-stored position. * org.el (org-goto-marker-or-bmk): New function. 2008-06-17 Carsten Dominik <dominik@science.uva.nl> * org.el (org-file-properties): Renamed from `org-local-properties'. (org-scan-tags): Take file tags into account. (org-tags-match-list-sublevels): Default changed to t. * org-exp.el (org-export-as-html): Close paragraph after a footnote. * org.el (org-update-parent-todo-statistics): New function. * org-exp.el (org-icalendar-store-UID): New option. (org-icalendar-force-UID): Option removed. (org-print-icalendar-entries): IMplement UIDs. 2008-06-17 Carsten Dominik <dominik@science.uva.nl> * org-mhe.el (org-mhe-follow-link): Fix bug in mhe searches. 2008-06-17 Carsten Dominik <dominik@science.uva.nl> * org-faces.el (org-column): Document how this face is being used and why sometimes the background faces shine through. * org-mhe.el (org-mhe-follow-link): Improve handling of searches. * org-publish.el (org-publish-attachment): Create publishing directory if it does not yet exist. * org-table.el (org-calc-default-modes): Change default number format to (float 8). * org.el (org-olpath-completing-read): New function. (org-time-clocksum-format): New option. (org-minutes-to-hh:mm-string): Use `org-time-clocksum-format'. * org-clock.el (org-clock-display, org-clock-out) (org-update-mode-line): Use `org-time-clocksum-format'. * org-colview-xemacs.el (org-columns-number-to-string): Use `org-time-clocksum-format'. * org-colview.el (org-columns-number-to-string): Use `org-time-clocksum-format'. 2008-06-17 Carsten Dominik <dominik@science.uva.nl> * org-id.el: New file, move from contrib to core. * org-exp.el (org-icalendar-force-UID): New option. 2008-06-17 Carsten Dominik <dominik@science.uva.nl> * org-exp.el (org-print-icalendar-entries): Make sure DTEND is shifted by one day if theere is a date range without an end time. * org.el (org-try-structure-completion): New function. 2008-06-17 Carsten Dominik <dominik@science.uva.nl> * org.el (org-set-font-lock-defaults): Improve fontification of description lists. (org-insert-item): Handle description lists. (org-adaptive-fill-function): Improve auto indentation in description lists. * org-exp.el (org-export-as-html, org-export-preprocess-string): Implement VERSE environment. (org-export-preprocess-string): Implement the COMMENT environment. * org-export-latex.el (org-export-latex-preprocess): Implement VERSE environment. 2008-06-17 Carsten Dominik <dominik@science.uva.nl> * org-jsinfo.el (org-infojs-opts-table): Add entry for FIXED_TOC option. 2008-06-17 Carsten Dominik <dominik@science.uva.nl> * org-table.el (orgtbl-to-tsv, orgtbl-to-csv): New functions. * org.el (org-quote-csv-field): New functions. * org-table.el (org-table-export-default-format): Remove :splice from default format, we get the same effect by not specifying :tstart and :tend. (org-table-export): Improve setup, distinguish better between interactive and non-interactive use, allow specifying the format on the fly, better protection against wrong file names. (orgtbl-to-generic): Fix documentation. Do not require :tstart and :tend when :splice is omitted. 2008-06-17 Carsten Dominik <dominik@science.uva.nl> * org-clock.el (org-clock-select-task): Make sure the selection letters are 1-9 and A-Z, no special characters. 2008-06-17 Carsten Dominik <dominik@science.uva.nl> * org-exp.el (org-export-htmlize): New group. (org-export-htmlize-output-type) (org-export-htmlize-css-font-prefix): New options. (org-export-htmlize-region-for-paste): New function. (org-export-htmlize-generate-css): New command. 2008-06-17 Carsten Dominik <dominik@science.uva.nl> * org.el (org-set-visibility-according-to-property): New function. (org-ctrl-c-ctrl-c): Do not restart org-mode, just get the options and compute the regular expressions, and update font-lock. (org-property-re): Allow a dash in property names. * org-archive.el (org-extract-archive-file): Insert the file name without the path into the format, to allow the location format to contain a subdirectory. * org-agenda.el (org-agenda-post-command-hook): If point is at end of buffer, and the `org-agenda-type' property undefined, use the value from the character before. * org.el (org-add-planning-info): Don't let indentation for would-be timestamp become extra whitespace at the end of headline. 2008-06-17 Carsten Dominik <dominik@science.uva.nl> * org.el (org-remove-double-quotes, org-file-contents): New functions. * org-exp.el (org-infile-export-plist): Also parse the contents of #+SETUPFILE files, recursively. * org.el (org-set-regexps-and-options): Also parse the contents of #+SETUPFILE files, recursively. * org-exp.el (org-export-handle-include-files): New function. (org-export-preprocess-string): Call `org-export-handle-include-files'. * org.el (org-delete-property-globally) (org-delete-property, org-set-property): Ignore case during completion. (org-set-property): Use `org-completing-read' instead of `completing-read'. * org.el (org-complete-expand-structure-template): New, experimental function. (org-structure-template-alist): New, experimental option. (org-complete): Call `org-complete-expand-structure-template'. 2008-06-17 Bastien Guerry <bzg@altern.org> * org-export-latex.el (org-export-latex-preprocess): Added support for blockquotes. 2008-06-17 Carsten Dominik <dominik@science.uva.nl> * org.el (org-read-date-analyze): Catch the case where only a weekday is given. 2008-06-17 Carsten Dominik <dominik@science.uva.nl> * org.el (org-set-font-lock-defaults): Make the description tag bold. * org-exp.el (org-export-as-html, org-close-li): Implement description lists. 2008-06-17 Jason Riedy <jason@acm.org> * org-table.el (*orgtbl-default-fmt*): New variable. (orgtbl-format-line): Use the value of *orgtbl-default-fmt* when there is no other fmt available. (orgtbl-to-generic): Allow an explicitly nil :tstart or :tend to suppress the appropriate string. (orgtbl-to-orgtbl): New function for translating to another orgtbl table. 2008-06-17 Carsten Dominik <dominik@science.uva.nl> * org.el (org-read-date-analyze): "." as an alias for "+0" in read date. * org-clock.el (org-clock-save-markers-for-cut-and-paste): New function. * org-agenda.el (org-agenda-save-markers-for-cut-and-paste): New function. 2008-06-17 Carsten Dominik <dominik@science.uva.nl> * org-clock.el (org-clock-find-position): Don't include notes into clock drawer. * org-archive.el (org-archive-subtree): No longer remove an extra line after cutting the subtree. `org-cut-subtree' already takes care of this. * org-remember.el (org-remember-handler): Only kill the target buffer if it does not contain the running clock. * org.el (org-markers-to-move): New variable. (org-save-markers-in-region, org-check-and-save-marker) (org-reinstall-markers-in-region): New function. (org-move-subtree-down, org-copy-subtree): Remember relative marker positions before cutting. (org-move-subtree-down, org-paste-subtree): Restore relative marker positions after pasting. * org-remember.el (org-remember-clock-out-on-exit): New option. (org-remember-finalize): Clock out only if the setting in `org-remember-clock-out-on-exit' requires it. (org-remember-handler): Do the cleanup in the buffer, to make sure that the clock marker remains in tact. 2008-06-17 Carsten Dominik <dominik@science.uva.nl> * org-clock.el (org-clock-goto): Widen buffer if necessary. (org-clock-in): Make sure that also tasks outside the narrowed region will be clocked in correctly. (org-clock-insert-selection-line): Widen the buffer so that we can find the correct task heading. * org.el (org-base-buffer): New function. * org-exp.el (org-icalendar-cleanup-string): Make sure '," and ";" are escaped. (org-print-icalendar-entries): Also apply `org-icalendar-cleanup-string' to the headline, not only to the summary property. 2008-06-17 Carsten Dominik <dominik@science.uva.nl> * org-exp.el (org-export-preprocess-hook): New hook. (org-export-preprocess-string): Call `org-export-preprocess-hook'. * org.el (org-font-lock-hook): New variable. (org-font-lock-hook): New function. (org-set-font-lock-defaults): Call `org-font-lock-hook'. 2008-06-17 Carsten Dominik <dominik@science.uva.nl> * org.texi: Modify license to no longer include back- and front cover matters. (Using the mapping API): New section. (Agenda column view): New section. (Moving subtrees): Document archiving to the archive sibling. (Agenda commands): Document columns view in the agenda. (Using the property API): Document the API for multi-valued properties.
author Carsten Dominik <dominik@science.uva.nl>
date Tue, 17 Jun 2008 15:22:00 +0000
parents 03ae886de7f4
children 60149c696033
comparison
equal deleted inserted replaced
96043:a678c02d0c40 96044:c1ef445563bb
3 ;; Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. 3 ;; Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
4 4
5 ;; Author: Carsten Dominik <carsten at orgmode dot org> 5 ;; Author: Carsten Dominik <carsten at orgmode dot org>
6 ;; Keywords: outlines, hypermedia, calendar, wp 6 ;; Keywords: outlines, hypermedia, calendar, wp
7 ;; Homepage: http://orgmode.org 7 ;; Homepage: http://orgmode.org
8 ;; Version: 6.02b 8 ;; Version: 6.05a
9 ;; 9 ;;
10 ;; This file is part of GNU Emacs. 10 ;; This file is part of GNU Emacs.
11 ;; 11 ;;
12 ;; GNU Emacs is free software: you can redistribute it and/or modify 12 ;; GNU Emacs is free software: you can redistribute it and/or modify
13 ;; it under the terms of the GNU General Public License as published by 13 ;; it under the terms of the GNU General Public License as published by
62 state (depending on the variable `org-archive-mark-done'). 62 state (depending on the variable `org-archive-mark-done').
63 This variable can be a list of any of the following symbols: 63 This variable can be a list of any of the following symbols:
64 64
65 time The time of archiving. 65 time The time of archiving.
66 file The file where the entry originates. 66 file The file where the entry originates.
67 itags The local tags, in the headline of the subtree. 67 ltags The local tags, in the headline of the subtree.
68 ltags The tags the subtree inherits from further up the hierarchy. 68 itags The tags the subtree inherits from further up the hierarchy.
69 todo The pre-archive TODO state. 69 todo The pre-archive TODO state.
70 category The category, taken from file name or #+CATEGORY lines. 70 category The category, taken from file name or #+CATEGORY lines.
71 olpath The outline path to the item. These are all headlines above 71 olpath The outline path to the item. These are all headlines above
72 the current item, separated by /, like a file path. 72 the current item, separated by /, like a file path.
73 73
78 :type '(set :greedy t 78 :type '(set :greedy t
79 (const :tag "Time" time) 79 (const :tag "Time" time)
80 (const :tag "File" file) 80 (const :tag "File" file)
81 (const :tag "Category" category) 81 (const :tag "Category" category)
82 (const :tag "TODO state" todo) 82 (const :tag "TODO state" todo)
83 (const :tag "TODO state" priority) 83 (const :tag "Priority" priority)
84 (const :tag "Inherited tags" itags) 84 (const :tag "Inherited tags" itags)
85 (const :tag "Outline path" olpath) 85 (const :tag "Outline path" olpath)
86 (const :tag "Local tags" ltags))) 86 (const :tag "Local tags" ltags)))
87 87
88 (defun org-get-local-archive-location () 88 (defun org-get-local-archive-location ()
133 (and file (> (length file) 0) (file-exists-p file) 133 (and file (> (length file) 0) (file-exists-p file)
134 (add-to-list 'files file)) 134 (add-to-list 'files file))
135 files)) 135 files))
136 136
137 (defun org-extract-archive-file (&optional location) 137 (defun org-extract-archive-file (&optional location)
138 "Extract and expand the file name from archive LOCATION.
139 if LOCATION is not given, the value of `org-archive-location' is used."
138 (setq location (or location org-archive-location)) 140 (setq location (or location org-archive-location))
139 (if (string-match "\\(.*\\)::\\(.*\\)" location) 141 (if (string-match "\\(.*\\)::\\(.*\\)" location)
140 (if (= (match-beginning 1) (match-end 1)) 142 (if (= (match-beginning 1) (match-end 1))
141 (buffer-file-name) 143 (buffer-file-name)
142 (expand-file-name 144 (expand-file-name
143 (format (match-string 1 location) buffer-file-name))))) 145 (format (match-string 1 location)
146 (file-name-nondirectory buffer-file-name))))))
144 147
145 (defun org-extract-archive-heading (&optional location) 148 (defun org-extract-archive-heading (&optional location)
149 "Extract the heading from archive LOCATION.
150 if LOCATION is not given, the value of `org-archive-location' is used."
146 (setq location (or location org-archive-location)) 151 (setq location (or location org-archive-location))
147 (if (string-match "\\(.*\\)::\\(.*\\)" location) 152 (if (string-match "\\(.*\\)::\\(.*\\)" location)
148 (match-string 2 location))) 153 (match-string 2 location)))
149 154
150 (defun org-archive-subtree (&optional find-done) 155 (defun org-archive-subtree (&optional find-done)
178 (time (format-time-string 183 (time (format-time-string
179 (substring (cdr org-time-stamp-formats) 1 -1) 184 (substring (cdr org-time-stamp-formats) 1 -1)
180 (current-time))) 185 (current-time)))
181 category todo priority ltags itags 186 category todo priority ltags itags
182 ;; end of variables that will be used for saving context 187 ;; end of variables that will be used for saving context
183 location afile heading buffer level newfile-p) 188 location afile heading buffer level newfile-p visiting)
184 189
185 ;; Find the local archive location 190 ;; Find the local archive location
186 (setq location (org-get-local-archive-location) 191 (setq location (org-get-local-archive-location)
187 afile (org-extract-archive-file location) 192 afile (org-extract-archive-file location)
188 heading (org-extract-archive-heading location)) 193 heading (org-extract-archive-heading location))
189 (unless afile 194 (unless afile
190 (error "Invalid `org-archive-location'")) 195 (error "Invalid `org-archive-location'"))
191 196
192 (if (> (length afile) 0) 197 (if (> (length afile) 0)
193 (setq newfile-p (not (file-exists-p afile)) 198 (setq newfile-p (not (file-exists-p afile))
194 buffer (find-file-noselect afile)) 199 visiting (find-buffer-visiting afile)
200 buffer (or visiting (find-file-noselect afile)))
195 (setq buffer (current-buffer))) 201 (setq buffer (current-buffer)))
196 (unless buffer 202 (unless buffer
197 (error "Cannot access file \"%s\"" afile)) 203 (error "Cannot access file \"%s\"" afile))
198 (if (and (> (length heading) 0) 204 (if (and (> (length heading) 0)
199 (string-match "^\\*+" heading)) 205 (string-match "^\\*+" heading))
211 ltags (org-get-tags) 217 ltags (org-get-tags)
212 itags (org-delete-all ltags (org-get-tags-at))) 218 itags (org-delete-all ltags (org-get-tags-at)))
213 (setq ltags (mapconcat 'identity ltags " ") 219 (setq ltags (mapconcat 'identity ltags " ")
214 itags (mapconcat 'identity itags " ")) 220 itags (mapconcat 'identity itags " "))
215 ;; We first only copy, in case something goes wrong 221 ;; We first only copy, in case something goes wrong
216 ;; we need to protect this-command, to avoid kill-region sets it, 222 ;; we need to protect `this-command', to avoid kill-region sets it,
217 ;; which would lead to duplication of subtrees 223 ;; which would lead to duplication of subtrees
218 (let (this-command) (org-copy-subtree)) 224 (let (this-command) (org-copy-subtree 1 nil t))
219 (set-buffer buffer) 225 (set-buffer buffer)
220 ;; Enforce org-mode for the archive buffer 226 ;; Enforce org-mode for the archive buffer
221 (if (not (org-mode-p)) 227 (if (not (org-mode-p))
222 ;; Force the mode for future visits. 228 ;; Force the mode for future visits.
223 (let ((org-insert-mode-line-in-empty-file t) 229 (let ((org-insert-mode-line-in-empty-file t)
281 (stringp v) (string-match "\\S-" v)) 287 (stringp v) (string-match "\\S-" v))
282 (setq n (concat "ARCHIVE_" (upcase (symbol-name e)))) 288 (setq n (concat "ARCHIVE_" (upcase (symbol-name e))))
283 (org-entry-put (point) n v))))) 289 (org-entry-put (point) n v)))))
284 290
285 ;; Save and kill the buffer, if it is not the same buffer. 291 ;; Save and kill the buffer, if it is not the same buffer.
286 (if (not (eq this-buffer buffer)) 292 (when (not (eq this-buffer buffer))
287 (progn (save-buffer) (kill-buffer buffer))))) 293 (save-buffer)
294 ;; Check if it is OK to kill the buffer
295 (unless
296 (or visiting
297 (equal (marker-buffer org-clock-marker) (current-buffer)))
298 (kill-buffer buffer)))
299 ))
288 ;; Here we are back in the original buffer. Everything seems to have 300 ;; Here we are back in the original buffer. Everything seems to have
289 ;; worked. So now cut the tree and finish up. 301 ;; worked. So now cut the tree and finish up.
290 (let (this-command) (org-cut-subtree)) 302 (let (this-command) (org-cut-subtree))
291 (if (and (not (eobp)) (looking-at "[ \t]*$")) (kill-line)) 303 (setq org-markers-to-move nil)
292 (message "Subtree archived %s" 304 (message "Subtree archived %s"
293 (if (eq this-buffer buffer) 305 (if (eq this-buffer buffer)
294 (concat "under heading: " heading) 306 (concat "under heading: " heading)
295 (concat "in file: " (abbreviate-file-name afile))))))) 307 (concat "in file: " (abbreviate-file-name afile)))))))
296 308
402 (message "Subtree %s" (if set "archived" "unarchived"))))) 414 (message "Subtree %s" (if set "archived" "unarchived")))))
403 415
404 (provide 'org-archive) 416 (provide 'org-archive)
405 417
406 ;; arch-tag: 0837f601-9699-43c3-8b90-631572ae6c85 418 ;; arch-tag: 0837f601-9699-43c3-8b90-631572ae6c85
419
407 ;;; org-archive.el ends here 420 ;;; org-archive.el ends here