Merge commit '811f9645ba6332d646c25dd042010478ff5a579f'

[gnu-emacs-elpa] / packages / ztree / ztree-view.el

diff --git a/packages/ztree/ztree-view.el b/packages/ztree/ztree-view.el
index a251be8da0ea19291b4dab94fc959f883cdde3e0..519097b8e463a2cac54d69547a7182f5f8f4c935 100644 (file)
--- a/packages/ztree/ztree-view.el
+++ b/packages/ztree/ztree-view.el
@@ -1,4 +1,4 @@
-;;; ztree-view.el --- Text mode tree view (buffer)
+;;; ztree-view.el --- Text mode tree view (buffer) -*- lexical-binding: t; -*-

 
 ;; Copyright (C) 2013-2015  Free Software Foundation, Inc.
 ;;
 
 ;; Copyright (C) 2013-2015  Free Software Foundation, Inc.
 ;;


@@ -191,7 +191,7 @@ or nil if there is no node"
         (node (ztree-find-node-in-line (line-number-at-pos))))
     (when node
       (cons node (if (> (current-column) center) 'right 'left)))))
         (node (ztree-find-node-in-line (line-number-at-pos))))
     (when node
       (cons node (if (> (current-column) center) 'right 'left)))))

-  
+

 
 (defun ztree-is-expanded-node (node)
   "Find if the NODE is in the list of expanded nodes."
 
 (defun ztree-is-expanded-node (node)
   "Find if the NODE is in the list of expanded nodes."


@@ -225,7 +225,7 @@ Argument STATE node state."
       (dolist (child children)
         (ztree-do-toggle-expand-subtree-iter child state)))))
 
       (dolist (child children)
         (ztree-do-toggle-expand-subtree-iter child state)))))
 

-     
+

 (defun ztree-do-toggle-expand-subtree ()
   "Implements the subtree expand."
   (let* ((line (line-number-at-pos))
 (defun ztree-do-toggle-expand-subtree ()
   "Implements the subtree expand."
   (let* ((line (line-number-at-pos))


@@ -241,7 +241,7 @@ Argument STATE node state."
       (ztree-refresh-buffer line)
       ;; restore window start position
       (set-window-start (selected-window) current-pos))))
       (ztree-refresh-buffer line)
       ;; restore window start position
       (set-window-start (selected-window) current-pos))))

-          
+

 
 (defun ztree-do-perform-action (hard)
   "Toggle expand/collapsed state for nodes or perform an action.
 
 (defun ztree-do-perform-action (hard)
   "Toggle expand/collapsed state for nodes or perform an action.


@@ -262,7 +262,7 @@ should be performed on node."
         (ztree-refresh-buffer line)
         ;; restore window start position
         (set-window-start (selected-window) current-pos)))))
         (ztree-refresh-buffer line)
         ;; restore window start position
         (set-window-start (selected-window) current-pos)))))

-  
+

 
 (defun ztree-perform-action ()
   "Toggle expand/collapsed state for nodes or perform the action.
 
 (defun ztree-perform-action ()
   "Toggle expand/collapsed state for nodes or perform the action.


@@ -291,7 +291,7 @@ Performs the soft action, binded on Space, on node."
              ztree-expanded-nodes-list))
     (push node ztree-expanded-nodes-list)))
 
              ztree-expanded-nodes-list))
     (push node ztree-expanded-nodes-list)))
 

-   
+

 (defun ztree-toggle-expand-state (node)
   "Toggle expanded/collapsed state for NODE."
   (ztree-do-toggle-expand-state node (not (ztree-is-expanded-node node))))
 (defun ztree-toggle-expand-state (node)
   "Toggle expanded/collapsed state for NODE."
   (ztree-do-toggle-expand-state node (not (ztree-is-expanded-node node))))


@@ -322,15 +322,15 @@ then close the node."
 Argument NODE node which contents will be returned."
   (let ((nodes (funcall ztree-node-contents-fun node))
         (comp  #'(lambda (x y)
 Argument NODE node which contents will be returned."
   (let ((nodes (funcall ztree-node-contents-fun node))
         (comp  #'(lambda (x y)

-                 (string< (funcall ztree-node-short-name-fun x)
-                          (funcall ztree-node-short-name-fun y)))))
+                   (string< (funcall ztree-node-short-name-fun x)
+                            (funcall ztree-node-short-name-fun y)))))

     (cons (sort (ztree-filter
                  #'(lambda (f) (funcall ztree-node-is-expandable-fun f))
                  nodes) comp)
           (sort (ztree-filter
                  #'(lambda (f) (not (funcall ztree-node-is-expandable-fun f)))
                  nodes) comp))))
     (cons (sort (ztree-filter
                  #'(lambda (f) (funcall ztree-node-is-expandable-fun f))
                  nodes) comp)
           (sort (ztree-filter
                  #'(lambda (f) (not (funcall ztree-node-is-expandable-fun f)))
                  nodes) comp))))

-                
+

 
 (defun ztree-draw-char (c x y &optional face)
   "Draw char C at the position (1-based) (X Y).
 
 (defun ztree-draw-char (c x y &optional face)
   "Draw char C at the position (1-based) (X Y).


@@ -412,20 +412,20 @@ Argument START-OFFSET column to start drawing from."
         ;; from the children list
         (let ((last-child (ztree-find children
                                       #'(lambda (x)
         ;; from the children list
         (let ((last-child (ztree-find children
                                       #'(lambda (x)

-                                          (funcall visible (car-atom x)))))
+                                          (funcall visible (ztree-car-atom x)))))

               (x-offset (+ 2 offset)))
           (when last-child
             (ztree-draw-vertical-rounded-line (1+ root)
               (x-offset (+ 2 offset)))
           (when last-child
             (ztree-draw-vertical-rounded-line (1+ root)

-                                              (car-atom last-child)
+                                              (ztree-car-atom last-child)

                                               x-offset)))
         ;; draw recursively
         (dolist (child children)
           (ztree-draw-tree child (1+ depth) start-offset)
           (let ((end (if (listp child) line-end-node line-end-leaf)))
                                               x-offset)))
         ;; draw recursively
         (dolist (child children)
           (ztree-draw-tree child (1+ depth) start-offset)
           (let ((end (if (listp child) line-end-node line-end-leaf)))

-            (when (funcall visible (car-atom child))
+            (when (funcall visible (ztree-car-atom child))

               (ztree-draw-horizontal-line line-start
                                           end
               (ztree-draw-horizontal-line line-start
                                           end

-                                          (car-atom child)))))))))
+                                          (ztree-car-atom child)))))))))

 
 (defun ztree-fill-parent-array (tree)
   "Set the root lines array.
 
 (defun ztree-fill-parent-array (tree)
   "Set the root lines array.


@@ -433,7 +433,7 @@ Argument TREE nodes tree to create an array of lines from."
   (let ((root (car tree))
         (children (cdr tree)))
     (dolist (child children)
   (let ((root (car tree))
         (children (cdr tree)))
     (dolist (child children)

-      (ztree-set-parent-for-line (car-atom child) root)
+      (ztree-set-parent-for-line (ztree-car-atom child) root)

       (when (listp child)
         (ztree-fill-parent-array child)))))
 
       (when (listp child)
         (ztree-fill-parent-array child)))))
 


@@ -497,7 +497,7 @@ Argument PATH start node."
           (when (funcall ztree-node-showp-fun leaf)
             ;; insert the leaf and add it to children
             (push (ztree-insert-entry leaf (1+ depth) nil)
           (when (funcall ztree-node-showp-fun leaf)
             ;; insert the leaf and add it to children
             (push (ztree-insert-entry leaf (1+ depth) nil)

-                    children)))))
+                  children)))))

     ;; result value is the list - head is the root line,
     ;; rest are children
     (cons root-line children)))
     ;; result value is the list - head is the root line,
     ;; rest are children
     (cons root-line children)))


@@ -524,7 +524,7 @@ Argument PATH start node."
           (puthash line side ztree-line-tree-properties))
       (ztree-insert-single-entry short-name depth expandable expanded 0))
     (puthash line node ztree-line-to-node-table)
           (puthash line side ztree-line-tree-properties))
       (ztree-insert-single-entry short-name depth expandable expanded 0))
     (puthash line node ztree-line-to-node-table)

-    (newline-and-begin)
+    (insert "\n")

     line))
 
 (defun ztree-insert-single-entry (short-name depth
     line))
 
 (defun ztree-insert-single-entry (short-name depth