[Fencommits] fenfire-hs: merge

[Benja Fallenstein]

Wed Feb 21 14:23:23 EET 2007  Benja Fallenstein <benja.fallenstein at gmail.com>
  * merge
diff -rN -u old-fenfire-hs/Fenfire.fhs new-fenfire-hs/Fenfire.fhs
--- old-fenfire-hs/Fenfire.fhs	2007-02-21 14:26:11.000000000 +0200
+++ new-fenfire-hs/Fenfire.fhs	2007-02-21 14:26:11.000000000 +0200
@@ -319,7 +319,9 @@
     let ?graph = foldr (\n -> insert $ triple dir (node, prop, n))
                        (fsGraph state) nodes in
     state { fsRotation = fromJust $ fromPath (Path node [Conn prop dir (head nodes)]),
-            fsGraph = ?graph, fsMark = Set.empty }
+            fsGraph = ?graph, fsMark = Set.empty, fsGraphModified = True,
+            fsUndo = (fsGraph state,fsRotation state):fsUndo state,
+            fsRedo = [] }
 
 disconnect :: (?vs :: ViewSettings) => Dir -> Endo FenState
 disconnect dir state@(FenState { fsRotation=rot@(Rotation node _) }) =
@@ -501,7 +503,8 @@
     fsMark = Set.insert n $ Set.delete m $ fsMark s,
     fsProperty = f (fsProperty s), fsPropertyList = map f (fsPropertyList s),
     fsGraphModified = True,
-    fsFilePath = fsFilePath s, fsHasFocus = fsHasFocus s, fsView = fsView s
+    fsFilePath = fsFilePath s, fsHasFocus = fsHasFocus s, fsView = fsView s,
+    fsUndo = (fsGraph s, fsRotation s) : fsUndo s, fsRedo = []
     } where f x = if x == m then n else x
 
 handleEvent :: (?vs :: ViewSettings, ?pw :: Window, ?views :: Views,