[packages/mutt.git] / patch-0.94.7.sec.previous_jump.1

--- mutt-0.94.7i/OPS.orig	Sat Sep 12 21:23:27 1998
+++ mutt-0.94.7i/OPS	Sat Sep 19 02:54:15 1998
@@ -115,6 +115,7 @@
 OP_PAGER_TOP "jump to the top of the message"
 OP_PIPE "pipe message/attachment to a shell command"
 OP_PREV_ENTRY "move to the previous entry"
+OP_PREV_JUMP "jump to the previously selected message"
 OP_PREV_LINE "scroll up one line"
 OP_PREV_PAGE "move to the previous page"
 OP_PRINT "print the current entry"
--- mutt-0.94.7i/curs_main.c.orig	Wed Sep 16 07:57:23 1998
+++ mutt-0.94.7i/curs_main.c	Sat Sep 19 02:55:06 1998
@@ -240,6 +240,7 @@
   int tag = 0;                 /* has the tag-prefix command been pressed? */
   int newcount = -1;
   int oldcount = -1;
+  int LastJumped = -1;
   int rc = -1;
   MUTTMENU *menu;
   char *cp;                    /* temporary variable. */
@@ -627,6 +628,7 @@
 	  if (j >= 0)
 	  {
 	    menu->current = Context->hdrs[j]->virtual;
+	    LastJumped=Context->v2r[menu->current]+1;
 	    if (menu->menu == MENU_PAGER)
 	    {
 	      op = OP_DISPLAY_MESSAGE;
@@ -915,6 +917,7 @@
 			      the folder */
 	menu->redraw = REDRAW_FULL;
 	set_option (OPTSEARCHINVALID);
+	LastJumped=-1;
 	break;
 
       case OP_DISPLAY_MESSAGE:
@@ -1043,6 +1046,29 @@
 	  menu->redraw = REDRAW_MOTION;
 	break;
 
+      case OP_PREV_JUMP:
+	i=LastJumped;
+	if (i > 0 && i <= Context->msgcount)
+	{
+	  if (Context->hdrs[i-1]->virtual != -1)
+	  {
+	    LastJumped=Context->v2r[menu->current]+1;
+	    menu->current = Context->hdrs[i-1]->virtual;
+	    if (menu->menu == MENU_PAGER)
+	    {
+	      op = OP_DISPLAY_MESSAGE;
+	      continue;
+	    }
+	    else
+	    menu->redraw = REDRAW_MOTION;
+	  }
+	  else
+	    mutt_error ("That message is not visible.");
+	}
+	else
+	  mutt_error ("No target yet.");
+	break;
+
       case OP_PREV_ENTRY:
 
 	CHECK_MSGCOUNT;
@@ -1111,6 +1137,7 @@
       case OP_MAIN_PREV_UNREAD:
 
 	CHECK_MSGCOUNT;
+	LastJumped=Context->v2r[menu->current]+1;
 	i = menu->current;
 	menu->current = -1;
 	for (j = 0; j != Context->vcount; j++)
@@ -1244,6 +1271,7 @@
       case OP_MAIN_PREV_SUBTHREAD:
 
 	CHECK_MSGCOUNT;
+	i=Context->v2r[menu->current]+1;
 	switch (op)
 	{
 	  case OP_MAIN_NEXT_THREAD:
@@ -1424,11 +1424,13 @@
 	}
 	else if (menu->menu == MENU_PAGER)
         {
+	       LastJumped=i;
           op = OP_DISPLAY_MESSAGE;
           continue;
         }
         else
           menu->redraw = REDRAW_MOTION;
+	LastJumped=i;
 	break;
 
       case OP_MAIN_SET_FLAG:
--- mutt-0.94.7i/functions.h.orig	Sat Sep 12 21:23:30 1998
+++ mutt-0.94.7i/functions.h	Sat Sep 19 02:54:16 1998
@@ -87,6 +87,7 @@
   { "display-headers",		OP_DISPLAY_HEADERS,		"h" },
   { "next-undeleted",		OP_MAIN_NEXT_UNDELETED,		"j" },
   { "previous-undeleted",	OP_MAIN_PREV_UNDELETED,		"k" },
+  { "previous-jump",		OP_PREV_JUMP,			"\033b" },
   { "limit",			OP_MAIN_LIMIT,			"l" },
   { "list-reply",		OP_LIST_REPLY,			"L" },
   { "mail",			OP_MAIL,			"m" },
@@ -163,6 +164,7 @@
   { "next-entry",	OP_NEXT_ENTRY,			"J" },
   { "previous-undeleted",OP_MAIN_PREV_UNDELETED,	"k" },
   { "previous-entry",	OP_PREV_ENTRY,			"K" },
+  { "previous-jump",	OP_PREV_JUMP,			"\033b" },
   { "list-reply",	OP_LIST_REPLY,			"L" },
   { "redraw-screen",	OP_REDRAW,			"\014" },
   { "mail",		OP_MAIL,			"m" },
--- mutt-0.94.7i/patchlist.c.orig	Sat Sep 19 02:29:51 1998
+++ mutt-0.94.7i/patchlist.c	Sat Sep 19 02:54:16 1998
@@ -16,6 +16,8 @@
 
 
 
+  printf("Feature patch: previous-jump        0.94.7 by Stefan `Sec` Zehl\n");
+
 
 
   /* DO NOT MODIFY AFTER THIS LINE */
Commit	Line	Data
7e5fb030	1	--- mutt-0.94.7i/OPS.orig Sat Sep 12 21:23:27 1998
	2	+++ mutt-0.94.7i/OPS Sat Sep 19 02:54:15 1998
	3	@@ -115,6 +115,7 @@
	4	OP_PAGER_TOP "jump to the top of the message"
	5	OP_PIPE "pipe message/attachment to a shell command"
	6	OP_PREV_ENTRY "move to the previous entry"
	7	+OP_PREV_JUMP "jump to the previously selected message"
	8	OP_PREV_LINE "scroll up one line"
	9	OP_PREV_PAGE "move to the previous page"
	10	OP_PRINT "print the current entry"
	11	--- mutt-0.94.7i/curs_main.c.orig Wed Sep 16 07:57:23 1998
	12	+++ mutt-0.94.7i/curs_main.c Sat Sep 19 02:55:06 1998
	13	@@ -240,6 +240,7 @@
	14	int tag = 0; /* has the tag-prefix command been pressed? */
	15	int newcount = -1;
	16	int oldcount = -1;
	17	+ int LastJumped = -1;
	18	int rc = -1;
	19	MUTTMENU *menu;
	20	char cp; / temporary variable. */
	21	@@ -627,6 +628,7 @@
	22	if (j >= 0)
	23	{
	24	menu->current = Context->hdrs[j]->virtual;
	25	+ LastJumped=Context->v2r[menu->current]+1;
	26	if (menu->menu == MENU_PAGER)
	27	{
	28	op = OP_DISPLAY_MESSAGE;
	29	@@ -915,6 +917,7 @@
	30	the folder */
	31	menu->redraw = REDRAW_FULL;
	32	set_option (OPTSEARCHINVALID);
	33	+ LastJumped=-1;
	34	break;
	35
	36	case OP_DISPLAY_MESSAGE:
	37	@@ -1043,6 +1046,29 @@
	38	menu->redraw = REDRAW_MOTION;
	39	break;
	40
	41	+ case OP_PREV_JUMP:
	42	+ i=LastJumped;
	43	+ if (i > 0 && i <= Context->msgcount)
	44	+ {
	45	+ if (Context->hdrs[i-1]->virtual != -1)
	46	+ {
	47	+ LastJumped=Context->v2r[menu->current]+1;
	48	+ menu->current = Context->hdrs[i-1]->virtual;
	49	+ if (menu->menu == MENU_PAGER)
	50	+ {
	51	+ op = OP_DISPLAY_MESSAGE;
	52	+ continue;
	53	+ }
	54	+ else
	55	+ menu->redraw = REDRAW_MOTION;
	56	+ }
	57	+ else
	58	+ mutt_error ("That message is not visible.");
	59	+ }
	60	+ else
	61	+ mutt_error ("No target yet.");
	62	+ break;
	63	+
	64	case OP_PREV_ENTRY:
65
66	CHECK_MSGCOUNT;
67	@@ -1111,6 +1137,7 @@
68	case OP_MAIN_PREV_UNREAD:
69
70	CHECK_MSGCOUNT;
71	+ LastJumped=Context->v2r[menu->current]+1;
72	i = menu->current;
73	menu->current = -1;
74	for (j = 0; j != Context->vcount; j++)
75	@@ -1244,6 +1271,7 @@
76	case OP_MAIN_PREV_SUBTHREAD:
77
78	CHECK_MSGCOUNT;
79	+ i=Context->v2r[menu->current]+1;
80	switch (op)
81	{
82	case OP_MAIN_NEXT_THREAD:
83	@@ -1424,11 +1424,13 @@
84	}
85	else if (menu->menu == MENU_PAGER)
86	{
87	+ LastJumped=i;
88	op = OP_DISPLAY_MESSAGE;
89	continue;
90	}
91	else
92	menu->redraw = REDRAW_MOTION;
93	+ LastJumped=i;
94	break;
95
96	case OP_MAIN_SET_FLAG:
97	--- mutt-0.94.7i/functions.h.orig Sat Sep 12 21:23:30 1998
98	+++ mutt-0.94.7i/functions.h Sat Sep 19 02:54:16 1998
99	@@ -87,6 +87,7 @@
100	{ "display-headers", OP_DISPLAY_HEADERS, "h" },
101	{ "next-undeleted", OP_MAIN_NEXT_UNDELETED, "j" },
102	{ "previous-undeleted", OP_MAIN_PREV_UNDELETED, "k" },
103	+ { "previous-jump", OP_PREV_JUMP, "\033b" },
104	{ "limit", OP_MAIN_LIMIT, "l" },
105	{ "list-reply", OP_LIST_REPLY, "L" },
106	{ "mail", OP_MAIL, "m" },
107	@@ -163,6 +164,7 @@
108	{ "next-entry", OP_NEXT_ENTRY, "J" },
109	{ "previous-undeleted",OP_MAIN_PREV_UNDELETED, "k" },
110	{ "previous-entry", OP_PREV_ENTRY, "K" },
111	+ { "previous-jump", OP_PREV_JUMP, "\033b" },
112	{ "list-reply", OP_LIST_REPLY, "L" },
113	{ "redraw-screen", OP_REDRAW, "\014" },
114	{ "mail", OP_MAIL, "m" },
115	--- mutt-0.94.7i/patchlist.c.orig Sat Sep 19 02:29:51 1998
116	+++ mutt-0.94.7i/patchlist.c Sat Sep 19 02:54:16 1998
117	@@ -16,6 +16,8 @@
118
119
120
121	+ printf("Feature patch: previous-jump 0.94.7 by Stefan `Sec` Zehl\n");
122	+
123
124
125	/* DO NOT MODIFY AFTER THIS LINE */