Assimilate scpaste 0.6.5-19-gca95a8d

Now with support for Emacs's htmlfontify library.

diff --git a/.gitmodules b/.gitmodules
index 4ffaf5f..4710af9 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -65,6 +65,9 @@
 [submodule "s"]
        path = lib/s
        url = https://github.com/magnars/s.el.git
 [submodule "s"]
        path = lib/s
        url = https://github.com/magnars/s.el.git

+[submodule "scpaste"]
+       path = lib/scpaste
+       url = https://github.com/technomancy/scpaste.git

 [submodule "switch-buffer-functions"]
        path = lib/switch-buffer-functions
        url = https://github.com/10sr/switch-buffer-functions-el.git
 [submodule "switch-buffer-functions"]
        path = lib/switch-buffer-functions
        url = https://github.com/10sr/switch-buffer-functions-el.git

diff --git a/init.el b/init.el
index 4eb0129..bcde97a 100644 (file)
--- a/init.el
+++ b/init.el
@@ -666,6 +666,11 @@ For disabling the behaviour for certain buffers and/or modes."
 ;; IRC (with ERC and ZNC)
 (require 'bandali-erc)
 
 ;; IRC (with ERC and ZNC)
 (require 'bandali-erc)
 

+(use-package scpaste
+  :config
+  (setq scpaste-http-destination "https://p.bndl.org"
+        scpaste-scp-destination "p:~"))
+

 \f
 ;;; Editing
 
 \f
 ;;; Editing
 


@@ -1368,12 +1373,6 @@ For disabling the behaviour for certain buffers and/or modes."
   :config
   (eosd-start))
 
   :config
   (eosd-start))
 

-(use-package scpaste
-  :disabled
-  :config
-  (setq scpaste-http-destination "https://p.bndl.org"
-        scpaste-scp-destination "nix:/var/www/p.bndl.org"))
-

 (use-package eww
   :bind ("C-c a e w" . eww)
   :custom
 (use-package eww
   :bind ("C-c a e w" . eww)
   :custom

diff --git a/lib/scpaste b/lib/scpaste
new file mode 160000 (submodule)
index 0000000..ca95a8d
--- /dev/null
+++ b/lib/scpaste
@@ -0,0 +1 @@
+Subproject commit ca95a8dd088e848bd1cab6be207c6a98343ee176