tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2014-01-03 17:38:19 +01:00
parent 62375dc3e5 bee871762c
commit 914f3f88a7
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lisp/org.el
View File

@ -20148,21 +20148,19 @@ Depending on context, this does one of the following:
"Change timestamps synchronously up in CLOCK log lines. "Change timestamps synchronously up in CLOCK log lines.
Optional argument N tells to change by that many units." Optional argument N tells to change by that many units."
(interactive "P") (interactive "P")
(cond ((and (not org-support-shift-select) (if (and (org-at-clock-log-p) (org-at-timestamp-p t))
(org-at-clock-log-p) (let (org-support-shift-select)
(org-at-timestamp-p t)) (org-clock-timestamps-up n))
(org-clock-timestamps-up n)) (user-error "Not at a clock log")))
(t (org-shiftselect-error))))
(defun org-shiftcontroldown (&optional n) (defun org-shiftcontroldown (&optional n)
"Change timestamps synchronously down in CLOCK log lines. "Change timestamps synchronously down in CLOCK log lines.
Optional argument N tells to change by that many units." Optional argument N tells to change by that many units."
(interactive "P") (interactive "P")
(cond ((and (not org-support-shift-select) (if (and (org-at-clock-log-p) (org-at-timestamp-p t))
(org-at-clock-log-p) (let (org-support-shift-select)
(org-at-timestamp-p t)) (org-clock-timestamps-down n))
(org-clock-timestamps-down n)) (user-error "Not at a clock log")))
(t (org-shiftselect-error))))
(defun org-ctrl-c-ret () (defun org-ctrl-c-ret ()
"Call `org-table-hline-and-move' or `org-insert-heading' dep. on context." "Call `org-table-hline-and-move' or `org-insert-heading' dep. on context."