diff options
| author | Bastien Guerry <bastien1@free.fr> | 2012-04-03 12:28:31 +0200 |
|---|---|---|
| committer | Bastien Guerry <bastien1@free.fr> | 2012-04-03 12:28:31 +0200 |
| commit | 5c7ac47249bc16f6efc3085bc72a2d519ae1d834 (patch) | |
| tree | f31db123d8adebfcbef7b8ecd16d8ca0c4a9d71c /lisp/org | |
| parent | 529c06b6cbcd4081671cd1fd9e0bd0ecd84feac2 (diff) | |
| download | emacs-5c7ac47249bc16f6efc3085bc72a2d519ae1d834.tar.gz | |
Fix small regressions in Org
Diffstat (limited to 'lisp/org')
| -rw-r--r-- | lisp/org/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/org/org.el | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index 8c06c22c4af..618d5753a46 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -1,3 +1,9 @@ +2012-04-03 Bastien Guerry <bzg@gnu.org> + + * org.el (org-todo): Fix regression: rename `state' to + `org-state'. + (org-use-effective-time): Fix group and type. + 2012-04-02 Bastien Guerry <bzg@gnu.org> * org-clock.el (org-clock-out-if-current): Fix regression: rename diff --git a/lisp/org/org.el b/lisp/org/org.el index 59b8e3f0391..38d4f705742 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -2816,8 +2816,8 @@ be the favorite working time of John Wiegley :-)" For example, if `org-extend-today-until' is 8, and it's 4am, then the \"effective time\" of any timestamps between midnight and 8am will be 23:59 of the previous day." - :group 'boolean - :type 'integer) + :group 'org-time + :type 'boolean) (defcustom org-edit-timestamp-down-means-later nil "Non-nil means S-down will increase the time in a time stamp. @@ -11380,7 +11380,7 @@ For calling through lisp, arg is also interpreted in the following way: ;; It is now done, and it was not done before (org-add-planning-info 'closed (org-current-effective-time)) (if (and (not dolog) (eq 'note org-log-done)) - (org-add-log-setup 'done state this 'findpos 'note))) + (org-add-log-setup 'done org-state this 'findpos 'note))) (when (and org-state dolog) ;; This is a non-nil state, and we need to log it (org-add-log-setup 'state org-state this 'findpos dolog))) |