|
@@ -4664,8 +4664,6 @@ With numerical argument N, show content up to level N."
|
|
|
This function is the default value of the hook `org-cycle-hook'."
|
|
|
(when (get-buffer-window (current-buffer))
|
|
|
(cond
|
|
|
-; ((eq state 'overview) (org-first-headline-recenter 1))
|
|
|
-; ((eq state 'overview) (org-beginning-of-line))
|
|
|
((eq state 'content) nil)
|
|
|
((eq state 'all) nil)
|
|
|
((eq state 'folded) nil)
|
|
@@ -4886,7 +4884,7 @@ or nil."
|
|
|
(goto-char org-goto-start-pos)
|
|
|
(and (org-invisible-p) (org-show-context)))
|
|
|
(goto-char (point-min)))
|
|
|
- (org-beginning-of-line)
|
|
|
+ (let (org-special-ctrl-a/e) (org-beginning-of-line))
|
|
|
(message "Select location and press RET")
|
|
|
(use-local-map org-goto-map)
|
|
|
(recursive-edit)
|
|
@@ -14953,14 +14951,16 @@ beyond the end of the headline."
|
|
|
(interactive "P")
|
|
|
(let ((pos (point)) refpos)
|
|
|
(beginning-of-line 1)
|
|
|
- (if (bobp)
|
|
|
- nil
|
|
|
- (backward-char 1)
|
|
|
- (if (org-invisible-p)
|
|
|
- (while (and (not (bobp)) (org-invisible-p))
|
|
|
- (backward-char 1)
|
|
|
- (beginning-of-line 1))
|
|
|
- (forward-char 1)))
|
|
|
+ (if (and arg (fboundp 'move-beginning-of-line))
|
|
|
+ (call-interactively 'move-beginning-of-line)
|
|
|
+ (if (bobp)
|
|
|
+ nil
|
|
|
+ (backward-char 1)
|
|
|
+ (if (org-invisible-p)
|
|
|
+ (while (and (not (bobp)) (org-invisible-p))
|
|
|
+ (backward-char 1)
|
|
|
+ (beginning-of-line 1))
|
|
|
+ (forward-char 1))))
|
|
|
(when org-special-ctrl-a/e
|
|
|
(cond
|
|
|
((and (looking-at org-complex-heading-regexp)
|
|
@@ -14994,8 +14994,11 @@ first attempt, and only move to after the tags when the cursor is already
|
|
|
beyond the end of the headline."
|
|
|
(interactive "P")
|
|
|
(if (or (not org-special-ctrl-a/e)
|
|
|
- (not (org-on-heading-p)))
|
|
|
- (end-of-line arg)
|
|
|
+ (not (org-on-heading-p))
|
|
|
+ arg)
|
|
|
+ (call-interactively (if (fboundp 'move-end-of-line)
|
|
|
+ 'move-end-of-line
|
|
|
+ 'end-of-line))
|
|
|
(let ((pos (point)))
|
|
|
(beginning-of-line 1)
|
|
|
(if (looking-at (org-re ".*?\\([ \t]*\\)\\(:[[:alnum:]_@:]+:\\)[ \t]*$"))
|
|
@@ -15007,7 +15010,9 @@ beyond the end of the headline."
|
|
|
(if (or (< pos (match-end 0)) (not (eq this-command last-command)))
|
|
|
(goto-char (match-end 0))
|
|
|
(goto-char (match-beginning 1))))
|
|
|
- (end-of-line arg))))
|
|
|
+ (call-interactively (if (fboundp 'move-end-of-line)
|
|
|
+ 'move-end-of-line
|
|
|
+ 'end-of-line)))))
|
|
|
(org-no-warnings
|
|
|
(and (featurep 'xemacs) (setq zmacs-region-stays t))))
|
|
|
|