X-Git-Url: https://code.delx.au/gnu-emacs-elpa/blobdiff_plain/55aab326a1213fac44ff0ec2a8df34cc3f79e205..f10533854f4c7bb54247a11981191bf37b70cb36:/packages/ztree/ztree-diff-model.el diff --git a/packages/ztree/ztree-diff-model.el b/packages/ztree/ztree-diff-model.el index b4ad75fde..a9c99aefa 100644 --- a/packages/ztree/ztree-diff-model.el +++ b/packages/ztree/ztree-diff-model.el @@ -3,7 +3,7 @@ ;; Copyright (C) 2013-2016 Free Software Foundation, Inc. ;; ;; Author: Alexey Veretennikov -;; +;; ;; Created: 2013-11-11 ;; ;; Keywords: files tools @@ -196,7 +196,7 @@ left and right parts existing." (defun ztree-diff-model-subtree (parent path side diff) "Create a subtree with given PARENT for the given PATH. -Argument SIDE either 'left or 'right side. +Argument SIDE either `left' or `right' side. Argument DIFF different status to be assigned to all created nodes." (let ((files (ztree-directory-files path)) (result nil)) @@ -236,7 +236,7 @@ Argument DIFF different status to be assigned to all created nodes." (defun ztree-diff-model-update-diff (old new) "Get the diff status depending if OLD or NEW is not nil. -If the OLD is 'ignore, do not change anything" +If the OLD is `ignore', do not change anything" ;; if the old whole directory is ignored, ignore children's status (cond ((eql old 'ignore) 'ignore) ;; if the new status is ignored, use old @@ -259,14 +259,14 @@ setting status from the NODE, unless they have an ignore status" ;; otherwise only update status when the child status is not ignore (mapc (lambda (child) (when (or (eql status 'ignore) - (not + (not (or (eql status 'ignore) (eql (ztree-diff-node-different child) 'ignore)))) (setf (ztree-diff-node-different child) status) (ztree-diff-node-update-diff-from-parent child))) children))) - - + + (defun ztree-diff-model-find-in-files (list shortname is-dir) "Find in LIST of files the file with name SHORTNAME. @@ -387,7 +387,7 @@ with dot etc)." (setf ztree-diff-model-ignore-fun ignore-p)) (defun ztree-diff-model-set-progress-fun (progess-fun) - (setf ztree-diff-model-progress-fun progess-fun)) + (setf ztree-diff-model-progress-fun progess-fun)) (provide 'ztree-diff-model)