Merge lp:~gcrosswhite/leo-editor/fix-haskell-support into lp:leo-editor/old-trunk

Proposed by Gregory Crosswhite
Status: Merged
Merged at revision: not available
Proposed branch: lp:~gcrosswhite/leo-editor/fix-haskell-support
Merge into: lp:leo-editor/old-trunk
Diff against target: None lines
To merge this branch: bzr merge lp:~gcrosswhite/leo-editor/fix-haskell-support
Reviewer Review Type Date Requested Status
The Leo editor team Pending
Review via email: mp+10832@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Gregory Crosswhite (gcrosswhite) wrote :

Contains a fix that allows Leo to properly support Haskell.

At the moment tangled Haskell sources do not compile; the fix is to force the tangler to use "-- " (note the space) instead of "--" for the line comment marker. This patch contains an update to the language deliminator dictionary which uses the "underscore hack" to accmplish this.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'leo/core/leoApp.py'
--- leo/core/leoApp.py 2009-08-12 21:52:50 +0000
+++ leo/core/leoApp.py 2009-08-28 05:46:38 +0000
@@ -128,6 +128,7 @@
128 "forth" : "\\_ _(_ _)", # Use the "REM hack"128 "forth" : "\\_ _(_ _)", # Use the "REM hack"
129 "fortran" : "C",129 "fortran" : "C",
130 "fortran90" : "!",130 "fortran90" : "!",
131 "haskell" : "--_ {-_ _-}",
131 "html" : "<!-- -->",132 "html" : "<!-- -->",
132 "ini" : ";",133 "ini" : ";",
133 "java" : "// /* */",134 "java" : "// /* */",
@@ -173,6 +174,7 @@
173 "forth" : "forth",174 "forth" : "forth",
174 "fortran" : "f",175 "fortran" : "f",
175 "fortran90" : "f90",176 "fortran90" : "f90",
177 "haskell" : "hs",
176 "html" : "html",178 "html" : "html",
177 "ini" : "ini",179 "ini" : "ini",
178 "java" : "java",180 "java" : "java",
@@ -220,6 +222,7 @@
220 "f90" : "fortran90",222 "f90" : "fortran90",
221 "h" : "c",223 "h" : "c",
222 "html" : "html",224 "html" : "html",
225 "hs" : "haskell",
223 "ini" : "ini",226 "ini" : "ini",
224 "java" : "java",227 "java" : "java",
225 "ksh" : "kshell", # Leo 4.5.1.228 "ksh" : "kshell", # Leo 4.5.1.

Subscribers

People subscribed via source and target branches

to status/vote changes: