mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-26 07:33:39 +00:00
Code

Backport commit 9c3883b from Emacs master branch

Browse Source 
* lisp/org-mouse.el (org-mouse-do-remotely): Prefer point-marker to
  copy-marker of point.
* lisp/ob-core.el (org-babel-insert-result): Prefer point-min-marker and
  point-max-marker.

Conflicts:
  lisp/org-mouse.el
This commit is contained in:
Dmitry Antipov 2014-06-22 09:43:58 +04:00 committed by Kyle Meyer
parent fcce57324d
commit d77b7c6c7b
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/ob-core.el
View File

@ -2043,8 +2043,8 @@ code ---- the results are extracted in the syntax of the source
t info hash indent)))
(results-switches
(cdr (assoc :results_switches (nth 2 info))))
(visible-beg (copy-marker (point-min)))
(visible-end (copy-marker (point-max)))
(visible-beg (point-min-marker))
(visible-end (point-max-marker))
;; When results exist outside of the current visible
;; region of the buffer, be sure to widen buffer to
;; update them.

4
lisp/org-mouse.el
View File

@ -1008,7 +1008,7 @@ This means, between the beginning of line and the point."
(let ((endmarker (with-current-buffer buffer
(org-end-of-subtree nil t)
(unless (eobp) (forward-char 1))
(copy-marker (point)))))
(point-marker))))
(org-with-remote-undo buffer
(with-current-buffer buffer
(widen)
@ -1018,7 +1018,7 @@ This means, between the beginning of line and the point."
(and (outline-next-heading)
(org-flag-heading nil))) ; show the next heading
(org-back-to-heading)
(setq marker (copy-marker (point)))
(setq marker (point-marker))
(goto-char (max (point-at-bol) (- (point-at-eol) anticol)))
(funcall command)
(message "_cmd: %S" org-mouse-cmd)

4
lisp/org-table.el
View File

@ -3183,9 +3183,9 @@ with the prefix ARG."
(save-excursion
;; Insert a temporary formula at right after the table
(goto-char (org-table-TBLFM-begin))
(setq s (set-marker (make-marker) (point)))
(setq s (point-marker))
(insert (concat formula "\n"))
(setq e (set-marker (make-marker) (point)))
(setq e (point-marker))
;; Recalculate the table
(beginning-of-line 0) ; move to the inserted line
(skip-chars-backward " \r\n\t")