Browse Source

Add org-id.el

Conflicts:

	ChangeLog
Carsten Dominik 17 years ago
parent
commit
f228a9499b
3 changed files with 16 additions and 9 deletions
  1. 5 0
      ChangeLog
  2. 6 5
      TODO
  3. 5 4
      org.el

+ 5 - 0
ChangeLog

@@ -7,6 +7,11 @@
 	(org-publish-all): Do not overrule the default value of
 	(org-publish-all): Do not overrule the default value of
 	`org-publish-use-timestamps-flag' with a nil value of FORCE.
 	`org-publish-use-timestamps-flag' with a nil value of FORCE.
 
 
+	* org.el (org-find-entry-with-id): Also find entry outside the
+	restriction.
+	(org-at-item-p, org-export-as-html): Fixed bug with
+	`org-plain-list-ordered-item-terminator' set to ?\).
+
 2008-02-22  Carsten Dominik  <dominik@science.uva.nl>
 2008-02-22  Carsten Dominik  <dominik@science.uva.nl>
 
 
 	* org.el (org-insert-heading, org-insert-item): More intelligent
 	* org.el (org-insert-heading, org-insert-item): More intelligent

+ 6 - 5
TODO

@@ -1,6 +1,8 @@
           -*- mode:org -*-
           -*- mode:org -*-
 
 
+
 Radio links accross files?  Like in Pony?  Or HOWM.
 Radio links accross files?  Like in Pony?  Or HOWM.
+How can this be done in an efficient way?
 
 
 Ideas for time estimates:
 Ideas for time estimates:
 
 
@@ -8,14 +10,15 @@ Ideas for time estimates:
  {2:}    2 hours
  {2:}    2 hours
  {2:30}  2 hours, 30 minutes
  {2:30}  2 hours, 30 minutes
 
 
-
+What should be done with appointments that show up in the agenda.
+Do we need something to distinguish appointment that we have to be
+at from dates that are there just for information?
 
 
 Maybe make a new keyword APPT for appointment, meaning that this is
 Maybe make a new keyword APPT for appointment, meaning that this is
 something I need to attend, as opposed to something which is on that
 something I need to attend, as opposed to something which is on that
 day and not necessarily something where we need to be present.  Not
 day and not necessarily something where we need to be present.  Not
 sure about this.
 sure about this.
 
 
-
 Should we add this hierarchically? Should parents value be the summed
 Should we add this hierarchically? Should parents value be the summed
 values of children?  I guess not.  No.  Estimated times should be
 values of children?  I guess not.  No.  Estimated times should be
 atomic, belonging to the detailed entry.  If people give estimated
 atomic, belonging to the detailed entry.  If people give estimated
@@ -25,10 +28,8 @@ times to parents, their fault.
 |---+---+---+---+---|
 |---+---+---+---+---|
 |   |   |   |   |   |
 |   |   |   |   |   |
 
 
-
-make special completion for refile path, similar to file completion.
-
 Make variables for case-fold-search, there is a request in the survey
 Make variables for case-fold-search, there is a request in the survey
+about case-sensitive search in tags or todo, something.
 
 
 ">" does not work well in column view, when currently there is no
 ">" does not work well in column view, when currently there is no
 width defined.
 width defined.

+ 5 - 4
org.el

@@ -2708,7 +2708,7 @@ nearest into the future."
 (defcustom org-deadline-warning-days 14
 (defcustom org-deadline-warning-days 14
   "No. of days before expiration during which a deadline becomes active.
   "No. of days before expiration during which a deadline becomes active.
 This variable governs the display in sparse trees and in the agenda.
 This variable governs the display in sparse trees and in the agenda.
-When negative, it means use this number (the absolute value of it)
+When 0 or negative, it means use this number (the absolute value of it)
 even if a deadline has a different individual lead time specified."
 even if a deadline has a different individual lead time specified."
   :group 'org-time
   :group 'org-time
   :group 'org-agenda-daily/weekly
   :group 'org-agenda-daily/weekly
@@ -7004,7 +7004,7 @@ If WITH-CASE is non-nil, the sorting will be case-sensitive."
        (cond
        (cond
 	((eq llt t)  "\\([ \t]*\\([-+]\\|\\([0-9]+[.)]\\)\\)\\|[ \t]+\\*\\)\\( \\|$\\)")
 	((eq llt t)  "\\([ \t]*\\([-+]\\|\\([0-9]+[.)]\\)\\)\\|[ \t]+\\*\\)\\( \\|$\\)")
 	((= llt ?.)  "\\([ \t]*\\([-+]\\|\\([0-9]+\\.\\)\\)\\|[ \t]+\\*\\)\\( \\|$\\)")
 	((= llt ?.)  "\\([ \t]*\\([-+]\\|\\([0-9]+\\.\\)\\)\\|[ \t]+\\*\\)\\( \\|$\\)")
-	((= llt ?\)) "\\([ \t]*\\([-+]\\|\\([0-9]+)\\)\\)\\|[ \t]+\\*\\)\\( \\|$\\)")
+	((= llt ?\)) "\\([ \t]*\\([-+]\\|\\([0-9]+))\\)\\|[ \t]+\\*\\)\\( \\|$\\)")
 	(t (error "Invalid value of `org-plain-list-ordered-item-terminator'")))))))
 	(t (error "Invalid value of `org-plain-list-ordered-item-terminator'")))))))
 
 
 (defun org-in-item-p ()
 (defun org-in-item-p ()
@@ -14811,7 +14811,7 @@ Returns the new TODO keyword, or nil if no state change should occur."
   "Check if the current headline contains a repeated deadline/schedule.
   "Check if the current headline contains a repeated deadline/schedule.
 If yes, set TODO state back to what it was and change the base date
 If yes, set TODO state back to what it was and change the base date
 of repeating deadline/scheduled time stamps to new date.
 of repeating deadline/scheduled time stamps to new date.
-This function should be run in the `org-after-todo-state-change-hook'."
+This function is run automatically after each state change to a DONE state."
   ;; last-state is dynamically scoped into this function
   ;; last-state is dynamically scoped into this function
   (let* ((repeat (org-get-repeat))
   (let* ((repeat (org-get-repeat))
 	 (aa (assoc last-state org-todo-kwd-alist))
 	 (aa (assoc last-state org-todo-kwd-alist))
@@ -16482,6 +16482,7 @@ Return the position where this entry starts, or nil if there is no such entry."
 	(case-fold-search nil))
 	(case-fold-search nil))
     (save-excursion
     (save-excursion
       (save-restriction
       (save-restriction
+	(widen)
 	(goto-char (point-min))
 	(goto-char (point-min))
 	(when (re-search-forward
 	(when (re-search-forward
 	       (concat "^[ \t]*:ID:[ \t]+" (regexp-quote id) "[ \t]*$")
 	       (concat "^[ \t]*:ID:[ \t]+" (regexp-quote id) "[ \t]*$")
@@ -25470,7 +25471,7 @@ lang=\"%s\" xml:lang=\"%s\">
 		   (cond
 		   (cond
 		    ((eq llt t) "^\\([ \t]*\\)\\(\\([-+*] \\)\\|\\([0-9]+[.)]\\) \\)?\\( *[^ \t\n\r]\\|[ \t]*$\\)")
 		    ((eq llt t) "^\\([ \t]*\\)\\(\\([-+*] \\)\\|\\([0-9]+[.)]\\) \\)?\\( *[^ \t\n\r]\\|[ \t]*$\\)")
 		    ((= llt ?.) "^\\([ \t]*\\)\\(\\([-+*] \\)\\|\\([0-9]+\\.\\) \\)?\\( *[^ \t\n\r]\\|[ \t]*$\\)")
 		    ((= llt ?.) "^\\([ \t]*\\)\\(\\([-+*] \\)\\|\\([0-9]+\\.\\) \\)?\\( *[^ \t\n\r]\\|[ \t]*$\\)")
-		    ((= llt ?\)) "^\\( \t]*\\)\\(\\([-+*] \\)\\|\\([0-9]+)\\) \\)?\\( *[^ \t\n\r]\\|[ \t]*$\\)")
+		    ((= llt ?\)) "^\\([ \t]*\\)\\(\\([-+*] \\)\\|\\([0-9]+)\\) \\)?\\( *[^ \t\n\r]\\|[ \t]*$\\)")
 		    (t (error "Invalid value of `org-plain-list-ordered-item-terminator'")))
 		    (t (error "Invalid value of `org-plain-list-ordered-item-terminator'")))
 		   line)
 		   line)
 	      (setq ind (org-get-string-indentation line)
 	      (setq ind (org-get-string-indentation line)