Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2013-01-01 23:49:16 +01:00
commit fb8ba17e69
1 changed files with 2 additions and 2 deletions

View File

@ -18485,7 +18485,7 @@ BEG and END default to the buffer boundaries."
("c" . org-cycle)
("C" . org-shifttab)
(" " . org-display-outline-path)
(":" . org-columns)
("=" . org-columns)
("Outline Structure Editing")
("U" . org-shiftmetaup)
("D" . org-shiftmetadown)
@ -18510,7 +18510,7 @@ BEG and END default to the buffer boundaries."
("1" . (org-priority ?A))
("2" . (org-priority ?B))
("3" . (org-priority ?C))
(";" . org-set-tags-command)
(":" . org-set-tags-command)
("e" . org-set-effort)
("E" . org-inc-effort)
("W" . (lambda(m) (interactive "sMinutes before warning: ")