ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2014-06-12 12:05:00 +02:00
parent 39d0433637 30220ffcdc
commit 4014947f31
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lisp/org-agenda.el
View File

@ -8660,7 +8660,8 @@ if it was hidden in the outline."
(interactive "p") (interactive "p")
(let ((win (selected-window))) (let ((win (selected-window)))
(org-agenda-goto t) (org-agenda-goto t)
(org-recenter-heading 1) (org-back-to-heading)
(set-window-start (selected-window) (point-at-bol))
(cond (cond
((= more 0) ((= more 0)
(hide-subtree) (hide-subtree)
@ -8694,11 +8695,6 @@ if it was hidden in the outline."
(message "Remote: SUBTREE AND ALL DRAWERS"))) (message "Remote: SUBTREE AND ALL DRAWERS")))
(select-window win))) (select-window win)))
(defun org-recenter-heading (n)
(save-excursion
(org-back-to-heading)
(recenter n)))
(defvar org-agenda-cycle-counter nil) (defvar org-agenda-cycle-counter nil)
(defun org-agenda-cycle-show (&optional n) (defun org-agenda-cycle-show (&optional n)
"Show the current entry in another window, with default settings. "Show the current entry in another window, with default settings.

5
lisp/org-table.el
View File

@ -3935,9 +3935,10 @@ With prefix ARG, apply the new formulas to the table."
(push org-table-current-begin-pos org-show-positions) (push org-table-current-begin-pos org-show-positions)
(let ((min (apply 'min org-show-positions)) (let ((min (apply 'min org-show-positions))
(max (apply 'max org-show-positions))) (max (apply 'max org-show-positions)))
(goto-char min) (recenter 0) (set-window-start (selected-window) (point-min))
(goto-char max) (goto-char max)
(or (pos-visible-in-window-p max) (recenter -1)))) (or (pos-visible-in-window-p max)
(set-window-start (selected-window) (point-max)))))
(select-window win)))) (select-window win))))
(defun org-table-force-dataline () (defun org-table-force-dataline ()

11
lisp/org.el
View File

@ -5575,7 +5575,8 @@ The following commands are available:
:parents (list text-mode-abbrev-table))) :parents (list text-mode-abbrev-table)))
(defsubst org-fix-ellipsis-at-bol () (defsubst org-fix-ellipsis-at-bol ()
(save-excursion (goto-char (window-start)) (recenter 0))) (save-excursion
(set-window-start (selected-window) (point-min))))
(defun org-find-invisible-foreground () (defun org-find-invisible-foreground ()
(let ((candidates (remove (let ((candidates (remove
@ -7245,13 +7246,11 @@ show that drawer instead."
(pos-visible-in-window-p (pos-visible-in-window-p
(save-excursion (org-end-of-subtree t) (point)))) (save-excursion (org-end-of-subtree t) (point))))
(defun org-first-headline-recenter (&optional N) (defun org-first-headline-recenter ()
"Move cursor to the first headline and recenter the headline. "Move cursor to the first headline and recenter the headline."
Optional argument N means put the headline into the Nth line of the window."
(goto-char (point-min)) (goto-char (point-min))
(when (re-search-forward (concat "^\\(" org-outline-regexp "\\)") nil t) (when (re-search-forward (concat "^\\(" org-outline-regexp "\\)") nil t)
(beginning-of-line) (set-window-start (selected-window) (point-at-bol))))
(recenter (prefix-numeric-value N))))
;;; Saving and restoring visibility ;;; Saving and restoring visibility