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

contrib/ChangeLog

@@ -1,3 +1,8 @@
+2008-07-04  Christian Egli  <christian.egli@alumni.ethz.ch>
+
+	* scripts/org2hpda: the default location of the diary file should
+	of course be ~/diary
+
 2008-07-02  Carsten Dominik  <dominik@science.uva.nl>
 
 	* lisp/org-mtags.el (org-mtags-replace): Allow prefix and prefix1

contrib/scripts/org2hpda

@@ -1,7 +1,7 @@
 # org2hpda - a small utility to generate hipster pda style printouts from org mode 
 # Copyright (C) 2007  Christian Egli
 # 
-# Version: 0.4
+# Version: 0.5
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@
 
 EMACS = emacs -batch -l ~/.emacs
 LATEX = latex
-DIARY = ~/TODO/diary
+DIARY = ~/diary
 
 hipsterFiles =  weekCalendar.pdf yearCalendar.pdf monthCalendar3.pdf monthCalendar2.pdf monthCalendar1.pdf
 pocketModFiles =  weekCalendar.pdf yearCalendar-rotated.pdf \

lisp/ChangeLog

@@ -1,3 +1,12 @@
+2008-07-04  Bastien Guerry  <bzg@altern.org>
+
+	* org-clock.el (org-clock-out-when-done): Doc fix.
+
+	* org.el (org-agenda-skip-unavailable-files): Doc fix.
+
+	* org-exp.el (org-export-remove-comment-blocks-and-subtrees):
+	Ignore case when searching for the COMMENT cookie at export time.
+
 2008-07-02  Carsten Dominik  <dominik@science.uva.nl>
 
 	* org-exp.el (org-get-file-contents)

lisp/org-clock.el

@@ -54,8 +54,8 @@ reaches or exceeds this number, a drawer will be created."
 	  (integer :tag "When at least N clock entries")))
 
 (defcustom org-clock-out-when-done t
-  "When t, the clock will be stopped when the relevant entry is marked DONE.
-Nil means, clock will keep running until stopped explicitly with
+  "When non-nil, the clock will be stopped when the relevant entry is marked DONE.
+A nil value means, clock will keep running until stopped explicitly with
 `C-c C-x C-o', or until the clock is started in a different item."
   :group 'org-clock
   :type 'boolean)

lisp/org-exp.el

@@ -1638,7 +1638,8 @@ These special cookies will later be interpreted by the backend."
 
 (defun org-export-remove-comment-blocks-and-subtrees ()
   "Remove the comment environment, and also commented subtrees."
-  (let ((re-commented (concat "^\\*+[ \t]+" org-comment-string "\\>")))
+  (let ((re-commented (concat "^\\*+[ \t]+" org-comment-string "\\>"))
+        (case-fold-search nil))
     ;; Remove comment environment
     (goto-char (point-min))
     (while (re-search-forward

lisp/org.el

@@ -1987,8 +1987,8 @@ scope."
       'org-agenda-text-search-extra-files))
 
 (defcustom org-agenda-skip-unavailable-files nil
-  "t means to just skip non-reachable files in `org-agenda-files'.
-Nil means to remove them, after a query, from the list."
+  "Non-nil means to just skip non-reachable files in `org-agenda-files'.
+A nil value means to remove them, after a query, from the list."
   :group 'org-agenda
   :type 'boolean)