ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode

This commit is contained in:
Bastien Guerry 2008-02-09 18:08:06 +00:00
parent 6802e7c66c 563e947c85
commit 68dbe3fbc8
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-02-09 Carsten Dominik <dominik@science.uva.nl>
* org.el (org-cleaned-string-for-export): Get rid of drawers
first, so that they will be removed also in the text before the
first headline.
2008-02-08 Carsten Dominik <dominik@science.uva.nl> 2008-02-08 Carsten Dominik <dominik@science.uva.nl>
* org.el (org-clock-report): Show the clocktable when found. * org.el (org-clock-report): Show the clocktable when found.

26
org.el
View File

@ -23887,6 +23887,19 @@ translations. There is currently no way for users to extend this.")
(let ((org-inhibit-startup t)) (org-mode)) (let ((org-inhibit-startup t)) (org-mode))
(untabify (point-min) (point-max)) (untabify (point-min) (point-max))
;; Get rid of drawers
(unless (eq t exp-drawers)
(goto-char (point-min))
(let ((re (concat "^[ \t]*:\\("
(mapconcat
'identity
(org-delete-all exp-drawers
(copy-sequence drawers))
"\\|")
"\\):[ \t]*\n\\([^@]*?\n\\)?[ \t]*:END:[ \t]*\n")))
(while (re-search-forward re nil t)
(replace-match ""))))
;; Get the correct stuff before the first headline ;; Get the correct stuff before the first headline
(when (plist-get parameters :skip-before-1st-heading) (when (plist-get parameters :skip-before-1st-heading)
(goto-char (point-min)) (goto-char (point-min))
@ -23910,19 +23923,6 @@ translations. There is currently no way for users to extend this.")
b (org-end-of-subtree t)) b (org-end-of-subtree t))
(if (> b a) (delete-region a b))))) (if (> b a) (delete-region a b)))))
;; Get rid of drawers
(unless (eq t exp-drawers)
(goto-char (point-min))
(let ((re (concat "^[ \t]*:\\("
(mapconcat
'identity
(org-delete-all exp-drawers
(copy-sequence drawers))
"\\|")
"\\):[ \t]*\n\\([^@]*?\n\\)?[ \t]*:END:[ \t]*\n")))
(while (re-search-forward re nil t)
(replace-match ""))))
;; Find targets in comments and move them out of comments, ;; Find targets in comments and move them out of comments,
;; but mark them as targets that should be invisible ;; but mark them as targets that should be invisible
(goto-char (point-min)) (goto-char (point-min))