Merge branch 'master' of ssh://git.madduck.net/~/git/pub/etc/zsh

diff --git a/.zsh/func/paste b/.zsh/func/paste
new file mode 100755 (executable)
index 0000000..46e21af
--- /dev/null
+++ b/.zsh/func/paste
@@ -0,0 +1,13 @@
+#!/bin/zsh
+#
+# func/paste
+#
+# function to publicise stdin
+#
+# Copyright © 1994–2008 martin f. krafft <madduck@madduck.net>
+# Released under the terms of the Artistic Licence 2.0
+#
+# Source repository: http://git.madduck.net/v/etc/zsh.git
+#
+
+pub $(vit -)

diff --git a/.zsh/func/urlencode b/.zsh/func/urlencode
old mode 100644 (file)
new mode 100755 (executable)
index 21e8ab7..604edbe
--- a/.zsh/func/urlencode
+++ b/.zsh/func/urlencode
@@ -1,4 +1,16 @@
-# http://www.michael-prokop.at/computer/config/.zshrc
+#!/bin/zsh
+#
+# func/urlencode
+#
+# encode strings for use with URLs
+#
+# Copyright © 1994–2008 martin f. krafft <madduck@madduck.net>
+# Released under the terms of the Artistic Licence 2.0
+#
+# Source repository: http://git.madduck.net/v/etc/zsh.git
+#
+# Based on http://www.michael-prokop.at/computer/config/.zshrc
+
 setopt localoptions extendedglob
 input=( ${(s::)1} )
 print ${(j::)input/(#b)([^A-Za-z0-9_.!~*\'\(\)-])/%$(([##16]#match))}

diff --git a/.zsh/zshrc/40_paste b/.zsh/zshrc/40_paste
deleted file mode 100644 (file)
index 2bbf6f5..0000000
--- a/.zsh/zshrc/40_paste
+++ /dev/null
@@ -1,27 +0,0 @@
-# zshrc/40_paste
-#
-# adapters for rafb.pl
-#
-# Copyright © 1994–2008 martin f. krafft <madduck@madduck.net>
-# Released under the terms of the Artistic Licence 2.0
-#
-# Source repository: http://git.madduck.net/v/etc/zsh.git
-#
-
-p()
-{
-  local url
-  eval url="$($BINDIR/rafb -n $USERNAME -d 'paste by $USERNAME' $*)"
-  [[ -z $url ]] && return 1
-  echo "${url:r}.txt"
-}
-
-vp()
-{
-  local tmpfile="$(vit)"
-  setopt localtraps
-  trap "rm -f '$tmpfile'" 0
-  p "$tmpfile"
-}
-
-# vim:ft=zsh