Changeset bd783db for functions.c

Timestamp:

May 12, 2009, 11:39:44 PM (15 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

3d08168

Parents:

70110286

Message:

Error on swap when mark has not been set.
Also, initialize the mark and drop a global member that I didn't use.

File:

• functions.c (modified) (2 diffs)

functions.c

@@ -3563 +3563 @@
   owl_view *v;
 
+  marked_id=owl_global_get_markedmsgid(&g);
+  if (marked_id == -1) {
+    owl_function_error("Mark not set.");
+    return;
+  }
+
   v=owl_global_get_current_view(&g);
   /* bail if there's no current message */
@@ -3568 +3574 @@
     return;
   }
+
   m=owl_view_get_element(v, owl_global_get_curmsg(&g));
-  marked_id=owl_global_get_markedmsgid(&g);
-
   _owl_function_mark_message(m);
-
   owl_global_set_curmsg(&g, owl_view_get_nearest_to_msgid(v, marked_id));
   owl_mainwin_redisplay(owl_global_get_mainwin(&g));