Browse Source

Bug fixes and cleanup.

Carsten Dominik 17 years ago
parent
commit
678f39716a
4 changed files with 9 additions and 3 deletions
  1. 5 0
      ChangeLog
  2. 0 1
      Makefile
  3. 1 1
      org.el
  4. 3 1
      org.texi

+ 5 - 0
ChangeLog

@@ -1,3 +1,8 @@
+2008-02-28  Carsten Dominik  <dominik@science.uva.nl>
+
+	* org.el (org-auto-repeat-maybe): Make sure that the repeat stuff
+	does not add another state note.
+
 2008-02-28  Bernt Hansen <bernt@norang.ca>  (tiny change)
 
 	* org.el (org-put-clock-overlay): increase the limit of allowed

+ 0 - 1
Makefile

@@ -232,7 +232,6 @@ clean:
 	rm -f *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.kys *.pg *.pgs
 	rm -f *.toc *.tp *.tps *.vr *.vrs *.log *.html *.ps
 	rm -f orgcard_letter.tex orgcard_letter.pdf
-	rm -f org-install.el
 	rm -rf manual
 	rm -rf RELEASEDIR
 

+ 1 - 1
org.el

@@ -175,7 +175,6 @@ will be autoloaded when needed, to preloading is not necessary."
 (defun org-load-default-extensions ()
   "Load all extensions that are listed in `org-default-extensions'."
   (mapc 'require org-default-extensions))
-	  
 
 ;; FIXME: Needs a separate group...
 (defcustom org-completion-fallback-command 'hippie-expand
@@ -14845,6 +14844,7 @@ This function is run automatically after each state change to a DONE state."
 	 (whata '(("d" . day) ("m" . month) ("y" . year)))
 	 (msg "Entry repeats: ")
 	 (org-log-done nil)
+	 (org-todo-log-states nil)
 	 re type n what ts)
     (when repeat
       (if (eq org-log-repeat t) (setq org-log-repeat 'state))

+ 3 - 1
org.texi

@@ -4345,7 +4345,9 @@ or plain time stamp.  In the following example
 @end example
 the @code{+1m} is a repeater; the intended interpretation is that the
 task has a deadline on <2005-10-01> and repeats itself every (one) month
-starting from that time.
+starting from that time.  If you need both a repeater and a special
+warning period in a deadline entry, the repeater comes first and the
+warning period last: @code{DEADLINE: <2005-10-01 Sat +1m -3d>}.
 
 Deadlines and scheduled items produce entries in the agenda when they
 are over-due, so it is important to be able to mark such an entry as