ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hotfix' 

Conflicts:
	lisp/org.el
This commit is contained in:
Bastien Guerry 2012-04-03 09:46:34 +02:00
parent 3b04635542 a8c6802345
commit 2da8a36229
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/org.el
View File

@ -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 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 \"effective time\" of any timestamps between midnight and 8am will be
23:59 of the previous day." 23:59 of the previous day."
:group 'boolean :group 'org-time
:version "24.1" :type 'boolean)
:type 'integer)
(defcustom org-edit-timestamp-down-means-later nil (defcustom org-edit-timestamp-down-means-later nil
"Non-nil means S-down will increase the time in a time stamp. "Non-nil means S-down will increase the time in a time stamp.