Minor fixes

This commit is contained in:
Carsten Dominik 2009-10-15 07:59:15 +02:00
parent 12d1fd35cc
commit 77a9f4ecf1
3 changed files with 77 additions and 70 deletions

View File

@ -1,3 +1,7 @@
2009-10-15 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-inlinetask-remove-END-maybe): Declare function.
2009-10-14 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-filter-make-matcher): Allow to filter

View File

@ -40,6 +40,7 @@
(declare-function org-infojs-options-inbuffer-template "org-jsinfo" ())
(declare-function org-export-htmlize-region-for-paste "org-html" (beg end))
(declare-function htmlize-buffer "ext:htmlize" (&optional buffer))
(declare-function org-inlinetask-remove-END-maybe "org-inlinetask" ())
(autoload 'org-export-generic "org-export-generic" "Export using the generic exporter" t)
(defgroup org-export nil
"Options for exporting org-listings."

View File

@ -739,9 +739,10 @@ and the command will return t. If something goes wrong, a string will
be returned that indicates what went wrong."
(let (current old1 new1)
(if (stringp what) (setq what (intern what)))
(case what
((todo todostate)
(cond
((memq what '(todo todostate))
(setq current (org-get-todo-state))
(cond
((equal new "DONEARCHIVE")
@ -755,7 +756,7 @@ be returned that indicates what went wrong."
(t (error "State before change was expected as \"%s\", but is \"%s\""
old current))))
(tags
((eq what 'tags)
(setq current (org-get-tags)
new1 (and new (org-split-string new ":+"))
old1 (and old (org-split-string old ":+")))
@ -768,7 +769,7 @@ be returned that indicates what went wrong."
(t (error "Tags before change were expected as \"%s\", but are \"%s\""
(or old "") (or current "")))))
(priority
((eq what 'priority)
(when (looking-at org-complex-heading-regexp)
(setq current (and (match-end 3) (substring (match-string 3) 2 3)))
(cond
@ -779,7 +780,8 @@ be returned that indicates what went wrong."
(org-priority (and new (string-to-char new))))
(t (error "Priority was expected to be %s, but is %s"
old current)))))
(heading
((eq what 'heading)
(when (looking-at org-complex-heading-regexp)
(setq current (match-string 4))
(cond
@ -793,7 +795,7 @@ be returned that indicates what went wrong."
(org-set-tags nil 'align))
(t (error "Heading changed in MobileOrg and on the computer")))))
(body
((eq what 'body)
(setq current (buffer-substring (min (1+ (point-at-eol)) (point-max))
(save-excursion (outline-next-heading)
(point))))