summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2011-07-21 12:28:43 +0200
committerBastien Guerry <bzg@altern.org>2011-07-21 12:28:43 +0200
commit26b084d3b540dfb01b439a78c6b53185b8d1d6c8 (patch)
tree4bdcd357a6e10392e363a2b6e24526b3b9f0d689
parent0625a74b085d08fdd1e1fabfb8da094d15eb9652 (diff)
parentfd0f8e10d1d3a339da9460d6c71283e85897c455 (diff)
downloadorg-mode-26b084d3b540dfb01b439a78c6b53185b8d1d6c8.tar.gz
Merge branch 'master' of orgmode.org:org-mode
-rw-r--r--lisp/org.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/org.el b/lisp/org.el
index 58aeb73..496e9aa 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -15567,7 +15567,7 @@ With prefix ARG, change that many days."
The date will be changed by N times WHAT. WHAT can be `day', `month',
`year', `minute', `second'. If WHAT is not given, the cursor position
in the timestamp determines what will be changed."
- (let ((pos (point))
+ (let ((pos (copy-marker (point)))
with-hm inactive
(dm (max (nth 1 org-time-stamp-rounding-minutes) 1))
org-ts-what
@@ -15631,6 +15631,7 @@ in the timestamp determines what will be changed."
(org-insert-time-stamp time with-hm inactive nil nil extra))
(org-clock-update-time-maybe)
(goto-char pos)
+ (move-marker pos nil)
;; Try to recenter the calendar window, if any
(if (and org-calendar-follow-timestamp-change
(get-buffer-window "*Calendar*" t)