[elpa] externals/ztree 30dbda7 16/23: Issue #62, #63

[Stefan Monnier]

branch: externals/ztree
commit 30dbda7faf86e2901c094d2d4fa92f1b0519dbd8
Author: Alexey Veretennikov <alexey.veretennikov@gmail.com>
Commit: Alexey Veretennikov <alexey.veretennikov@gmail.com>

    Issue #62, #63
    
    Fixed by adding additional `require' statement
    and spelling fix.
---
 ztree-diff.el | 5 +++--
 ztree-view.el | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ztree-diff.el b/ztree-diff.el
index 6af0bc2..5d358c9 100644
--- a/ztree-diff.el
+++ b/ztree-diff.el
@@ -100,6 +100,7 @@ By default paths starting with dot (like .git) are ignored")
 
 (defvar-local ztree-diff-wait-message nil
   "Message showing while constructing the diff tree.")
+ztree-diff--ediff-previous-window-configuration
 
 (defvar-local ztree-diff-ediff-previous-window-configuration nil
   "Window configuration prior to calling `ediff'.")
@@ -238,7 +239,7 @@ Argument NODE node containing paths to files to call a diff 
on."
 See the Info node `(ediff) hooks'.
 
 This hook function removes itself."
-  (setq ztree-diff--ediff-previous-window-configuration 
(current-window-configuration))
+  (setq ztree-diff-ediff-previous-window-configuration 
(current-window-configuration))
   (remove-hook 'ediff-before-setup-hook 
#'ztree-diff-ediff-before-setup-hook-function))
 
 (defun ztree-diff-ediff-quit-hook-function ()
@@ -247,7 +248,7 @@ This hook function removes itself."
 See the Info node `(ediff) hooks'.
 
 This hook function removes itself."
-  (set-window-configuration ztree-diff--ediff-previous-window-configuration)
+  (set-window-configuration ztree-diff-ediff-previous-window-configuration)
   (remove-hook 'ediff-quit-hook #'ztree-diff-ediff-quit-hook-function))
 
 (defun ztree-diff-ediff (file-a file-b &optional startup-hooks)
diff --git a/ztree-view.el b/ztree-view.el
index c24ab24..1a677e8 100644
--- a/ztree-view.el
+++ b/ztree-view.el
@@ -42,6 +42,7 @@
 ;;
 ;;; Code:
 
+(require 'subr-x)
 (require 'ztree-util)
 
 ;;