mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 12:21:25 -08:00
Code Issues Projects Releases Wiki Activity

Fix small regressions in Org

Browse source
This commit is contained in:
Bastien Guerry 2012-04-03 12:28:31 +02:00
parent 529c06b6cb
commit 5c7ac47249
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/org/ChangeLog
View file

@ -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

6
lisp/org/org.el
View file

@ -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)))