" caption "") ""))))))
+ (if caption (concat "\n" caption "
") "")
+ (if org-par-open "\n" ""))))))
+
(defvar org-table-colgroup-info nil)
(defun org-format-table-ascii (lines)
diff -r 5f840f1a34d4 -r 6d71fc980cde lisp/org/org-export-latex.el
--- a/lisp/org/org-export-latex.el Mon Feb 02 20:49:41 2009 +0000
+++ b/lisp/org/org-export-latex.el Mon Feb 02 20:57:14 2009 +0000
@@ -4,7 +4,7 @@
;;
;; Emacs Lisp Archive Entry
;; Filename: org-export-latex.el
-;; Version: 6.20h
+;; Version: 6.21b
;; Author: Bastien Guerry
;; Maintainer: Bastien Guerry
;; Keywords: org, wp, tex
@@ -165,8 +165,8 @@
("/" "\\emph{%s}" nil)
("_" "\\underline{%s}" nil)
("+" "\\texttt{%s}" nil)
- ("=" "\\verb|%s|" nil)
- ("~" "\\verb|%s|" t))
+ ("=" "\\verb=%s=" nil)
+ ("~" "\\verb~%s~" t))
"Alist of LaTeX expressions to convert emphasis fontifiers.
Each element of the list is a list of three elements.
The first element is the character used as a marker for fontification.
diff -r 5f840f1a34d4 -r 6d71fc980cde lisp/org/org-faces.el
--- a/lisp/org/org-faces.el Mon Feb 02 20:49:41 2009 +0000
+++ b/lisp/org/org-faces.el Mon Feb 02 20:57:14 2009 +0000
@@ -6,7 +6,7 @@
;; Author: Carsten Dominik
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 6.20h
+;; Version: 6.21b
;;
;; This file is part of GNU Emacs.
;;
diff -r 5f840f1a34d4 -r 6d71fc980cde lisp/org/org-footnote.el
--- a/lisp/org/org-footnote.el Mon Feb 02 20:49:41 2009 +0000
+++ b/lisp/org/org-footnote.el Mon Feb 02 20:57:14 2009 +0000
@@ -5,7 +5,7 @@
;; Author: Carsten Dominik
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 6.20h
+;; Version: 6.21b
;;
;; This file is part of GNU Emacs.
;;
diff -r 5f840f1a34d4 -r 6d71fc980cde lisp/org/org-gnus.el
--- a/lisp/org/org-gnus.el Mon Feb 02 20:49:41 2009 +0000
+++ b/lisp/org/org-gnus.el Mon Feb 02 20:57:14 2009 +0000
@@ -7,7 +7,7 @@
;; Tassilo Horn
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 6.20h
+;; Version: 6.21b
;;
;; This file is part of GNU Emacs.
;;
diff -r 5f840f1a34d4 -r 6d71fc980cde lisp/org/org-id.el
--- a/lisp/org/org-id.el Mon Feb 02 20:49:41 2009 +0000
+++ b/lisp/org/org-id.el Mon Feb 02 20:57:14 2009 +0000
@@ -5,7 +5,7 @@
;; Author: Carsten Dominik
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 6.20h
+;; Version: 6.21b
;;
;; This file is part of GNU Emacs.
;;
diff -r 5f840f1a34d4 -r 6d71fc980cde lisp/org/org-info.el
--- a/lisp/org/org-info.el Mon Feb 02 20:49:41 2009 +0000
+++ b/lisp/org/org-info.el Mon Feb 02 20:57:14 2009 +0000
@@ -6,7 +6,7 @@
;; Author: Carsten Dominik
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 6.20h
+;; Version: 6.21b
;;
;; This file is part of GNU Emacs.
;;
diff -r 5f840f1a34d4 -r 6d71fc980cde lisp/org/org-irc.el
--- a/lisp/org/org-irc.el Mon Feb 02 20:49:41 2009 +0000
+++ b/lisp/org/org-irc.el Mon Feb 02 20:57:14 2009 +0000
@@ -4,7 +4,7 @@
;;
;; Author: Philip Jackson
;; Keywords: erc, irc, link, org
-;; Version: 6.20h
+;; Version: 6.21b
;;
;; This file is part of GNU Emacs.
;;
diff -r 5f840f1a34d4 -r 6d71fc980cde lisp/org/org-jsinfo.el
--- a/lisp/org/org-jsinfo.el Mon Feb 02 20:49:41 2009 +0000
+++ b/lisp/org/org-jsinfo.el Mon Feb 02 20:57:14 2009 +0000
@@ -6,7 +6,7 @@
;; Author: Carsten Dominik
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 6.20h
+;; Version: 6.21b
;;
;; This file is part of GNU Emacs.
;;
diff -r 5f840f1a34d4 -r 6d71fc980cde lisp/org/org-list.el
--- a/lisp/org/org-list.el Mon Feb 02 20:49:41 2009 +0000
+++ b/lisp/org/org-list.el Mon Feb 02 20:57:14 2009 +0000
@@ -7,7 +7,7 @@
;; Bastien Guerry
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 6.20h
+;; Version: 6.21b
;;
;; This file is part of GNU Emacs.
;;
diff -r 5f840f1a34d4 -r 6d71fc980cde lisp/org/org-mac-message.el
--- a/lisp/org/org-mac-message.el Mon Feb 02 20:49:41 2009 +0000
+++ b/lisp/org/org-mac-message.el Mon Feb 02 20:57:14 2009 +0000
@@ -3,7 +3,7 @@
;; Copyright (C) 2008, 2009 Free Software Foundation, Inc.
;; Author: John Wiegley
-;; Version: 6.20h
+;; Version: 6.21b
;; Keywords: outlines, hypermedia, calendar, wp
;; This file is part of GNU Emacs.
diff -r 5f840f1a34d4 -r 6d71fc980cde lisp/org/org-macs.el
--- a/lisp/org/org-macs.el Mon Feb 02 20:49:41 2009 +0000
+++ b/lisp/org/org-macs.el Mon Feb 02 20:57:14 2009 +0000
@@ -6,7 +6,7 @@
;; Author: Carsten Dominik
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 6.20h
+;; Version: 6.21b
;;
;; This file is part of GNU Emacs.
;;
diff -r 5f840f1a34d4 -r 6d71fc980cde lisp/org/org-mew.el
--- a/lisp/org/org-mew.el Mon Feb 02 20:49:41 2009 +0000
+++ b/lisp/org/org-mew.el Mon Feb 02 20:57:14 2009 +0000
@@ -5,7 +5,7 @@
;; Author: Tokuya Kameshima
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 6.20h
+;; Version: 6.21b
;; This file is part of GNU Emacs.
diff -r 5f840f1a34d4 -r 6d71fc980cde lisp/org/org-mhe.el
--- a/lisp/org/org-mhe.el Mon Feb 02 20:49:41 2009 +0000
+++ b/lisp/org/org-mhe.el Mon Feb 02 20:57:14 2009 +0000
@@ -6,7 +6,7 @@
;; Author: Thomas Baumann
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 6.20h
+;; Version: 6.21b
;;
;; This file is part of GNU Emacs.
;;
diff -r 5f840f1a34d4 -r 6d71fc980cde lisp/org/org-mouse.el
--- a/lisp/org/org-mouse.el Mon Feb 02 20:49:41 2009 +0000
+++ b/lisp/org/org-mouse.el Mon Feb 02 20:57:14 2009 +0000
@@ -4,7 +4,7 @@
;;
;; Author: Piotr Zielinski
;; Maintainer: Carsten Dominik
-;; Version: 6.20h
+;; Version: 6.21b
;;
;; This file is part of GNU Emacs.
;;
diff -r 5f840f1a34d4 -r 6d71fc980cde lisp/org/org-plot.el
--- a/lisp/org/org-plot.el Mon Feb 02 20:49:41 2009 +0000
+++ b/lisp/org/org-plot.el Mon Feb 02 20:57:14 2009 +0000
@@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Keywords: tables, plotting
;; Homepage: http://orgmode.org
-;; Version: 6.20h
+;; Version: 6.21b
;;
;; This file is part of GNU Emacs.
;;
diff -r 5f840f1a34d4 -r 6d71fc980cde lisp/org/org-publish.el
--- a/lisp/org/org-publish.el Mon Feb 02 20:49:41 2009 +0000
+++ b/lisp/org/org-publish.el Mon Feb 02 20:57:14 2009 +0000
@@ -4,7 +4,7 @@
;; Author: David O'Toole
;; Maintainer: Bastien Guerry
;; Keywords: hypermedia, outlines, wp
-;; Version: 6.20h
+;; Version: 6.21b
;; This file is part of GNU Emacs.
;;
diff -r 5f840f1a34d4 -r 6d71fc980cde lisp/org/org-remember.el
--- a/lisp/org/org-remember.el Mon Feb 02 20:49:41 2009 +0000
+++ b/lisp/org/org-remember.el Mon Feb 02 20:57:14 2009 +0000
@@ -6,7 +6,7 @@
;; Author: Carsten Dominik
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 6.20h
+;; Version: 6.21b
;;
;; This file is part of GNU Emacs.
;;
diff -r 5f840f1a34d4 -r 6d71fc980cde lisp/org/org-rmail.el
--- a/lisp/org/org-rmail.el Mon Feb 02 20:49:41 2009 +0000
+++ b/lisp/org/org-rmail.el Mon Feb 02 20:57:14 2009 +0000
@@ -6,7 +6,7 @@
;; Author: Carsten Dominik
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 6.20h
+;; Version: 6.21b
;;
;; This file is part of GNU Emacs.
;;
diff -r 5f840f1a34d4 -r 6d71fc980cde lisp/org/org-table.el
--- a/lisp/org/org-table.el Mon Feb 02 20:49:41 2009 +0000
+++ b/lisp/org/org-table.el Mon Feb 02 20:57:14 2009 +0000
@@ -6,7 +6,7 @@
;; Author: Carsten Dominik
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 6.20h
+;; Version: 6.21b
;;
;; This file is part of GNU Emacs.
;;
diff -r 5f840f1a34d4 -r 6d71fc980cde lisp/org/org-timer.el
--- a/lisp/org/org-timer.el Mon Feb 02 20:49:41 2009 +0000
+++ b/lisp/org/org-timer.el Mon Feb 02 20:57:14 2009 +0000
@@ -5,7 +5,7 @@
;; Author: Carsten Dominik
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 6.20h
+;; Version: 6.21b
;;
;; This file is part of GNU Emacs.
;;
diff -r 5f840f1a34d4 -r 6d71fc980cde lisp/org/org-vm.el
--- a/lisp/org/org-vm.el Mon Feb 02 20:49:41 2009 +0000
+++ b/lisp/org/org-vm.el Mon Feb 02 20:57:14 2009 +0000
@@ -6,7 +6,7 @@
;; Author: Carsten Dominik
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 6.20h
+;; Version: 6.21b
;;
;; This file is part of GNU Emacs.
;;
diff -r 5f840f1a34d4 -r 6d71fc980cde lisp/org/org-w3m.el
--- a/lisp/org/org-w3m.el Mon Feb 02 20:49:41 2009 +0000
+++ b/lisp/org/org-w3m.el Mon Feb 02 20:57:14 2009 +0000
@@ -5,7 +5,7 @@
;; Author: Andy Stewart
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 6.20h
+;; Version: 6.21b
;;
;; This file is part of GNU Emacs.
;;
diff -r 5f840f1a34d4 -r 6d71fc980cde lisp/org/org-wl.el
--- a/lisp/org/org-wl.el Mon Feb 02 20:49:41 2009 +0000
+++ b/lisp/org/org-wl.el Mon Feb 02 20:57:14 2009 +0000
@@ -6,7 +6,7 @@
;; Author: Tokuya Kameshima
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 6.20h
+;; Version: 6.21b
;;
;; This file is part of GNU Emacs.
;;
diff -r 5f840f1a34d4 -r 6d71fc980cde lisp/org/org.el
--- a/lisp/org/org.el Mon Feb 02 20:49:41 2009 +0000
+++ b/lisp/org/org.el Mon Feb 02 20:57:14 2009 +0000
@@ -6,7 +6,7 @@
;; Author: Carsten Dominik
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 6.20h
+;; Version: 6.21b
;;
;; This file is part of GNU Emacs.
;;
@@ -94,7 +94,7 @@
;;; Version
-(defconst org-version "6.20h"
+(defconst org-version "6.21b"
"The version number of the file org.el.")
(defun org-version (&optional here)
@@ -689,7 +689,7 @@
:group 'org-edit-structure
:type 'boolean)
-(defcustom org-yank-adjusted-subtrees t
+(defcustom org-yank-adjusted-subtrees nil
"Non-nil means, when yanking subtrees, adjust the level.
With this setting, `org-paste-subtree' is used to insert the subtree, see
this function for details."
@@ -1113,7 +1113,7 @@
:group 'org-link-follow
:type 'boolean)
-(defcustom org-return-follows-link nil
+(defcustom org-return-follows-link t
"Non-nil means, on links RET will follow the link.
Needs to be set before org.el is loaded."
:group 'org-link-follow
@@ -1565,7 +1565,7 @@
:type '(choice (const sequence)
(const type)))
-(defcustom org-use-fast-todo-selection 'prefix
+(defcustom org-use-fast-todo-selection t
"Non-nil means, use the fast todo selection scheme with C-c C-t.
This variable describes if and under what circumstances the cycling
mechanism for TODO keywords will be replaced by a single-key, direct
@@ -1636,8 +1636,9 @@
"Non-nil means, undone TODO entries will block switching the parent to DONE.
Also, if a parent has an :ORDERED: property, switching an entry to DONE will
be blocked if any prior sibling is not yet done.
-You need to set this variable through the customize interface, or to
-restart emacs after changing the value."
+This variable needs to be set before org.el is loaded, and you need to
+restart Emacs after a change to make the change effective. The only way
+to change is while Emacs is running is through the customize interface."
:set (lambda (var val)
(set var val)
(if val
@@ -1653,8 +1654,9 @@
When this is nil, checkboxes have no influence on switching TODO states.
When non-nil, you first need to check off all check boxes before the TODO
entry can be switched to DONE.
-You need to set this variable through the customize interface, or to
-restart emacs after changing the value."
+This variable needs to be set before org.el is loaded, and you need to
+restart Emacs after a change to make the change effective. The only way
+to change is while Emacs is running is through the customize interface."
:set (lambda (var val)
(set var val)
(if val
@@ -2043,7 +2045,7 @@
"Non-nil means, fast tags selection interface will also offer TODO states.
This is an undocumented feature, you should not rely on it.")
-(defcustom org-tags-column (if (featurep 'xemacs) -79 -80)
+(defcustom org-tags-column (if (featurep 'xemacs) -76 -77)
"The column to which tags should be indented in a headline.
If this number is positive, it specifies the column. If it is negative,
it means that the tags should be flushright to that column. For example,
@@ -3595,6 +3597,18 @@
(org-set-autofill-regexps)
(setq indent-line-function 'org-indent-line-function)
(org-update-radio-target-regexp)
+ ;; Make sure dependence stuff works reliably, even for users who set it
+ ;; too late :-(
+ (if org-enforce-todo-dependencies
+ (add-hook 'org-blocker-hook
+ 'org-block-todo-from-children-or-siblings)
+ (remove-hook 'org-blocker-hook
+ 'org-block-todo-from-children-or-siblings))
+ (if org-enforce-todo-checkbox-dependencies
+ (add-hook 'org-blocker-hook
+ 'org-block-todo-from-checkboxes)
+ (remove-hook 'org-blocker-hook
+ 'org-block-todo-from-checkboxes))
;; Comment characters
; (org-set-local 'comment-start "#") ;; FIXME: this breaks wrapping
@@ -8631,13 +8645,14 @@
"Update any statistics cookie in the parent of the current headline."
(interactive)
(let ((box-re "\\(\\(\\[[0-9]*%\\]\\)\\|\\(\\[[0-9]*/[0-9]*\\]\\)\\)")
- level (cnt-all 0) (cnt-done 0) is-percent kwd)
+ level (cnt-all 0) (cnt-done 0) is-percent kwd cookie-present)
(catch 'exit
(save-excursion
(setq level (org-up-heading-safe))
(unless level
(throw 'exit nil))
(while (re-search-forward box-re (point-at-eol) t)
+ (setq cnt-all 0 cnt-done 0 cookie-present t)
(setq is-percent (match-end 2))
(save-match-data
(unless (outline-next-heading) (throw 'exit nil))
@@ -8653,8 +8668,9 @@
(if is-percent
(format "[%d%%]" (/ (* 100 cnt-done) (max 1 cnt-all)))
(format "[%d/%d]" cnt-done cnt-all))))
- (run-hook-with-args 'org-after-todo-statistics-hook
- cnt-done (- cnt-all cnt-done))))))
+ (when cookie-present
+ (run-hook-with-args 'org-after-todo-statistics-hook
+ cnt-done (- cnt-all cnt-done)))))))
(defvar org-after-todo-statistics-hook nil
"Hook that is called after a TODO statistics cookie has been updated.