Mercurial > dotfiles
changeset 359:76cd5cf09b44
Merge.
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Thu, 08 Jan 2015 16:22:36 -0500 |
parents | c7a9cd793e37 (diff) 08af9e123baa (current diff) |
children | 412a0d3c7d87 |
files | |
diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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)
--- 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],