Merge branch 'alphapapa-without-eval'

webpaste.el

@@ -1,4 +1,4 @@
-;;; webpaste.el --- Paste to pastebin-like services
+;;; webpaste.el --- Paste to pastebin-like services  -*- lexical-binding: t; -*-
 
 ;; Copyright (c) 2016 Elis Axelsson
 
@@ -59,13 +59,7 @@ if that variable is nil, it will use the list of names from ‘webpaste-provider
 each run.")
 
 
-(cl-defmacro webpaste-provider
+(cl-defun webpaste-provider (&key domain (type "POST") parser post-data post-field success)
-    (&key (domain)
-          (type "POST")
-          (parser)
-          (post-data ())
-          (post-field)
-          (success))
   "Macro to create the lambda function for a provider.
 
 This macro accepts the parameters :domain, :type, :parser, :post-data,
@@ -83,30 +77,28 @@ Usage:
 :post-field  Name of the field to insert the code into.
 :success     Callback sent to `request`, look up how to write these in the
              documentation for `request`"
-  `(lambda (text)
+  (lambda (text)
     "Paste TEXT to provider"
 
     ;; Local variable post-data
-     (let ((post-data ,post-data))
+    (cl-pushnew (cons post-field text) post-data)
-       ;; Push field with text to post-data
-       (cl-pushnew (cons ,post-field text) post-data)
 
     ;; Do request
-       (request ,domain
+    (request domain
-                :type ,type
+             :type type
              :data post-data
-                :parser ,parser
+             :parser parser
-                :success ,success
+             :success success
              :error
              (cl-function (lambda (&key error-thrown &allow-other-keys)
                             (message "Got error: %S" error-thrown)
                             (webpaste-paste-text text))))
-       nil)))
+    nil))
 
 
 ;;; Define providers
 (defcustom webpaste-providers-alist
-  '(("ix.io" .
+  (list (list "ix.io"
               (webpaste-provider
                :domain "http://ix.io/"
                :parser 'buffer-string
@@ -117,7 +109,7 @@ Usage:
                                 (webpaste-return-url
                                  (replace-regexp-in-string "\n$" "" data)))))))
 
-    ("sprunge.us" .
+        (list "sprunge.us"
               (webpaste-provider
                :domain "http://sprunge.us/"
                :parser 'buffer-string
@@ -128,7 +120,7 @@ Usage:
                                 (webpaste-return-url
                                  (replace-regexp-in-string "\n$" "" data)))))))
 
-    ("dpaste.com" .
+        (list "dpaste.com"
               (webpaste-provider
                :domain "http://dpaste.com/api/v2/"
                :parser 'buffer-string
@@ -142,7 +134,7 @@ Usage:
                               (webpaste-return-url
                                (request-response-header response "Location"))))))
 
-    ("dpaste.de" .
+        (list "dpaste.de"
               (webpaste-provider
                :domain "https://dpaste.de/api/"
                :parser 'buffer-string
@@ -216,7 +208,7 @@ When we run out of providers to try, it will restart since
     (setq webpaste-tested-providers (cdr webpaste-tested-providers))
 
     ;; Run pasting function
-    (funcall (eval (cdr (assoc provider-name webpaste-providers-alist))) text)))
+    (funcall (cadr (assoc provider-name webpaste-providers-alist)) text)))
 
 
 ;;;###autoload