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

Send list only with cursor at top item 

* lisp/org.el (org-ctrl-c-ctrl-c): call `org-list-send-list' only when
  cursor it at very first item of the list, as specified in the
  manual. Also refactored the list part of the function a bit.
This commit is contained in:
Nicolas Goaziou 2011-02-19 11:27:53 +01:00
parent 2366083b82
commit 729564ae74
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lisp/org.el
View File

@ -17418,15 +17418,18 @@ This command does many different things, depending on context:
(org-footnote-at-definition-p)) (org-footnote-at-definition-p))
(call-interactively 'org-footnote-action)) (call-interactively 'org-footnote-action))
((org-at-item-checkbox-p) ((org-at-item-checkbox-p)
;; Use a light version of `org-toggle-checkbox' to avoid ;; Cursor at a checkbox: repair list and update checkboxes. Send
;; computing list structure twice. ;; list only if at top item.
(let* ((cbox (match-string 1)) (let* ((cbox (match-string 1))
(struct (org-list-struct)) (struct (org-list-struct))
(old-struct (mapcar (lambda (e) (copy-alist e)) struct)) (old-struct (copy-tree struct))
(parents (org-list-parents-alist struct)) (parents (org-list-parents-alist struct))
(prevs (org-list-prevs-alist struct)) (prevs (org-list-prevs-alist struct))
(orderedp (org-entry-get nil "ORDERED")) (orderedp (org-entry-get nil "ORDERED"))
(firstp (= (org-list-get-top-point struct) (point-at-bol)))
block-item) block-item)
;; Use a light version of `org-toggle-checkbox' to avoid
;; computing list structure twice.
(org-list-set-checkbox (point-at-bol) struct (org-list-set-checkbox (point-at-bol) struct
(cond (cond
((equal arg '(16)) "[-]") ((equal arg '(16)) "[-]")
@ -17442,23 +17445,25 @@ This command does many different things, depending on context:
"Checkboxes were removed due to unchecked box at line %d" "Checkboxes were removed due to unchecked box at line %d"
(org-current-line block-item))) (org-current-line block-item)))
(org-list-struct-apply-struct struct old-struct) (org-list-struct-apply-struct struct old-struct)
(org-update-checkbox-count-maybe)) (org-update-checkbox-count-maybe)
(org-list-send-list 'maybe)) (when firstp (org-list-send-list 'maybe))))
((org-at-item-p) ((org-at-item-p)
;; Do checkbox related actions only if function was called with ;; Cursor at an item: repair list. Do checkbox related actions
;; an argument ;; only if function was called with an argument. Send list only
;; if at top item.
(let* ((struct (org-list-struct)) (let* ((struct (org-list-struct))
(old-struct (copy-tree struct)) (old-struct (copy-tree struct))
(parents (org-list-parents-alist struct)) (parents (org-list-parents-alist struct))
(prevs (org-list-prevs-alist struct))) (prevs (org-list-prevs-alist struct))
(firstp (= (org-list-get-top-point struct) (point-at-bol))))
(org-list-struct-fix-ind struct parents) (org-list-struct-fix-ind struct parents)
(org-list-struct-fix-bul struct prevs) (org-list-struct-fix-bul struct prevs)
(when arg (when arg
(org-list-set-checkbox (point-at-bol) struct "[ ]") (org-list-set-checkbox (point-at-bol) struct "[ ]")
(org-list-struct-fix-box struct parents prevs)) (org-list-struct-fix-box struct parents prevs))
(org-list-struct-apply-struct struct old-struct) (org-list-struct-apply-struct struct old-struct)
(when arg (org-update-checkbox-count-maybe))) (when arg (org-update-checkbox-count-maybe))
(org-list-send-list 'maybe)) (when firstp (org-list-send-list 'maybe))))
((save-excursion (beginning-of-line 1) (looking-at org-dblock-start-re)) ((save-excursion (beginning-of-line 1) (looking-at org-dblock-start-re))
;; Dynamic block ;; Dynamic block
(beginning-of-line 1) (beginning-of-line 1)