[elpa] externals/ssh-deploy e24f69d 127/173: Fixes 'display-warning throws 'wrong-type-argument error #39

[Stefan Monnier]

branch: externals/ssh-deploy
commit e24f69d622f65906409c624e8b5558ac64312c70
Author: Christian Johansson <address@hidden>
Commit: Christian Johansson <address@hidden>

    Fixes 'display-warning throws 'wrong-type-argument error #39
---
 ssh-deploy-diff-mode.el | 10 +++++-----
 ssh-deploy.el           | 34 +++++++++++++++++-----------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/ssh-deploy-diff-mode.el b/ssh-deploy-diff-mode.el
index accbeb2..9331850 100644
--- a/ssh-deploy-diff-mode.el
+++ b/ssh-deploy-diff-mode.el
@@ -186,7 +186,7 @@
               ((= section ssh-deploy-diff-mode--section-only-in-b)
                (ssh-deploy-download path-remote path-local async 
revision-folder))
               (t (message "Copy is not available in this section")))
-      (display-warning "ssh-deploy" "Function ssh-deploy-download or 
ssh-deploy-upload is missing" :warning))))
+      (display-warning 'ssh-deploy "Function ssh-deploy-download or 
ssh-deploy-upload is missing" :warning))))
 
 (defun ssh-deploy-diff-mode--copy-a (parts)
   "Perform a upload of local-path to remote-path based on PARTS from section A 
or section BOTH."
@@ -204,7 +204,7 @@
                    (= section ssh-deploy-diff-mode--section-in-both))
                (ssh-deploy-upload path-local path-remote t async 
revision-folder))
               (t "Copy A is not available in this section"))
-      (display-warning "ssh-deploy" "Function ssh-deploy-upload is missing" 
:warning))))
+      (display-warning 'ssh-deploy "Function ssh-deploy-upload is missing" 
:warning))))
 
 (defun ssh-deploy-diff-mode--copy-b (parts)
   "Perform an download of remote-path to local-path based on PARTS from 
section B or section BOTH."
@@ -222,7 +222,7 @@
                    (= section ssh-deploy-diff-mode--section-in-both))
                (ssh-deploy-download path-remote path-local async 
revision-folder))
               (t "Copy B is not available in this section"))
-      (display-warning "ssh-deploy" "Function ssh-deploy-download is missing" 
:warning))))
+      (display-warning 'ssh-deploy "Function ssh-deploy-download is missing" 
:warning))))
 
 (defun ssh-deploy-diff-mode--delete (parts)
   "Delete path in both, only in a or only in b based on PARTS from section A, 
B or BOTH."
@@ -247,7 +247,7 @@
               ((= section ssh-deploy-diff-mode--section-only-in-b) 
(ssh-deploy-delete path-remote async debug))
               ((= section ssh-deploy-diff-mode--section-in-both) 
(ssh-deploy-delete-both path-local root-local root-remote async debug 
exclude-list))
               (t (message "Delete is not available in this section")))
-      (display-warning "ssh-deploy" "Function ssh-deploy-delete or 
ssh-deploy-delete-both is missing" :warning))))
+      (display-warning 'ssh-deploy "Function ssh-deploy-delete or 
ssh-deploy-delete-both is missing" :warning))))
 
 (defun ssh-deploy-diff-mode--difference (parts)
   "If file exists in both start a difference session based on PARTS."
@@ -261,7 +261,7 @@
                    (path-local (file-truename (concat root-local file-name)))
                    (path-remote (concat root-remote file-name)))
               (ssh-deploy-diff-files path-local path-remote)))
-      (display-warning "ssh-deploy" "Function ssh-deploy-diff-files is 
missing" :warning))
+      (display-warning 'ssh-deploy "Function ssh-deploy-diff-files is missing" 
:warning))
     (message "File must exists in both roots to perform a difference 
action.")))
 
 (defun ssh-deploy-diff-mode--open (parts)
diff --git a/ssh-deploy.el b/ssh-deploy.el
index e6fbe3b..a1bce06 100644
--- a/ssh-deploy.el
+++ b/ssh-deploy.el
@@ -4,7 +4,7 @@
 ;; Maintainer: Christian Johansson <github.com/cjohansson>
 ;; Created: 5 Jul 2016
 ;; Modified: 20 Apr 2018
-;; Version: 1.86
+;; Version: 1.87
 ;; Keywords: tools, convenience
 ;; URL: https://github.com/cjohansson/emacs-ssh-deploy
 
@@ -321,7 +321,7 @@
                (lambda(return)
                  (if (= (nth 0 return) 0)
                      (message (nth 1 return))
-                   (display-warning "ssh-deploy" (nth 1 return) :warning)))))
+                   (display-warning 'ssh-deploy (nth 1 return) :warning)))))
           (progn
             (message "Uploading directory '%s' to '%s'.. (asynchronously)" 
path-local path-remote)
             (async-start
@@ -350,8 +350,8 @@
                     (copy-file path-local path-remote t t t t)
                     (ssh-deploy-store-revision path-local revision-folder)
                     (message "Completed upload of '%s'. (synchronously)" 
path-local))
-                (display-warning "ssh-deploy" (format "Remote file '%s' has 
changed, please download or diff. (synchronously)" path-remote) :warning))
-            (display-warning "ssh-deploy" "Function 'ediff-same-file-contents' 
is missing." :warning)))
+                (display-warning 'ssh-deploy (format "Remote file '%s' has 
changed, please download or diff. (synchronously)" path-remote) :warning))
+            (display-warning 'ssh-deploy "Function 'ediff-same-file-contents' 
is missing." :warning)))
       (progn
         (message "Uploading directory '%s' to '%s'.. (synchronously)" 
path-local path-remote)
         (copy-directory path-local path-remote t t t)
@@ -375,7 +375,7 @@
               ,path-local))
          (lambda(return-path)
            (message "Completed download of '%s'. (asynchronously)" 
return-path))))
-    (display-warning "ssh-deploy" "async.el is not installed" :warning)))
+    (display-warning 'ssh-deploy "async.el is not installed" :warning)))
 
 (defun ssh-deploy--download-via-tramp (path-remote path-local revision-folder)
   "Download PATH-REMOTE to PATH-LOCAL via TRAMP synchronously and store a copy 
in REVISION-FOLDER."
@@ -495,8 +495,8 @@
                  files-both))
 
             (list directory-a directory-b exclude-list files-both files-a-only 
files-b-only files-both-equals files-both-differs))
-        (display-warning "ssh-deploy" "Both directories need to exist to 
perform difference generation." :warning))
-    (display-warning "ssh-deploy" "Function 'string-remove-prefix' is 
missing." :warning)))
+        (display-warning 'ssh-deploy "Both directories need to exist to 
perform difference generation." :warning))
+    (display-warning 'ssh-deploy "Function 'string-remove-prefix' is missing." 
:warning)))
 
 (defun ssh-deploy--diff-directories-present (diff)
   "Present difference data for directories from DIFF."
@@ -581,7 +581,7 @@
         (if (ediff-same-file-contents file-a file-b)
             (message "Files have identical contents.")
           (ediff file-a file-b)))
-    (display-warning "ssh-deploy" "Function 'ediff-same-file-contents' is 
missing." :warning)))
+    (display-warning 'ssh-deploy "Function 'ediff-same-file-contents' is 
missing." :warning)))
 
 ;;;### autoload
 (defun ssh-deploy-diff-directories (directory-a directory-b &optional 
exclude-list async)
@@ -641,15 +641,15 @@
                        (lambda(return)
                          (if (= (nth 0 return) 0)
                              (message (nth 1 return))
-                           (display-warning "ssh-deploy" (nth 1 return) 
:warning))))
+                           (display-warning 'ssh-deploy (nth 1 return) 
:warning))))
                     (if (file-exists-p path-remote)
                         (progn
                           (require 'ediff-util)
                           (if (fboundp 'ediff-same-file-contents)
                               (if (ediff-same-file-contents revision-path 
path-remote)
                                   (message "Remote file '%s' has not changed. 
(synchronously)" path-remote)
-                                (display-warning "ssh-deploy" (format "Remote 
file '%s' has changed, please download or diff. (synchronously)" path-remote) 
:warning))
-                            (display-warning "ssh-deploy" "Function 
'ediff-same-file-contents' is missing. (synchronously)" :warning)))
+                                (display-warning 'ssh-deploy (format "Remote 
file '%s' has changed, please download or diff. (synchronously)" path-remote) 
:warning))
+                            (display-warning 'ssh-deploy "Function 
'ediff-same-file-contents' is missing. (synchronously)" :warning)))
                       (message "Remote file '%s' doesn't exist. 
(synchronously)" path-remote)))
                 (if (and async (fboundp 'async-start))
                     (async-start
@@ -668,7 +668,7 @@
                      (lambda(return)
                        (if (= (nth 0 return) 0)
                            (message (nth 1 return))
-                         (display-warning "ssh-deploy" (nth 1 return) 
:warning))))
+                         (display-warning 'ssh-deploy (nth 1 return) 
:warning))))
                   (if (file-exists-p path-remote)
                       (progn
                         (require 'ediff-util)
@@ -677,8 +677,8 @@
                                 (progn
                                   (copy-file path-local revision-path t t t t)
                                   (message "Remote file '%s' has not changed, 
created base revision. (synchronously)" path-remote))
-                              (display-warning "ssh-deploy" (format "Remote 
file '%s' has changed, please download or diff. (synchronously)" path-remote) 
:warning))
-                          (display-warning "ssh-deploy" "Function 
'ediff-same-file-contents' is missing. (synchronously)" :warning)))
+                              (display-warning 'ssh-deploy (format "Remote 
file '%s' has changed, please download or diff. (synchronously)" path-remote) 
:warning))
+                          (display-warning 'ssh-deploy "Function 
'ediff-same-file-contents' is missing. (synchronously)" :warning)))
                     (message "Remote file '%s' does not exist. 
(synchronously)" path-remote)))))))))
 
 (defun ssh-deploy-delete (path &optional async debug)
@@ -696,7 +696,7 @@
             (list ,path 1)))
        (lambda(response)
          (cond ((= 0 (nth 1 response)) (message "Completed deletion of '%s'. 
(asynchronously)" (nth 0 response)))
-               (t (display-warning "ssh-deploy" (format "Did not find '%s' for 
deletion. (asynchronously)" (nth 0 response)) :warning)))))
+               (t (display-warning 'ssh-deploy (format "Did not find '%s' for 
deletion. (asynchronously)" (nth 0 response)) :warning)))))
     (if (file-exists-p path)
         (let ((file-or-directory (not (file-directory-p path))))
           (progn
@@ -704,7 +704,7 @@
                 (delete-file path t)
               (delete-directory path t t))
             (message "Completed deletion of '%s'. (synchronously)" path)))
-      (display-warning "ssh-deploy" (format "Did not find '%s' for deletion. 
(synchronously)" path) :warning))))
+      (display-warning 'ssh-deploy (format "Did not find '%s' for deletion. 
(synchronously)" path) :warning))))
 
 ;;;### autoload
 (defun ssh-deploy-delete-both (path-local &optional root-local root-remote 
async debug exclude-list)
@@ -782,7 +782,7 @@
     (set (make-local-variable 'sql-user) old-ssh-deploy-remote-sql-user)
     (cond ((string= sql-type "mysql") (sql-mysql remote-path))
           ((string= sql-type "postgres") (sql-postgres remote-path))
-          (t (display-warning "ssh-deploy" (format "SQL type %s not supported" 
type) :warning)))))
+          (t (display-warning 'ssh-deploy (format "SQL type %s not supported" 
type) :warning)))))
 
 ;;;### autoload
 (defun ssh-deploy-browse-remote (path-local &optional root-local root-remote 
exclude-list)