mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-08-22 08:48:30 +00:00
Merge branch 'hotfix'
Conflicts: lisp/org.el
This commit is contained in:
commit
2da8a36229
|
@ -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.
|
||||
|
|
Loading…
Reference in a new issue