Commit 7b96ff9a authored by Carsten Dominik's avatar Carsten Dominik
Browse files

2009-02-19 Carsten Dominik <dominik@science.uva.nl>

	* org.el (org-block-todo-from-children-or-siblings): Use
	`org-up-heading-all' so that this will work correctly with hidden
	property drawers and entries.
	(org-end-of-line, org-beginning-of-line): Make prefix arg work, by
	falling back to normal, default command.
	(org-get-location): Temporarily turn off special behavior.
parent 8fca0544
2009-02-19 Carsten Dominik <dominik@science.uva.nl>
* org.el (org-block-todo-from-children-or-siblings): Use
`org-up-heading-all' so that this will work correctly with hidden
property drawers and entries.
(org-end-of-line, org-beginning-of-line): Make prefix arg work, by
falling back to normal, default command.
(org-get-location): Temporarily turn off special behavior.
2009-02-13 Glenn Morris <rgm@gnu.org> 2009-02-13 Glenn Morris <rgm@gnu.org>
* org-rmail.el (rmail-show-message): Restore argument list to the * org-rmail.el (rmail-show-message): Restore argument list to the
......
...@@ -4812,7 +4812,7 @@ or nil." ...@@ -4812,7 +4812,7 @@ or nil."
(goto-char org-goto-start-pos) (goto-char org-goto-start-pos)
(and (org-invisible-p) (org-show-context))) (and (org-invisible-p) (org-show-context)))
(goto-char (point-min))) (goto-char (point-min)))
(org-beginning-of-line) (let (org-special-ctrl-a/e) (org-beginning-of-line))
(message "Select location and press RET") (message "Select location and press RET")
(use-local-map org-goto-map) (use-local-map org-goto-map)
(recursive-edit) (recursive-edit)
...@@ -8588,7 +8588,7 @@ changes. Such blocking occurs when: ...@@ -8588,7 +8588,7 @@ changes. Such blocking occurs when:
(org-back-to-heading t) (org-back-to-heading t)
(when (save-excursion (when (save-excursion
(ignore-errors (ignore-errors
(outline-up-heading 1) (org-up-heading-all 1)
(org-entry-get (point) "ORDERED"))) (org-entry-get (point) "ORDERED")))
(let* ((this-level (funcall outline-level)) (let* ((this-level (funcall outline-level))
(current-level this-level)) (current-level this-level))
...@@ -14697,14 +14697,16 @@ beyond the end of the headline." ...@@ -14697,14 +14697,16 @@ beyond the end of the headline."
(interactive "P") (interactive "P")
(let ((pos (point)) refpos) (let ((pos (point)) refpos)
(beginning-of-line 1) (beginning-of-line 1)
(if (bobp) (if (and arg (fboundp 'move-beginning-of-line))
nil (call-interactively 'move-beginning-of-line)
(backward-char 1) (if (bobp)
(if (org-invisible-p) nil
(while (and (not (bobp)) (org-invisible-p)) (backward-char 1)
(backward-char 1) (if (org-invisible-p)
(beginning-of-line 1)) (while (and (not (bobp)) (org-invisible-p))
(forward-char 1))) (backward-char 1)
(beginning-of-line 1))
(forward-char 1))))
(when org-special-ctrl-a/e (when org-special-ctrl-a/e
(cond (cond
((and (looking-at org-complex-heading-regexp) ((and (looking-at org-complex-heading-regexp)
...@@ -14738,8 +14740,11 @@ first attempt, and only move to after the tags when the cursor is already ...@@ -14738,8 +14740,11 @@ first attempt, and only move to after the tags when the cursor is already
beyond the end of the headline." beyond the end of the headline."
(interactive "P") (interactive "P")
(if (or (not org-special-ctrl-a/e) (if (or (not org-special-ctrl-a/e)
(not (org-on-heading-p))) (not (org-on-heading-p))
(end-of-line arg) arg)
(call-interactively (if (fboundp 'move-end-of-line)
'move-end-of-line
'end-of-line))
(let ((pos (point))) (let ((pos (point)))
(beginning-of-line 1) (beginning-of-line 1)
(if (looking-at (org-re ".*?\\([ \t]*\\)\\(:[[:alnum:]_@:]+:\\)[ \t]*$")) (if (looking-at (org-re ".*?\\([ \t]*\\)\\(:[[:alnum:]_@:]+:\\)[ \t]*$"))
...@@ -14751,11 +14756,12 @@ beyond the end of the headline." ...@@ -14751,11 +14756,12 @@ beyond the end of the headline."
(if (or (< pos (match-end 0)) (not (eq this-command last-command))) (if (or (< pos (match-end 0)) (not (eq this-command last-command)))
(goto-char (match-end 0)) (goto-char (match-end 0))
(goto-char (match-beginning 1)))) (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 (org-no-warnings
(and (featurep 'xemacs) (setq zmacs-region-stays t)))) (and (featurep 'xemacs) (setq zmacs-region-stays t))))
   
(define-key org-mode-map "\C-a" 'org-beginning-of-line) (define-key org-mode-map "\C-a" 'org-beginning-of-line)
(define-key org-mode-map "\C-e" 'org-end-of-line) (define-key org-mode-map "\C-e" 'org-end-of-line)
   
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment