From b42e238699a247a1c50e9baa29c284dad05d44ad Mon Sep 17 00:00:00 2001 From: Alexey Veretennikov Date: Sat, 13 Jun 2015 22:28:20 +0200 Subject: [PATCH] All files now uses the lexical-binding --- ztree-diff-model.el | 18 +++++++++--------- ztree-diff.el | 22 +++++++++++----------- ztree-dir.el | 2 +- ztree-util.el | 22 +++++++++++----------- ztree-view.el | 20 ++++++++++---------- ztree.el | 2 +- 6 files changed, 43 insertions(+), 43 deletions(-) diff --git a/ztree-diff-model.el b/ztree-diff-model.el index ed459f224..b68631e05 100644 --- a/ztree-diff-model.el +++ b/ztree-diff-model.el @@ -1,4 +1,4 @@ -;;; ztree-diff-model.el --- diff model for directory trees +;;; ztree-diff-model.el --- diff model for directory trees -*- lexical-binding: t; -*- ;; Copyright (C) 2013-2015 Free Software Foundation, Inc. ;; @@ -79,7 +79,7 @@ "\n" " * Children: " ch-str "\n"))) - + (defun ztree-diff-node-short-name-wrapper (node &optional right-side) "Return the short name of the NODE given. @@ -157,12 +157,12 @@ Filters out . and .." (file-exists-p left) (file-exists-p right)) (if isdir - (let ((traverse (ztree-diff-node-traverse - node - left - right))) - (ztree-diff-node-set-different node (car traverse)) - (ztree-diff-node-set-children node (cdr traverse))) + (let ((traverse (ztree-diff-node-traverse + node + left + right))) + (ztree-diff-node-set-different node (car traverse)) + (ztree-diff-node-set-children node (cdr traverse))) ;; node is a file (ztree-diff-node-set-different node @@ -341,7 +341,7 @@ the rest is the combined list of nodes." (ztree-diff-node-set-children node (cdr traverse)) (ztree-diff-node-set-different node (car traverse)) (message "Done."))) - + (provide 'ztree-diff-model) diff --git a/ztree-diff.el b/ztree-diff.el index f9eee13b7..cd7a353e2 100644 --- a/ztree-diff.el +++ b/ztree-diff.el @@ -1,4 +1,4 @@ -;;; ztree-diff.el --- Text mode diff for directory trees +;;; ztree-diff.el --- Text mode diff for directory trees -*- lexical-binding: t; -*- ;; Copyright (C) 2013-2015 Free Software Foundation, Inc. ;; @@ -114,10 +114,10 @@ By default paths starting with dot (like .git) are ignored") (insert "\n") (when ztree-diff-dirs-pair (ztree-insert-with-face (concat "Left: " (car ztree-diff-dirs-pair)) - ztreep-diff-header-small-face) + ztreep-diff-header-small-face) (insert "\n") (ztree-insert-with-face (concat "Right: " (cdr ztree-diff-dirs-pair)) - ztreep-diff-header-small-face) + ztreep-diff-header-small-face) (insert "\n")) (ztree-insert-with-face "Legend:" ztreep-diff-header-small-face) (insert "\n") @@ -151,7 +151,7 @@ By default paths starting with dot (like .git) are ignored") (file-exists-p right)) node nil))) - + (defun ztree-diff-existing-common-parent (node) "Return the first node in up in hierarchy of the NODE which has both sides." (let ((common (ztree-diff-existing-common node))) @@ -170,7 +170,7 @@ By default paths starting with dot (like .git) are ignored") (ztree-diff-model-partial-rescan common) (ztree-diff-node-update-all-parents-diff node) (ztree-refresh-buffer (line-number-at-pos)))))) - + (defun ztree-diff-partial-rescan () "Perform partial rescan on the current node." @@ -178,7 +178,7 @@ By default paths starting with dot (like .git) are ignored") (let ((found (ztree-find-node-at-point))) (when found (ztree-diff-do-partial-rescan (car found))))) - + (defun ztree-diff-simple-diff (node) "Create a simple diff buffer for files from left and right panels. @@ -213,7 +213,7 @@ Argument NODE node containing paths to files to call a diff on." 2 if left or right present - view left or rigth" (let ((left (ztree-diff-node-left-path node)) (right (ztree-diff-node-right-path node)) - (open-f '(lambda (path) (if hard (find-file path) + (open-f #'(lambda (path) ((insert )f hard (find-file path) (let ((split-width-threshold nil)) (view-file-other-window path)))))) (cond ((and left right) @@ -225,7 +225,7 @@ Argument NODE node containing paths to files to call a diff on." (left (funcall open-f left)) (right (funcall open-f right)) (t nil)))) - + (defun ztree-diff-copy-file (node source-path destination-path copy-to-right) @@ -258,7 +258,7 @@ COPY-TO-RIGHT specifies which side of the NODE to update." (defun ztree-diff-copy-dir (node source-path destination-path copy-to-right) - "Update the NODE status and copy the directory. + "Update the NODE status and copy the directory. Directory copied from SOURCE-PATH to DESTINATION-PATH. COPY-TO-RIGHT specifies which side of the NODE to update." (let* ((src-path (file-name-as-directory source-path)) @@ -352,7 +352,7 @@ COPY-TO-RIGHT specifies which side of the NODE to update." ((and (eq side 'right) node-right) (view-file node-right)))))))) - + (defun ztree-diff-delete-file () "Delete the file under the cursor." @@ -447,7 +447,7 @@ Argument DIR2 right directory." (ztreediff-mode) (setq ztree-diff-dirs-pair (cons dir1 dir2)) (ztree-refresh-buffer))) - + diff --git a/ztree-dir.el b/ztree-dir.el index 60ad9571d..3dd87b7f7 100644 --- a/ztree-dir.el +++ b/ztree-dir.el @@ -1,4 +1,4 @@ -;;; ztree-dir.el --- Text mode directory tree +;;; ztree-dir.el --- Text mode directory tree -*- lexical-binding: t; -*- ;; Copyright (C) 2013-2015 Free Software Foundation, Inc. ;; diff --git a/ztree-util.el b/ztree-util.el index 28193acac..85df4446d 100644 --- a/ztree-util.el +++ b/ztree-util.el @@ -1,4 +1,4 @@ -;;; ztree-util.el --- Auxulary utilities for the ztree package +;;; ztree-util.el --- Auxulary utilities for the ztree package -*- lexical-binding: t; -*- ;; Copyright (C) 2013-2015 Free Software Foundation, Inc. ;; @@ -100,19 +100,19 @@ To test expansion one can use GNU Emacs's pp library: (defun ,ctor-name (,@record-fields) (let ((,rec-var)) ,@(mapcar #'(lambda (x) - (list 'setq rec-var (list 'plist-put rec-var (list 'quote x) x))) - record-fields))) + (list 'setq rec-var (list 'plist-put rec-var (list 'quote x) x))) + record-fields))) ;; getters with names "record-name-field" where the "field" ;; is from record-fields ,@(mapcar #'(lambda (x) - (let ((getter-name (intern (concat (symbol-name record-name) - "-" - (symbol-name x))))) - `(progn - (defun ,getter-name (,rec-var) - (plist-get ,rec-var ',x) - )))) - record-fields) + (let ((getter-name (intern (concat (symbol-name record-name) + "-" + (symbol-name x))))) + `(progn + (defun ,getter-name (,rec-var) + (plist-get ,rec-var ',x) + )))) + record-fields) ;; setters wit names "record-name-set-field where the "field" ;; is from record-fields ;; arguments for setters: (record value) diff --git a/ztree-view.el b/ztree-view.el index 89ae094cb..519097b8e 100644 --- a/ztree-view.el +++ b/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. ;; @@ -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))))) - + (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))))) - + (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)))) - + (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))))) - + (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))) - + (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) - (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)))) - + (defun ztree-draw-char (c x y &optional face) "Draw char C at the position (1-based) (X Y). @@ -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) - children))))) + children))))) ;; result value is the list - head is the root line, ;; rest are children (cons root-line children))) diff --git a/ztree.el b/ztree.el index 79e6fe6d2..2f739aa9b 100644 --- a/ztree.el +++ b/ztree.el @@ -1,4 +1,4 @@ -;;; ztree.el --- Text mode directory tree +;;; ztree.el --- Text mode directory tree -*- lexical-binding: t; -*- ;; Copyright (C) 2013-2015 Free Software Foundation, Inc. ;; -- 2.39.2