# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1420752156 18000
# Node ID 76cd5cf09b44be5012bcc10e68d7ff2bcea67166
# Parent  c7a9cd793e37beb959889dd8040c4cf8ab357c7d# Parent  08af9e123baa001dab960bf1fd6474c0a9225907
Merge.

diff --git a/.elisp/settings/50.preferences.el b/.elisp/settings/50.preferences.el
--- a/.elisp/settings/50.preferences.el
+++ b/.elisp/settings/50.preferences.el
@@ -59,7 +59,7 @@
    ((eq window-system 'ns) ;; OS X
     (set-face-attribute 'default nil :height 120))
    (t ;; everywhere else
-    (set-face-attribute 'default nil :height 100)))
+    (set-face-attribute 'default nil :height 105)))
 )
 (af-gui-init)
 
diff --git a/unixSoft/bin/patchpipe b/unixSoft/bin/patchpipe
--- a/unixSoft/bin/patchpipe
+++ b/unixSoft/bin/patchpipe
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+import base64
 import os
 import subprocess
 import sys
@@ -6,6 +7,8 @@ import tempfile
 
 _PATCHHDR = '# HG changeset patch'
 
+_BASE64_MAGIC = 'Content-Transfer-Encoding: base64'
+
 
 def main(argv):
     tf = tempfile.NamedTemporaryFile(suffix='.diff')
@@ -13,6 +16,9 @@ def main(argv):
     if _PATCHHDR in d:
         junk, d = d.split(_PATCHHDR, 1)
         d = _PATCHHDR + d
+    elif _BASE64_MAGIC in d:
+        junk, d = d.split('\n\n', 1)
+        d = d.decode('base64')
     tf.write(d)
     tf.flush()
     subprocess.check_call([os.environ['EDITOR'], tf.name],