Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Minimal support for arrow syntax

Ignore-this: feec62c998692c3e11431afdc7035f90

darcs-hash:20100702101637-f57bf-bebf06c50c7a3f9cea69a6a5c7877346c8771591.gz
  • Loading branch information...
commit fcafdd8e6a0dcc9248321c5fa35c205240e6c301 1 parent a2a8353
Svein Ove Aas Baughn authored
Showing with 13 additions and 10 deletions.
  1. +4 −1 haskell-indentation.el
  2. +9 −9 haskell-site-file.el
5 haskell-indentation.el
View
@@ -442,6 +442,9 @@ Preserves indentation and removes extra whitespace"
("\\" . (lambda () (haskell-indentation-phrase
'(haskell-indentation-expression
"->" haskell-indentation-expression))))
+ ("proc" . (lambda () (haskell-indentation-phrase
+ '(haskell-indentation-expression
+ "->" haskell-indentation-expression))))
("where" . (lambda () (haskell-indentation-with-starter
#'haskell-indentation-declaration-layout nil)))
("::" . (lambda () (haskell-indentation-statement-right #'haskell-indentation-type)))
@@ -848,7 +851,7 @@ Preserves indentation and removes extra whitespace"
(t (setq current-token (haskell-indentation-peek-token))))))))
(defun haskell-indentation-peek-token ()
- (cond ((looking-at "\\(if\\|then\\|else\\|let\\|in\\|mdo\\|do\\|case\\|of\\|where\\|module\\|deriving\\|data\\|type\\|newtype\\|class\\|instance\\)\\([^[:alpha:]']\\|$\\)")
+ (cond ((looking-at "\\(if\\|then\\|else\\|let\\|in\\|mdo\\|do\\|proc\\|case\\|of\\|where\\|module\\|deriving\\|data\\|type\\|newtype\\|class\\|instance\\)\\([^[:alpha:]']\\|$\\)")
(match-string 1))
((looking-at "[][(){}[,;]")
(match-string 0))
18 haskell-site-file.el
View
@@ -26,7 +26,7 @@ Major mode for Cabal package description files.
;;;***
;;;### (autoloads (haskell-decl-scan-mode) "haskell-decl-scan" "haskell-decl-scan.el"
-;;;;;; (19206 35523))
+;;;;;; (19222 37798))
;;; Generated autoloads from haskell-decl-scan.el
(autoload 'haskell-decl-scan-mode "haskell-decl-scan" "\
@@ -76,7 +76,7 @@ Invokes `haskell-decl-scan-mode-hook'.
;;;***
;;;### (autoloads (haskell-doc-show-type haskell-doc-mode) "haskell-doc"
-;;;;;; "haskell-doc.el" (19206 35819))
+;;;;;; "haskell-doc.el" (19222 37798))
;;; Generated autoloads from haskell-doc.el
(autoload 'haskell-doc-mode "haskell-doc" "\
@@ -99,7 +99,7 @@ current buffer.
;;;***
;;;### (autoloads (haskell-indent-mode) "haskell-indent" "haskell-indent.el"
-;;;;;; (19206 35819))
+;;;;;; (19222 37798))
;;; Generated autoloads from haskell-indent.el
(autoload 'haskell-indent-mode "haskell-indent" "\
@@ -131,7 +131,7 @@ Invokes `haskell-indent-hook' if not nil.
;;;***
;;;### (autoloads (haskell-indentation-mode) "haskell-indentation"
-;;;;;; "haskell-indentation.el" (19216 1488))
+;;;;;; "haskell-indentation.el" (19222 37798))
;;; Generated autoloads from haskell-indentation.el
(autoload 'haskell-indentation-mode "haskell-indentation" "\
@@ -145,7 +145,7 @@ autofill-mode.
;;;***
;;;### (autoloads (haskell-hayoo haskell-hoogle literate-haskell-mode
-;;;;;; haskell-mode) "haskell-mode" "haskell-mode.el" (19217 23751))
+;;;;;; haskell-mode) "haskell-mode" "haskell-mode.el" (19222 37798))
;;; Generated autoloads from haskell-mode.el
(add-to-list 'load-path (or (file-name-directory load-file-name) (car load-path)))
@@ -213,8 +213,8 @@ Do a Hayoo search for QUERY.
;;;### (autoloads (inferior-haskell-find-haddock inferior-haskell-find-definition
;;;;;; inferior-haskell-info inferior-haskell-type inferior-haskell-load-file
-;;;;;; switch-to-haskell) "inf-haskell" "inf-haskell.el" (19214
-;;;;;; 18334))
+;;;;;; switch-to-haskell) "inf-haskell" "inf-haskell.el" (19222
+;;;;;; 37798))
;;; Generated autoloads from inf-haskell.el
(defalias 'run-haskell 'switch-to-haskell)
@@ -268,8 +268,8 @@ we load it.
;;;***
;;;### (autoloads nil nil ("haskell-font-lock.el" "haskell-ghci.el"
-;;;;;; "haskell-hugs.el" "haskell-simple-indent.el") (19217 23753
-;;;;;; 561352))
+;;;;;; "haskell-hugs.el" "haskell-simple-indent.el" "test.el") (19222
+;;;;;; 37817 315467))
;;;***
Please sign in to comment.
Something went wrong with that request. Please try again.