@@ -37,22 +37,25 @@ (defun halp-update-python () (interactive) (halp-find-helpers-directory) - (halp-update/diff (concat halp-helpers-directory - (pick-by-os "pyhalp.py" "pyhalp.bat")) - (list (buffer-name (current-buffer))))) + (halp-py-update/diff (concat halp-helpers-directory "pyhalp.py") + (list (buffer-name (current-buffer))))) (defun halp-update-javascript () (interactive) (halp-find-helpers-directory) - (halp-update/diff (concat halp-helpers-directory "v8halp.py") '())) + (halp-py-update/diff (concat halp-helpers-directory "v8halp.py") '())) (defun halp-update-haskell () (interactive) - (halp-update-relative (pick-by-os "ghcihalp.py" "ghcihalp.bat") '(".hs"))) + (halp-py-update-relative "ghcihalp.py" '(".hs"))) (defun halp-update-literate-haskell () (interactive) - (halp-update-relative (pick-by-os "ghcihalp.py" "ghcihalp.bat") '(".lhs"))) + (halp-py-update-relative "ghcihalp.py" '(".lhs"))) + +(defun halp-py-update-relative (command args) + (halp-find-helpers-directory) + (halp-update "python" (cons (concat halp-helpers-directory command) args))) (defun halp-update-relative (command args) (halp-find-helpers-directory) @@ -86,6 +89,9 @@ loaded from, if it's not yet initialized." (message "Halp starting... helper process failed")) (t (message rc)))))) +(defun halp-py-update/diff (command args) + (halp-update/diff "python" (cons command args))) + (defun halp-update/diff (command args) "Update the current buffer using an external helper program that outputs a diff." @@ -177,11 +183,6 @@ 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-add-all-hooks) halp.el ghcihalp.bat pyhalp.bat f6a0efd2b02ebbfcd00d85ef71a4e04214cf9a3d Nada Amin namin@alum.mit.edu http://github.com/darius/halp/commit/d16fa326428e352ec795935bcaf745706450c9f3 d16fa326428e352ec795935bcaf745706450c9f3 2008-12-20T22:45:26-08:00 2008-12-20T14:09:20-08:00 avoid .bat files by changing halp.el to invoke subprocesses explicitly with python Signed-off-by: Darius Bacon <darius_bacon@yahoo.com> 620f767fa79e95ab32b3a51b9cba9b6f7789bb1a Darius Bacon darius_bacon@yahoo.com