Pārlūkot izejas kodu

Inline Tasks: Fix bugs and installation problems

Carsten Dominik 16 gadi atpakaļ
vecāks
revīzija
4fe6d54c30
4 mainītis faili ar 16 papildinājumiem un 0 dzēšanām
  1. 5 0
      ChangeLog
  2. 2 0
      Makefile
  3. 3 0
      lisp/ChangeLog
  4. 6 0
      lisp/org-inlinetask.el

+ 5 - 0
ChangeLog

@@ -1,3 +1,8 @@
+2009-03-31  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* Makefile (LISPF): Add org-inlinetask.el
+	(lisp/org-inlinetask.elc): No denpendencies.
+
 2009-01-19  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* Makefile (html_manual): Process the split html manual with the

+ 2 - 0
Makefile

@@ -78,6 +78,7 @@ LISPF      = 	org.el			\
 		org-gnus.el		\
 		org-id.el		\
 		org-info.el		\
+		org-inlinetask.el	\
 		org-jsinfo.el		\
 		org-irc.el		\
 		org-list.el		\
@@ -331,6 +332,7 @@ lisp/org-footnotes.elc:    lisp/org-macs.el lisp/org-compat.el
 lisp/org-gnus.elc:         lisp/org.el
 lisp/org-id.elc:           lisp/org.el
 lisp/org-info.elc:         lisp/org.el
+lisp/org-inlinetask.elc:
 lisp/org-irc.elc:          lisp/org.el
 lisp/org-jsinfo.elc:       lisp/org.el lisp/org-exp.el
 lisp/org-list.elc:         lisp/org-macs.el lisp/org-compat.el

+ 3 - 0
lisp/ChangeLog

@@ -1,5 +1,8 @@
 2009-03-31  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org-inlinetask.el (org-inlinetask-export-handler): Fix line
+	postion before inserting modified headline.
+
 	* org-agenda.el (org-agenda-compare-effort): Honor
 	`org-sort-agenda-noeffort-is-high'.
 	(org-agenda-filter-by-tag, org-agenda-filter-make-matcher)

+ 6 - 0
lisp/org-inlinetask.el

@@ -94,6 +94,11 @@ arrow+content  Insert arrow and headline, add content below in an
   :group 'org-export-general
   :type 'boolean)
 
+(defvar org-odd-levels-only)
+(defvar org-keyword-time-regexp)
+(defvar org-drawer-regexp)
+(defvar org-complex-heading-regexp)
+(defvar org-property-end-re)
 (defun org-inlinetask-export-handler ()
   "Handle headlines with level larger or equal to `org-inlinetask-min-level'.
 Either remove headline and meta data, or do special formatting."
@@ -122,6 +127,7 @@ Either remove headline and meta data, or do special formatting."
 			(looking-at "END[ \t]*$")))
 	(setq content (buffer-substring beg (1- (point-at-bol))))
 	(delete-region beg (1+ (match-end 0))))
+      (goto-char beg)
       (when (and org-inlinetask-export
 		 (string-match org-complex-heading-regexp headline))
 	(when (memq org-inlinetask-export '(arrow+content arrow))