Ver código fonte

Merge branch 'hotfix'

Conflicts:
	lisp/org.el
Bastien Guerry 13 anos atrás
pai
commit
2da8a36229
1 arquivos alterados com 2 adições e 3 exclusões
  1. 2 3
      lisp/org.el

+ 2 - 3
lisp/org.el

@@ -2841,9 +2841,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
-  :version "24.1"
-  :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.