ghcihalp.bat pyhalp.bat @@ -92,4 +92,4 @@ for j, r in enumerate(result_lines): i += 1 break -sys.stdout.write(''.join(output)) +sys.stdout.write(''.join(output).replace('\r\n', '\n')) ghcihalp.py @@ -37,7 +37,7 @@ (defun halp-update-python () (interactive) (halp-find-helpers-directory) - (halp-update/diff (concat halp-helpers-directory "pyhalp.py") + (halp-update/diff (concat halp-helpers-directory (pick-by-os "pyhalp.py" "pyhalp.bat")) (list (buffer-name (current-buffer))))) (defun halp-update-javascript () @@ -47,11 +47,11 @@ (defun halp-update-haskell () (interactive) - (halp-update-relative "ghcihalp.py" '(".hs"))) + (halp-update-relative (pick-by-os "ghcihalp.py" "ghcihalp.bat") '(".hs"))) (defun halp-update-literate-haskell () (interactive) - (halp-update-relative "ghcihalp.py" '(".lhs"))) + (halp-update-relative (pick-by-os "ghcihalp.py" "ghcihalp.bat") '(".lhs"))) (defun halp-update-relative (command args) (halp-find-helpers-directory) @@ -176,6 +176,10 @@ that outputs a diff." (defun halp-from (start) (buffer-substring start (point))) +(defun pick-by-os (default-file windows-file) + (if (eq system-type 'windows-nt) + windows-file + default-file)) ;; Wrap-up halp.el 07ec60c0478b8fb948f5e357ffc964b11dac0c90 Nada Amin namin@alum.mit.edu http://github.com/darius/halp/commit/34d00bd5e72faba5ae1e32cbce6ed379bd259018 34d00bd5e72faba5ae1e32cbce6ed379bd259018 2008-12-20T22:45:25-08:00 2008-12-18T23:56:58-08:00 Windows-compatible Signed-off-by: Darius Bacon <darius_bacon@yahoo.com> 10f279db3249ba5fca302afe808921af34f37f46 Darius Bacon darius_bacon@yahoo.com