[elpa] externals/ssh-deploy 2388c00 056/133: Added -p suffix to predicate functions

[Stefan Monnier]

branch: externals/ssh-deploy
commit 2388c00e3fb788c4c39ac7fc492c6ab38b0fff09
Author: Christian Johansson <christian@cvj.se>
Commit: Christian Johansson <christian@cvj.se>

    Added -p suffix to predicate functions
---
 ssh-deploy-test.el |  24 ++++------
 ssh-deploy.el      | 136 ++++++++++++++++++++++++++---------------------------
 2 files changed, 78 insertions(+), 82 deletions(-)

diff --git a/ssh-deploy-test.el b/ssh-deploy-test.el
index 8c5af83..540bf5e 100644
--- a/ssh-deploy-test.el
+++ b/ssh-deploy-test.el
@@ -33,34 +33,30 @@
 
 (autoload 'ssh-deploy "ssh-deploy")
 (autoload 'ssh-deploy--get-revision-path "ssh-deploy")
-(autoload 'ssh-deploy--file-is-in-path "ssh-deploy")
-(autoload 'ssh-deploy--is-not-empty-string "ssh-deploy")
+(autoload 'ssh-deploy--file-is-in-path-p "ssh-deploy")
+(autoload 'ssh-deploy--is-not-empty-string-p "ssh-deploy")
 
 (defun ssh-deploy-test--get-revision-path ()
   "Test this function."
-  (should (string= (expand-file-name "./_mydirectory_random-file.txt") 
(ssh-deploy--get-revision-path "/mydirectory/random-file.txt" (expand-file-name 
"."))))
-  )
+  (should (string= (expand-file-name "./_mydirectory_random-file.txt") 
(ssh-deploy--get-revision-path "/mydirectory/random-file.txt" (expand-file-name 
".")))))
 
 (defun ssh-deploy-test--file-is-in-path ()
   "Test this function."
-  (should (equal t (ssh-deploy--file-is-in-path "/mydirectory/test.txt" 
"/mydirectory/")))
-  (should (equal nil (ssh-deploy--file-is-in-path "/mydirectory/test.txt" 
"/mydirectory2/")))
-  (should (equal nil (ssh-deploy--file-is-in-path "/mydirectory2/test.txt" 
"/mydirectory/")))
-  )
+  (should (equal t (ssh-deploy--file-is-in-path-p "/mydirectory/test.txt" 
"/mydirectory/")))
+  (should (equal nil (ssh-deploy--file-is-in-path-p "/mydirectory/test.txt" 
"/mydirectory2/")))
+  (should (equal nil (ssh-deploy--file-is-in-path-p "/mydirectory2/test.txt" 
"/mydirectory/"))))
 
 (defun ssh-deploy-test--is-not-empty-string ()
   "Test this function."
-  (should (equal t (ssh-deploy--is-not-empty-string "abc")))
-  (should (equal nil (ssh-deploy--is-not-empty-string "")))
-  (should (equal nil (ssh-deploy--is-not-empty-string nil)))
-  )
+  (should (equal t (ssh-deploy--is-not-empty-string-p "abc")))
+  (should (equal nil (ssh-deploy--is-not-empty-string-p "")))
+  (should (equal nil (ssh-deploy--is-not-empty-string-p nil))))
 
 (defun ssh-deploy-test ()
   "Run test for plug-in."
   (ssh-deploy-test--get-revision-path)
   (ssh-deploy-test--file-is-in-path)
-  (ssh-deploy-test--is-not-empty-string)
-  )
+  (ssh-deploy-test--is-not-empty-string))
 
 (ssh-deploy-test)
 
diff --git a/ssh-deploy.el b/ssh-deploy.el
index f5802f4..f533406 100644
--- a/ssh-deploy.el
+++ b/ssh-deploy.el
@@ -384,11 +384,11 @@
       (make-directory root))
   (expand-file-name (replace-regexp-in-string "\\(/\\|@\\|:\\)" "_" path) 
root))
 
-(defun ssh-deploy--file-is-in-path (file path)
+(defun ssh-deploy--file-is-in-path-p (file path)
   "Return non-nil if FILE is in the path PATH."
   (not (null (string-match path file))))
 
-(defun ssh-deploy--file-is-included (path exclude-list)
+(defun ssh-deploy--file-is-included-p (path exclude-list)
   "Return non-nil if PATH is not in EXCLUDE-LIST."
   (let ((not-found t))
     (dolist (element exclude-list)
@@ -401,7 +401,7 @@
   "Return a string for the relative path based on ROOT and PATH."
   (replace-regexp-in-string root "" path))
 
-(defun ssh-deploy--is-not-empty-string (string)
+(defun ssh-deploy--is-not-empty-string-p (string)
   "Return non-nil if the STRING is not empty and not nil.  Expects string."
   (and (not (null string))
        (not (zerop (length string)))))
@@ -724,8 +724,8 @@
         (exclude-list (or exclude-list ssh-deploy-exclude-list)))
 
     ;; Is the file inside the local-root and should it not be excluded?
-    (if (and (ssh-deploy--file-is-in-path path-local root-local)
-             (ssh-deploy--file-is-included path-local exclude-list))
+    (if (and (ssh-deploy--file-is-in-path-p path-local root-local)
+             (ssh-deploy--file-is-included-p path-local exclude-list))
         (let* ((revision-folder (or revision-folder 
ssh-deploy-revision-folder))
                (revision-path (ssh-deploy--get-revision-path path-local 
revision-folder))
                (path-remote (expand-file-name (ssh-deploy--get-relative-path 
root-local path-local) root-remote)))
@@ -897,8 +897,8 @@
         (debug (or debug ssh-deploy-debug))
         (exclude-list (or exclude-list ssh-deploy-exclude-list))
         (async-with-threads (or async async-with-threads)))
-    (if (and (ssh-deploy--file-is-in-path path-local root-local)
-             (ssh-deploy--file-is-included path-local exclude-list))
+    (if (and (ssh-deploy--file-is-in-path-p path-local root-local)
+             (ssh-deploy--file-is-included-p path-local exclude-list))
         (let ((path-remote (expand-file-name (ssh-deploy--get-relative-path 
root-local path-local) root-remote)))
           (ssh-deploy-delete path-local async async-with-threads)
           (ssh-deploy-delete path-remote async async-with-threads))
@@ -913,10 +913,10 @@
         (debug (or debug ssh-deploy-debug))
         (exclude-list (or exclude-list ssh-deploy-exclude-list))
         (async-with-threads (or async-with-threads 
ssh-deploy-async-with-threads)))
-    (if (and (ssh-deploy--file-is-in-path old-path-local root-local)
-             (ssh-deploy--file-is-in-path new-path-local root-local)
-             (ssh-deploy--file-is-included old-path-local exclude-list)
-             (ssh-deploy--file-is-included new-path-local exclude-list))
+    (if (and (ssh-deploy--file-is-in-path-p old-path-local root-local)
+             (ssh-deploy--file-is-in-path-p new-path-local root-local)
+             (ssh-deploy--file-is-included-p old-path-local exclude-list)
+             (ssh-deploy--file-is-included-p new-path-local exclude-list))
         (let ((old-path-remote (expand-file-name 
(ssh-deploy--get-relative-path root-local old-path-local) root-remote))
               (new-path-remote (expand-file-name 
(ssh-deploy--get-relative-path root-local new-path-local) root-remote)))
           (ssh-deploy--mode-line-set-status-and-update 
ssh-deploy--status-renaming)
@@ -973,8 +973,8 @@
   (let ((root-local (or root-local ssh-deploy-root-local))
         (root-remote (or root-remote ssh-deploy-root-remote))
         (exclude-list (or exclude-list ssh-deploy-exclude-list)))
-    (when (and (ssh-deploy--file-is-in-path path-local root-local)
-               (ssh-deploy--file-is-included path-local exclude-list))
+    (when (and (ssh-deploy--file-is-in-path-p path-local root-local)
+               (ssh-deploy--file-is-included-p path-local exclude-list))
       (let ((path-remote (expand-file-name (ssh-deploy--get-relative-path 
root-local path-local) root-remote)))
         (message "Opening '%s' for browsing on remote host.." path-remote)
         (dired path-remote)))))
@@ -985,8 +985,8 @@
   (let ((root-local (or root-local ssh-deploy-root-local))
         (root-remote (or root-remote ssh-deploy-root-remote))
         (exclude-list (or exclude-list ssh-deploy-exclude-list)))
-    (when (and (ssh-deploy--file-is-in-path path-local root-local)
-               (ssh-deploy--file-is-included path-local exclude-list))
+    (when (and (ssh-deploy--file-is-in-path-p path-local root-local)
+               (ssh-deploy--file-is-included-p path-local exclude-list))
       (let ((path-remote (expand-file-name (ssh-deploy--get-relative-path 
root-local path-local) root-remote)))
         (require 'eshell)
         (message "Opening eshell on '%s'.." path-remote)
@@ -1001,8 +1001,8 @@
   (let ((root-local (or root-local ssh-deploy-root-local))
         (root-remote (or root-remote ssh-deploy-root-remote))
         (exclude-list (or exclude-list ssh-deploy-exclude-list)))
-    (when (and (ssh-deploy--file-is-in-path path-local root-local)
-               (ssh-deploy--file-is-included path-local exclude-list))
+    (when (and (ssh-deploy--file-is-in-path-p path-local root-local)
+               (ssh-deploy--file-is-included-p path-local exclude-list))
       (let ((path-remote (expand-file-name (ssh-deploy--get-relative-path 
root-local path-local) root-remote)))
         (require 'shell)
         (message "Opening eshell on '%s'.." path-remote)
@@ -1032,8 +1032,8 @@
         (on-explicit-save (or on-explicit-save ssh-deploy-on-explicit-save))
         (revision-folder (or revision-folder ssh-deploy-revision-folder))
         (remote-changes (or remote-changes 
ssh-deploy-automatically-detect-remote-changes)))
-    (if (and (ssh-deploy--file-is-in-path path-local root-local)
-             (ssh-deploy--file-is-included path-local exclude-list))
+    (if (and (ssh-deploy--file-is-in-path-p path-local root-local)
+             (ssh-deploy--file-is-included-p path-local exclude-list))
         (if file-or-directory
             (ssh-deploy-diff-files path-local path-remote)
           (ssh-deploy-diff-directories path-local path-remote on-explicit-save 
debug async async-with-threads revision-folder remote-changes exclude-list))
@@ -1071,20 +1071,20 @@
 (defun ssh-deploy-upload-handler (&optional force)
   "Upload current path to remote if it is configured for deployment and if 
remote version hasn't changed or FORCE is specified."
   (interactive)
-  (when (and (ssh-deploy--is-not-empty-string ssh-deploy-root-local)
-             (ssh-deploy--is-not-empty-string ssh-deploy-root-remote))
+  (when (and (ssh-deploy--is-not-empty-string-p ssh-deploy-root-local)
+             (ssh-deploy--is-not-empty-string-p ssh-deploy-root-remote))
     (let ((root-local (file-truename ssh-deploy-root-local))
           (force (or force 0))
           path-local)
-      (if (and (ssh-deploy--is-not-empty-string buffer-file-name)
+      (if (and (ssh-deploy--is-not-empty-string-p buffer-file-name)
                (file-exists-p buffer-file-name))
           (setq path-local (file-truename buffer-file-name))
-        (when (and (ssh-deploy--is-not-empty-string default-directory)
+        (when (and (ssh-deploy--is-not-empty-string-p default-directory)
                    (file-exists-p default-directory))
           (setq path-local (file-truename default-directory))))
-      (if (and (ssh-deploy--is-not-empty-string path-local)
-               (ssh-deploy--file-is-in-path path-local root-local)
-               (ssh-deploy--file-is-included path-local 
ssh-deploy-exclude-list))
+      (if (and (ssh-deploy--is-not-empty-string-p path-local)
+               (ssh-deploy--file-is-in-path-p path-local root-local)
+               (ssh-deploy--file-is-included-p path-local 
ssh-deploy-exclude-list))
           (let ((path-remote (expand-file-name (ssh-deploy--get-relative-path 
root-local path-local) ssh-deploy-root-remote)))
             (ssh-deploy-upload path-local path-remote force ssh-deploy-async 
ssh-deploy-revision-folder ssh-deploy-async-with-threads))
         (when (> ssh-deploy-debug 0) (message "Ignoring upload, path '%s' is 
empty, not in the root '%s' or is excluded from it." path-local root-local))))))
@@ -1099,9 +1099,9 @@
 (defun ssh-deploy-remote-changes-handler()
   "Check if local revision exists or remote file has changed if path is 
configured for deployment."
   (interactive)
-  (if (and (ssh-deploy--is-not-empty-string ssh-deploy-root-local)
-           (ssh-deploy--is-not-empty-string ssh-deploy-root-remote)
-           (ssh-deploy--is-not-empty-string buffer-file-name))
+  (if (and (ssh-deploy--is-not-empty-string-p ssh-deploy-root-local)
+           (ssh-deploy--is-not-empty-string-p ssh-deploy-root-remote)
+           (ssh-deploy--is-not-empty-string-p buffer-file-name))
       (progn
         (when (> ssh-deploy-debug 0) (message "Detecting remote-changes.."))
         (ssh-deploy-remote-changes (file-truename buffer-file-name) 
(file-truename ssh-deploy-root-local) ssh-deploy-root-remote ssh-deploy-async 
ssh-deploy-revision-folder ssh-deploy-exclude-list 
ssh-deploy-async-with-threads))
@@ -1111,23 +1111,23 @@
 (defun ssh-deploy-remote-sql-mysql-handler()
   "Open `sql-mysql' on remote path if path is configured for deployment."
   (interactive)
-  (when (ssh-deploy--is-not-empty-string ssh-deploy-root-remote)
+  (when (ssh-deploy--is-not-empty-string-p ssh-deploy-root-remote)
     (ssh-deploy-remote-sql ssh-deploy-root-remote "mysql")))
 
 ;;;###autoload
 (defun ssh-deploy-remote-sql-postgres-handler()
   "Open `sql-postgres' on remote path if path is configured for deployment."
   (interactive)
-  (when (ssh-deploy--is-not-empty-string ssh-deploy-root-remote)
+  (when (ssh-deploy--is-not-empty-string-p ssh-deploy-root-remote)
     (ssh-deploy-remote-sql ssh-deploy-root-remote "postgres")))
 
 ;;;###autoload
 (defun ssh-deploy-open-remote-file-handler()
   "Check if local revision exists or remote file has changed if path is 
configured for deployment."
   (interactive)
-  (when (and (ssh-deploy--is-not-empty-string ssh-deploy-root-local)
-             (ssh-deploy--is-not-empty-string ssh-deploy-root-remote)
-             (ssh-deploy--is-not-empty-string buffer-file-name))
+  (when (and (ssh-deploy--is-not-empty-string-p ssh-deploy-root-local)
+             (ssh-deploy--is-not-empty-string-p ssh-deploy-root-remote)
+             (ssh-deploy--is-not-empty-string-p buffer-file-name))
     (let* ((root-local (file-truename ssh-deploy-root-local))
            (path-local (file-truename buffer-file-name))
            (path-remote (expand-file-name (ssh-deploy--get-relative-path 
root-local path-local) ssh-deploy-root-remote)))
@@ -1138,19 +1138,19 @@
 (defun ssh-deploy-download-handler ()
   "Download current path from remote if it is configured for deployment."
   (interactive)
-  (when (and (ssh-deploy--is-not-empty-string ssh-deploy-root-local)
-             (ssh-deploy--is-not-empty-string ssh-deploy-root-remote))
+  (when (and (ssh-deploy--is-not-empty-string-p ssh-deploy-root-local)
+             (ssh-deploy--is-not-empty-string-p ssh-deploy-root-remote))
     (let ((root-local (file-truename ssh-deploy-root-local))
           path-local)
-      (if (and (ssh-deploy--is-not-empty-string buffer-file-name)
+      (if (and (ssh-deploy--is-not-empty-string-p buffer-file-name)
                (file-exists-p buffer-file-name))
           (setq path-local (file-truename buffer-file-name))
-        (when (and (ssh-deploy--is-not-empty-string default-directory)
+        (when (and (ssh-deploy--is-not-empty-string-p default-directory)
                    (file-exists-p default-directory))
           (setq path-local (file-truename default-directory))))
-      (if (and (ssh-deploy--is-not-empty-string path-local)
-               (ssh-deploy--file-is-in-path path-local root-local)
-               (ssh-deploy--file-is-included path-local 
ssh-deploy-exclude-list))
+      (if (and (ssh-deploy--is-not-empty-string-p path-local)
+               (ssh-deploy--file-is-in-path-p path-local root-local)
+               (ssh-deploy--file-is-included-p path-local 
ssh-deploy-exclude-list))
           (let ((path-remote (expand-file-name (ssh-deploy--get-relative-path 
root-local path-local) ssh-deploy-root-remote)))
             (ssh-deploy-download path-remote path-local ssh-deploy-async 
ssh-deploy-revision-folder ssh-deploy-async-with-threads))
         (when (> ssh-deploy-debug 0) (message "Ignoring upload, path '%s' is 
empty, not in the root '%s' or is excluded from it." path-local root-local))))))
@@ -1159,15 +1159,15 @@
 (defun ssh-deploy-diff-handler ()
   "Compare current path with remote host if it is configured for deployment."
   (interactive)
-  (when (and (ssh-deploy--is-not-empty-string ssh-deploy-root-local)
-             (ssh-deploy--is-not-empty-string ssh-deploy-root-remote))
-    (if (and (ssh-deploy--is-not-empty-string buffer-file-name)
+  (when (and (ssh-deploy--is-not-empty-string-p ssh-deploy-root-local)
+             (ssh-deploy--is-not-empty-string-p ssh-deploy-root-remote))
+    (if (and (ssh-deploy--is-not-empty-string-p buffer-file-name)
              (file-exists-p buffer-file-name))
         (let* ((path-local (file-truename buffer-file-name))
                (root-local (file-truename ssh-deploy-root-local))
                (path-remote (expand-file-name (ssh-deploy--get-relative-path 
root-local path-local) ssh-deploy-root-remote)))
           (ssh-deploy-diff path-local path-remote root-local ssh-deploy-debug 
ssh-deploy-exclude-list ssh-deploy-async ssh-deploy-async-with-threads 
ssh-deploy-on-explicit-save ssh-deploy-revision-folder 
ssh-deploy-automatically-detect-remote-changes))
-      (when (and (ssh-deploy--is-not-empty-string default-directory)
+      (when (and (ssh-deploy--is-not-empty-string-p default-directory)
                  (file-exists-p default-directory))
         (let* ((path-local (file-truename default-directory))
                (root-local (file-truename ssh-deploy-root-local))
@@ -1178,16 +1178,16 @@
 (defun ssh-deploy-delete-handler ()
   "Delete current file or directory."
   (interactive)
-  (when (and (ssh-deploy--is-not-empty-string ssh-deploy-root-local)
-             (ssh-deploy--is-not-empty-string ssh-deploy-root-remote))
-    (if (and (ssh-deploy--is-not-empty-string buffer-file-name)
+  (when (and (ssh-deploy--is-not-empty-string-p ssh-deploy-root-local)
+             (ssh-deploy--is-not-empty-string-p ssh-deploy-root-remote))
+    (if (and (ssh-deploy--is-not-empty-string-p buffer-file-name)
              (file-exists-p buffer-file-name))
         (let* ((path-local (file-truename buffer-file-name))
                (root-local (file-truename ssh-deploy-root-local))
                (yes-no-prompt (read-string (format "Type 'yes' to confirm that 
you want to delete the file '%s': " path-local))))
           (when (string= yes-no-prompt "yes")
             (ssh-deploy-delete-both path-local root-local 
ssh-deploy-root-remote ssh-deploy-async ssh-deploy-debug 
ssh-deploy-exclude-list ssh-deploy-async-with-threads)))
-      (when (and (ssh-deploy--is-not-empty-string default-directory)
+      (when (and (ssh-deploy--is-not-empty-string-p default-directory)
                  (file-exists-p default-directory))
         (let* ((path-local (file-truename default-directory))
                (root-local (file-truename ssh-deploy-root-local))
@@ -1199,9 +1199,9 @@
 (defun ssh-deploy-rename-handler ()
   "Rename current file or directory."
   (interactive)
-  (when (and (ssh-deploy--is-not-empty-string ssh-deploy-root-local)
-             (ssh-deploy--is-not-empty-string ssh-deploy-root-remote))
-    (if (and (ssh-deploy--is-not-empty-string buffer-file-name)
+  (when (and (ssh-deploy--is-not-empty-string-p ssh-deploy-root-local)
+             (ssh-deploy--is-not-empty-string-p ssh-deploy-root-remote))
+    (if (and (ssh-deploy--is-not-empty-string-p buffer-file-name)
              (file-exists-p buffer-file-name))
         (let* ((old-path-local (file-truename buffer-file-name))
                (root-local (file-truename ssh-deploy-root-local))
@@ -1210,7 +1210,7 @@
                (new-path-local (file-truename new-path-local-tmp)))
           (unless (string= old-path-local new-path-local)
             (ssh-deploy-rename old-path-local new-path-local root-local 
ssh-deploy-root-remote ssh-deploy-async ssh-deploy-debug 
ssh-deploy-exclude-list ssh-deploy-async-with-threads)))
-      (when (and (ssh-deploy--is-not-empty-string default-directory)
+      (when (and (ssh-deploy--is-not-empty-string-p default-directory)
                  (file-exists-p default-directory))
         (let* ((old-path-local (file-truename default-directory))
                (root-local (file-truename ssh-deploy-root-local))
@@ -1224,9 +1224,9 @@
 (defun ssh-deploy-remote-terminal-eshell-handler ()
   "Open current relative path on remote host in `eshell' but only if it's 
configured for deployment."
   (interactive)
-  (when (and (ssh-deploy--is-not-empty-string ssh-deploy-root-local)
-             (ssh-deploy--is-not-empty-string ssh-deploy-root-remote)
-             (ssh-deploy--is-not-empty-string default-directory))
+  (when (and (ssh-deploy--is-not-empty-string-p ssh-deploy-root-local)
+             (ssh-deploy--is-not-empty-string-p ssh-deploy-root-remote)
+             (ssh-deploy--is-not-empty-string-p default-directory))
     (let ((path-local (file-truename default-directory))
           (root-local (file-truename ssh-deploy-root-local)))
       (ssh-deploy-remote-terminal-eshell path-local root-local 
ssh-deploy-root-remote ssh-deploy-exclude-list))))
@@ -1235,8 +1235,8 @@
 (defun ssh-deploy-remote-terminal-eshell-base-handler ()
   "Open base path on remote host in `eshell' but only if it's configured for 
deployment."
   (interactive)
-  (when (and (ssh-deploy--is-not-empty-string ssh-deploy-root-local)
-             (ssh-deploy--is-not-empty-string ssh-deploy-root-remote))
+  (when (and (ssh-deploy--is-not-empty-string-p ssh-deploy-root-local)
+             (ssh-deploy--is-not-empty-string-p ssh-deploy-root-remote))
     (let ((root-local (file-truename ssh-deploy-root-local)))
       (ssh-deploy-remote-terminal-eshell root-local root-local 
ssh-deploy-root-remote ssh-deploy-exclude-list))))
 
@@ -1244,9 +1244,9 @@
 (defun ssh-deploy-remote-terminal-shell-handler ()
   "Open current relative path on remote host in `eshell' but only if it's 
configured for deployment."
   (interactive)
-  (when (and (ssh-deploy--is-not-empty-string ssh-deploy-root-local)
-             (ssh-deploy--is-not-empty-string ssh-deploy-root-remote)
-             (ssh-deploy--is-not-empty-string default-directory))
+  (when (and (ssh-deploy--is-not-empty-string-p ssh-deploy-root-local)
+             (ssh-deploy--is-not-empty-string-p ssh-deploy-root-remote)
+             (ssh-deploy--is-not-empty-string-p default-directory))
     (let ((path-local (file-truename default-directory))
           (root-local (file-truename ssh-deploy-root-local)))
       (ssh-deploy-remote-terminal-shell path-local root-local 
ssh-deploy-root-remote ssh-deploy-exclude-list))))
@@ -1255,8 +1255,8 @@
 (defun ssh-deploy-remote-terminal-shell-base-handler ()
   "Open base path on remote host in `eshell' but only if it's configured for 
deployment."
   (interactive)
-  (when (and (ssh-deploy--is-not-empty-string ssh-deploy-root-local)
-             (ssh-deploy--is-not-empty-string ssh-deploy-root-remote))
+  (when (and (ssh-deploy--is-not-empty-string-p ssh-deploy-root-local)
+             (ssh-deploy--is-not-empty-string-p ssh-deploy-root-remote))
     (let ((root-local (file-truename ssh-deploy-root-local)))
       (ssh-deploy-remote-terminal-shell root-local root-local 
ssh-deploy-root-remote ssh-deploy-exclude-list))))
 
@@ -1264,9 +1264,9 @@
 (defun ssh-deploy-browse-remote-handler ()
   "Open current relative path on remote host in `dired-mode' if it is 
configured for deployment."
   (interactive)
-  (when (and (ssh-deploy--is-not-empty-string ssh-deploy-root-local)
-             (ssh-deploy--is-not-empty-string ssh-deploy-root-remote)
-             (ssh-deploy--is-not-empty-string default-directory))
+  (when (and (ssh-deploy--is-not-empty-string-p ssh-deploy-root-local)
+             (ssh-deploy--is-not-empty-string-p ssh-deploy-root-remote)
+             (ssh-deploy--is-not-empty-string-p default-directory))
     (let ((path-local (file-truename default-directory))
           (root-local (file-truename ssh-deploy-root-local)))
       (ssh-deploy-browse-remote path-local root-local ssh-deploy-root-remote 
ssh-deploy-exclude-list))))
@@ -1275,8 +1275,8 @@
 (defun ssh-deploy-browse-remote-base-handler ()
   "Open base path on remote host in `dired-mode' if it is configured for 
deployment."
   (interactive)
-  (when (and (ssh-deploy--is-not-empty-string ssh-deploy-root-local)
-             (ssh-deploy--is-not-empty-string ssh-deploy-root-remote))
+  (when (and (ssh-deploy--is-not-empty-string-p ssh-deploy-root-local)
+             (ssh-deploy--is-not-empty-string-p ssh-deploy-root-remote))
     (let ((root-local (file-truename ssh-deploy-root-local)))
       (ssh-deploy-browse-remote root-local root-local ssh-deploy-root-remote 
ssh-deploy-exclude-list))))