From b68b57c99fd5da8a7a269270988bb57f76c3dbf4 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Fri, 4 Jul 2008 04:09:00 +0200 Subject: [PATCH] Small doc fixes from Emacs (Juanma Barranquero) and a bug fix in org-exp.el. See in emacs-commit@: * org.el (org-agenda-skip-unavailable-files): * org-clock.el (org-clock-out-when-done): Doc fixes. The bug affected the exportation of commented subtree: case cannot be ignored when checking for the COMMENT cookie ("Comment" is a frequent word in french, and has a completely different meaning.) --- lisp/ChangeLog | 9 +++++++++ lisp/org-clock.el | 4 ++-- lisp/org-exp.el | 3 ++- lisp/org.el | 4 ++-- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 44e9d58f6..eb3fd6d82 100755 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2008-07-04 Bastien Guerry + + * 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 * org-exp.el (org-get-file-contents) diff --git a/lisp/org-clock.el b/lisp/org-clock.el index 70d4fb956..62d3d589a 100644 --- a/lisp/org-clock.el +++ b/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) diff --git a/lisp/org-exp.el b/lisp/org-exp.el index e14fac78b..119a58201 100644 --- a/lisp/org-exp.el +++ b/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 diff --git a/lisp/org.el b/lisp/org.el index f6140419c..2499976c3 100644 --- a/lisp/org.el +++ b/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)