xeals/origami.el
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Push mark before jumping

Browse Source
This commit is contained in:
Greg Sexton 2016-09-24 10:13:03 +01:00
parent b571187d68
commit fdd8fc306f
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
origami.el
View File

@ -687,18 +687,20 @@ is in a fold, move to the beginning of the fold that POINT is
in." in."
(interactive (list (current-buffer) (point))) (interactive (list (current-buffer) (point)))
(-when-let (tree (origami-get-fold-tree buffer)) (-when-let (tree (origami-get-fold-tree buffer))
(push-mark)
(-> tree (-> tree
(origami-fold-preorder-reduce (lambda (state n) (origami-fold-preorder-reduce (lambda (state n)
(cons (origami-fold-beg n) state)) nil) (cons (origami-fold-beg n) state)) nil)
(->> (-reduce (lambda (state pos) (->> (-reduce (lambda (state pos)
(if (< state point) state pos)))) (if (< state point) state pos))))
goto-char))) goto-char)))
(defun origami-next-fold (buffer point) (defun origami-next-fold (buffer point)
"Move point to the end of the fold after POINT. If POINT is in "Move point to the end of the fold after POINT. If POINT is in
a fold, move to the end of the fold that POINT is in." a fold, move to the end of the fold that POINT is in."
(interactive (list (current-buffer) (point))) (interactive (list (current-buffer) (point)))
(-when-let (tree (origami-get-fold-tree buffer)) (-when-let (tree (origami-get-fold-tree buffer))
(push-mark)
(-> tree (-> tree
(origami-fold-postorder-reduce (lambda (state n) (origami-fold-postorder-reduce (lambda (state n)
(cons (origami-fold-end n) state)) nil) (cons (origami-fold-end n) state)) nil)
@ -710,9 +712,10 @@ a fold, move to the end of the fold that POINT is in."
after POINT." after POINT."
(interactive (list (current-buffer) (point))) (interactive (list (current-buffer) (point)))
(-when-let (tree (origami-get-fold-tree buffer)) (-when-let (tree (origami-get-fold-tree buffer))
(push-mark)
(-> tree (-> tree
(origami-fold-preorder-reduce (lambda (state n) (origami-fold-preorder-reduce (lambda (state n)
(cons (origami-fold-beg n) state)) nil) (cons (origami-fold-beg n) state)) nil)
(->> (-last (lambda (pos) (> pos point)))) (->> (-last (lambda (pos) (> pos point))))
goto-char))) goto-char)))
@ -722,6 +725,7 @@ that is a sibling of the fold the point is currently in."
(interactive (list (current-buffer) (point))) (interactive (list (current-buffer) (point)))
(-when-let (tree (origami-get-fold-tree buffer)) (-when-let (tree (origami-get-fold-tree buffer))
(-when-let (path (origami-fold-find-path-containing tree point)) (-when-let (path (origami-fold-find-path-containing tree point))
(push-mark)
(-when-let (c (-> (origami-fold-next-sibling (origami-fold-children (-when-let (c (-> (origami-fold-next-sibling (origami-fold-children
(origami-fold-parent path)) (origami-fold-parent path))
(-last-item path)) (-last-item path))
@ -734,6 +738,7 @@ that is a sibling of the fold the point is currently in."
(interactive (list (current-buffer) (point))) (interactive (list (current-buffer) (point)))
(-when-let (tree (origami-get-fold-tree buffer)) (-when-let (tree (origami-get-fold-tree buffer))
(-when-let (path (origami-fold-find-path-containing tree point)) (-when-let (path (origami-fold-find-path-containing tree point))
(push-mark)
(-when-let (c (-> (origami-fold-prev-sibling (origami-fold-children (-when-let (c (-> (origami-fold-prev-sibling (origami-fold-children
(origami-fold-parent path)) (origami-fold-parent path))
(-last-item path)) (-last-item path))