[Emacs-diffs] /srv/bzr/emacs/trunk r107744: Fix small regressions in Org

[Bastien Guerry]

------------------------------------------------------------
revno: 107744
committer: Bastien Guerry <address@hidden>
branch nick: trunk
timestamp: Tue 2012-04-03 12:28:31 +0200
message:
  Fix small regressions in Org
modified:
  lisp/org/ChangeLog
  lisp/org/org.el

=== modified file 'lisp/org/ChangeLog'
--- a/lisp/org/ChangeLog        2012-04-02 15:42:03 +0000
+++ b/lisp/org/ChangeLog        2012-04-03 10:28:31 +0000
@@ -1,3 +1,9 @@
+2012-04-03  Bastien Guerry  <address@hidden>
+
+       * org.el (org-todo): Fix regression: rename `state' to
+       `org-state'.
+       (org-use-effective-time): Fix group and type.
+
 2012-04-02  Bastien Guerry  <address@hidden>
 
        * org-clock.el (org-clock-out-if-current): Fix regression: rename

=== modified file 'lisp/org/org.el'
--- a/lisp/org/org.el   2012-04-02 15:42:03 +0000
+++ b/lisp/org/org.el   2012-04-03 10:28:31 +0000
@@ -2816,8 +2816,8 @@
 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 @@
                ;; 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)))