Permalink
Browse files

(inferior-haskell-string-to-strings): Remove `separator' argument. Ca…

…ll split

Ignore-this: b1df8e2c867cebd50bde7516f1e66d84
(inferior-haskell-string-to-strings): Remove `separator' argument.  Call split
string without separator arg either, so that it drops null strings.

darcs-hash:20070508172838-c2f2e-10a85393dcfe55cc1a737ea18eaf1738be02d30f.gz
  • Loading branch information...
1 parent 2eaced4 commit 6784a8b0a4e11267de854b1650fc99bfaab881f6 monnier committed May 8, 2007
Showing with 13 additions and 9 deletions.
  1. +6 −0 ChangeLog
  2. +7 −9 inf-haskell.el
View
@@ -1,3 +1,9 @@
+2007-05-08 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * inf-haskell.el (inferior-haskell-string-to-strings):
+ Remove `separator' argument. Call split string without separator arg
+ either, so that it drops null strings.
+
2007-05-03 "David House" <dmhouse@gmail.com> (tiny change)
* inf-haskell.el (inferior-haskell-load-file): Save buffer before
View
@@ -100,17 +100,15 @@ The format should be the same as for `compilation-error-regexp-alist'.")
(add-to-list 'minor-mode-overriding-map-alist
(cons 'compilation-minor-mode map)))))
-(defun inferior-haskell-string-to-strings (string &optional separator)
- "Split the STRING into a list of strings.
-The SEPARATOR regexp defaults to \"\\s-+\"."
- (let ((sep (or separator "\\s-+"))
- (i (string-match "[\"]" string)))
- (if (null i) (split-string string sep) ; no quoting: easy
- (append (unless (eq i 0) (split-string (substring string 0 i) sep))
+(defun inferior-haskell-string-to-strings (string)
+ "Split the STRING into a list of strings."
+ (let ((i (string-match "[\"]" string)))
+ (if (null i) (split-string string) ; no quoting: easy
+ (append (unless (eq i 0) (split-string (substring string 0 i)))
(let ((rfs (read-from-string string i)))
(cons (car rfs)
(inferior-haskell-string-to-strings
- (substring string (cdr rfs)) sep)))))))
+ (substring string (cdr rfs)))))))))
(defun inferior-haskell-command (arg)
(inferior-haskell-string-to-strings
@@ -122,7 +120,7 @@ The SEPARATOR regexp defaults to \"\\s-+\"."
(defun inferior-haskell-start-process (command)
"Start an inferior haskell process.
-With universal prefix \\[universal-argument], prompts for a command,
+With universal prefix \\[universal-argument], prompts for a COMMAND,
otherwise uses `haskell-program-name'.
It runs the hook `inferior-haskell-hook' after starting the process and
setting up the inferior-haskell buffer."

0 comments on commit 6784a8b

Please sign in to comment.