浏览代码

Fix more refile bugs

Carsten Dominik 15 年之前
父节点
当前提交
e5158d35e4
共有 2 个文件被更改,包括 5 次插入2 次删除
  1. 3 0
      lisp/ChangeLog
  2. 2 2
      lisp/org.el

+ 3 - 0
lisp/ChangeLog

@@ -2,6 +2,9 @@
 
 
 	* org.el (org-paste-subtree): Test the kill ring entry if it is
 	* org.el (org-paste-subtree): Test the kill ring entry if it is
 	going to be used.
 	going to be used.
+	(org-copy-subtree): Use `org-forward-same-level'.
+	(org-forward-same-level): Respect the `invisibe-ok' arg for
+	back-to-heading.
 
 
 2009-08-04  Carsten Dominik  <carsten.dominik@gmail.com>
 2009-08-04  Carsten Dominik  <carsten.dominik@gmail.com>
 
 

+ 2 - 2
lisp/org.el

@@ -6143,7 +6143,7 @@ useful if the caller implements cut-and-paste as copy-then-paste-then-cut."
       (save-excursion (outline-end-of-heading)
       (save-excursion (outline-end-of-heading)
 		      (setq folded (org-invisible-p)))
 		      (setq folded (org-invisible-p)))
       (condition-case nil
       (condition-case nil
-	  (outline-forward-same-level (1- n))
+	  (org-forward-same-level (1- n) t)
 	(error nil))
 	(error nil))
       (org-end-of-subtree t t))
       (org-end-of-subtree t t))
     (org-back-over-empty-lines)
     (org-back-over-empty-lines)
@@ -16588,7 +16588,7 @@ This is like outline-next-sibling, but invisible headings are ok."
   "Move forward to the arg'th subheading at same level as this one.
   "Move forward to the arg'th subheading at same level as this one.
 Stop at the first and last subheadings of a superior heading."
 Stop at the first and last subheadings of a superior heading."
   (interactive "p")
   (interactive "p")
-  (org-back-to-heading)
+  (org-back-to-heading invisible-ok)
   (org-on-heading-p)
   (org-on-heading-p)
   (let* ((level (- (match-end 0) (match-beginning 0) 1))
   (let* ((level (- (match-end 0) (match-beginning 0) 1))
 	 (re (format "^\\*\\{1,%d\\} " level))
 	 (re (format "^\\*\\{1,%d\\} " level))