[Emacs-diffs] emacs/lisp/org ChangeLog org.el

[Carsten Dominik]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Carsten Dominik <cdominik>      09/02/19 15:10:26

Modified files:
        lisp/org       : ChangeLog org.el 

Log message:
        2009-02-19  Carsten Dominik  <address@hidden>
        
                * 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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/org/ChangeLog?cvsroot=emacs&r1=1.69&r2=1.70
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/org/org.el?cvsroot=emacs&r1=1.46&r2=1.47

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/org/ChangeLog,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- ChangeLog   13 Feb 2009 07:52:18 -0000      1.69
+++ ChangeLog   19 Feb 2009 15:10:20 -0000      1.70
@@ -1,3 +1,12 @@
+2009-02-19  Carsten Dominik  <address@hidden>
+
+       * 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  <address@hidden>
 
        * org-rmail.el (rmail-show-message): Restore argument list to the

Index: org.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/org/org.el,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- org.el      6 Feb 2009 09:42:14 -0000       1.46
+++ org.el      19 Feb 2009 15:10:22 -0000      1.47
@@ -4812,7 +4812,7 @@
              (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)
@@ -8588,7 +8588,7 @@
       (org-back-to-heading t)
       (when (save-excursion
              (ignore-errors
-               (outline-up-heading 1)
+               (org-up-heading-all 1)
                (org-entry-get (point) "ORDERED")))
        (let* ((this-level (funcall outline-level))
               (current-level this-level))
@@ -14697,6 +14697,8 @@
   (interactive "P")
   (let ((pos (point)) refpos)
     (beginning-of-line 1)
+    (if (and arg (fboundp 'move-beginning-of-line))
+       (call-interactively 'move-beginning-of-line)
     (if (bobp)
        nil
       (backward-char 1)
@@ -14704,7 +14706,7 @@
          (while (and (not (bobp)) (org-invisible-p))
            (backward-char 1)
            (beginning-of-line 1))
-       (forward-char 1)))
+         (forward-char 1))))
     (when org-special-ctrl-a/e
       (cond
        ((and (looking-at org-complex-heading-regexp)
@@ -14738,8 +14740,11 @@
 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]*$"))
@@ -14751,11 +14756,12 @@
            (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))))
 
-
 (define-key org-mode-map "\C-a" 'org-beginning-of-line)
 (define-key org-mode-map "\C-e" 'org-end-of-line)