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

org.el: Don't advise `outline-end-of-subtree'

Browse source 
* org.el (org-move-subtree-down): Use `org-end-of-subtree'
instead of `outline-end-of-subtree'.
(outline-end-of-subtree): Remove advice.

* org-mouse.el (org-mouse-move-tree, org-mouse-do-remotely):
Use `org-end-of-subtree' instead of `outline-end-of-subtree'.
This commit is contained in:
Bastien Guerry 2014-05-23 13:11:57 +02:00
parent 54f4d2f4a4
commit fe0057556b
2 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lisp/org-mouse.el
View file

@ -953,20 +953,23 @@ This means, between the beginning of line and the point."
(point) (point)
(save-excursion (goto-char start) (save-excursion (goto-char start)
(org-back-to-heading) (point)))) (org-back-to-heading) (point))))
(outline-end-of-subtree) (progn (org-end-of-subtree nil t)
(unless (eobp) (backward-char)))
(end-of-line) (end-of-line)
(if (eobp) (newline) (forward-char))) (if (eobp) (newline) (forward-char)))
(when (looking-at org-outline-regexp) (when (looking-at org-outline-regexp)
(let ((level (- (match-end 0) (match-beginning 0)))) (let ((level (- (match-end 0) (match-beginning 0))))
(when (> end (match-end 0)) (when (> end (match-end 0))
(outline-end-of-subtree) (progn (org-end-of-subtree nil t)
(unless (eobp) (backward-char)))
(end-of-line) (end-of-line)
(if (eobp) (newline) (forward-char)) (if (eobp) (newline) (forward-char))
(setq level (1+ level))) (setq level (1+ level)))
(org-paste-subtree level) (org-paste-subtree level)
(save-excursion (save-excursion
(outline-end-of-subtree) (progn (org-end-of-subtree nil t)
(unless (eobp) (backward-char)))
(when (bolp) (delete-char -1)))))))))) (when (bolp) (delete-char -1))))))))))
@ -1003,8 +1006,8 @@ This means, between the beginning of line and the point."
(org-mouse-main-buffer (current-buffer))) (org-mouse-main-buffer (current-buffer)))
(when (eq (with-current-buffer buffer major-mode) 'org-mode) (when (eq (with-current-buffer buffer major-mode) 'org-mode)
(let ((endmarker (with-current-buffer buffer (let ((endmarker (with-current-buffer buffer
(outline-end-of-subtree) (org-end-of-subtree nil t)
(forward-char 1) (unless (eobp) (forward-char 1))
(copy-marker (point))))) (copy-marker (point)))))
(org-with-remote-undo buffer (org-with-remote-undo buffer
(with-current-buffer buffer (with-current-buffer buffer

11
lisp/org.el
View file

@ -8159,7 +8159,8 @@ case."
(save-match-data (save-match-data
(save-excursion (outline-end-of-heading) (save-excursion (outline-end-of-heading)
(setq folded (outline-invisible-p))) (setq folded (outline-invisible-p)))
(outline-end-of-subtree)) (progn (org-end-of-subtree nil t)
(unless (eobp) (backward-char))))
(outline-next-heading) (outline-next-heading)
(setq ne-end (org-back-over-empty-lines)) (setq ne-end (org-back-over-empty-lines))
(setq end (point)) (setq end (point))
@ -23285,14 +23286,6 @@ If there is no such heading, return nil."
(forward-char -1)))))) (forward-char -1))))))
(point)) (point))
(defadvice outline-end-of-subtree (around prefer-org-version activate compile)
"Use Org version in org-mode, for dramatic speed-up."
(if (derived-mode-p 'org-mode)
(progn
(org-end-of-subtree nil t)
(unless (eobp) (backward-char 1)))
ad-do-it))
(defun org-end-of-meta-data-and-drawers () (defun org-end-of-meta-data-and-drawers ()
"Jump to the first text after meta data and drawers in the current entry. "Jump to the first text after meta data and drawers in the current entry.
This will move over empty lines, lines with planning time stamps, This will move over empty lines, lines with planning time stamps,