mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-08-22 08:48:30 +00:00
Code Releases Activity

Merge branch 'hotfix'

Browse source 
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
\"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.