The attached patch contains various fixes which help to get 1.0pre1
compile cleanly under IRIX. Also, default bindings for <enter> are
introduced, since that's used by IRIX's xwsh for <return>.
The changes were suggested by Heiko Schlichting
<[EMAIL PROTECTED]>.
Index: curs_main.c
===================================================================
RCS file: /home/roessler/cvsroot/mutt/curs_main.c,v
retrieving revision 2.3.4.15
diff -u -u -r2.3.4.15 curs_main.c
--- curs_main.c 1999/07/26 14:01:51 2.3.4.15
+++ curs_main.c 1999/08/26 07:10:01
@@ -47,10 +47,10 @@
#include <sys/stat.h>
#include <errno.h>
-static const char No_mailbox_is_open[] = N_("No mailbox is open.");
-static const char There_are_no_messages[] = N_("There are no messages.");
-static const char Mailbox_is_read_only[] = N_("Mailbox is read-only.");
-static const char Function_not_permitted_in_attach_message_mode[] = N_("Function not
permitted in attach-message mode.");
+static const char *No_mailbox_is_open = N_("No mailbox is open.");
+static const char *There_are_no_messages = N_("There are no messages.");
+static const char *Mailbox_is_read_only = N_("Mailbox is read-only.");
+static const char *Function_not_permitted_in_attach_message_mode = N_("Function not
+permitted in attach-message mode.");
#define CHECK_MSGCOUNT if (!Context) \
{ \
Index: edit.c
===================================================================
RCS file: /home/roessler/cvsroot/mutt/edit.c,v
retrieving revision 2.0.4.1
diff -u -u -r2.0.4.1 edit.c
--- edit.c 1999/01/07 09:25:42 2.0.4.1
+++ edit.c 1999/08/26 07:18:50
@@ -33,7 +33,7 @@
* SLcurses_waddnstr() can't take a "const char *", so this is only
* declared "static" (sigh)
*/
-static char EditorHelp[] = N_("\
+static char *EditorHelp = N_("\
~~ insert a line begining with a single ~\n\
~b users add users to the Bcc: field\n\
~c users add users to the Cc: field\n\
Index: keymap.c
===================================================================
RCS file: /home/roessler/cvsroot/mutt/keymap.c,v
retrieving revision 2.0.4.3
diff -u -u -r2.0.4.3 keymap.c
--- keymap.c 1999/05/03 10:08:29 2.0.4.3
+++ keymap.c 1999/08/26 07:21:51
@@ -576,6 +576,8 @@
km_bindkey ("8", MENU_GENERIC, OP_JUMP);
km_bindkey ("9", MENU_GENERIC, OP_JUMP);
+ km_bindkey ("<enter>", MENU_GENERIC, OP_GENERIC_SELECT_ENTRY);
+
/* Miscellaneous extra bindings */
km_bindkey (" ", MENU_MAIN, OP_DISPLAY_MESSAGE);
@@ -585,6 +587,8 @@
km_bindkey ("K", MENU_MAIN, OP_PREV_ENTRY);
km_bindkey ("x", MENU_MAIN, OP_EXIT);
+ km_bindkey ("<enter>", MENU_MAIN, OP_DISPLAY_MESSAGE);
+
km_bindkey ("x", MENU_PAGER, OP_PAGER_EXIT);
km_bindkey ("q", MENU_PAGER, OP_PAGER_EXIT);
km_bindkey ("<backspace>", MENU_PAGER, OP_PREV_LINE);
@@ -606,7 +610,13 @@
km_bindkey ("8", MENU_PAGER, OP_JUMP);
km_bindkey ("9", MENU_PAGER, OP_JUMP);
+ km_bindkey ("<enter>", MENU_PAGER, OP_NEXT_LINE);
+
km_bindkey ("<return>", MENU_ALIAS, OP_TAG);
+ km_bindkey ("<enter>", MENU_ALIAS, OP_TAG);
+
+ km_bindkey ("<enter>", MENU_ATTACH, OP_VIEW_ATTACH);
+ km_bindkey ("<enter>", MENU_COMPOSE, OP_VIEW_ATTACH);
/* edit-to (default "t") hides generic tag-entry in Compose menu
This will bind tag-entry to "T" in the Compose menu */
Index: main.c
===================================================================
RCS file: /home/roessler/cvsroot/mutt/main.c,v
retrieving revision 2.1.4.4
diff -u -u -r2.1.4.4 main.c
--- main.c 1999/08/23 12:22:39 2.1.4.4
+++ main.c 1999/08/26 07:22:51
@@ -36,16 +36,16 @@
#include <getopt.h>
#endif
-const char ReachingUs[] = N_("\
+const char *ReachingUs = N_("\
To contact the developers, please mail to <[EMAIL PROTECTED]>.\n");
-const char Notice[] = N_("\
+const char *Notice = N_("\
Copyright (C) 1996-9 Michael R. Elkins and others.\n\
Mutt comes with ABSOLUTELY NO WARRANTY; for details type `mutt -vv'.\n\
Mutt is free software, and you are welcome to redistribute it\n\
under certain conditions; type `mutt -vv' for details.\n");
-const char Copyright[] = N_("\
+const char *Copyright = N_("\
Copyright (C) 1996-9 Michael R. Elkins <[EMAIL PROTECTED]>\n\
Copyright (C) 1997-9 Thomas Roessler <[EMAIL PROTECTED]>\n\
Copyright (C) 1998-9 Werner Koch <[EMAIL PROTECTED]>\n\
@@ -70,7 +70,7 @@
");
#ifdef _PGPPATH
-const char ShaCopyright[] = N_("\n\
+const char *ShaCopyright = N_("\n\
SHA1 implementation Copyright (C) 1995-7 Eric A. Young <[EMAIL PROTECTED]>\n\
\n\
Redistribution and use in source and binary forms, with or without\n\
Index: pager.c
===================================================================
RCS file: /home/roessler/cvsroot/mutt/pager.c,v
retrieving revision 2.2.4.5
diff -u -u -r2.2.4.5 pager.c
--- pager.c 1999/07/20 07:21:00 2.2.4.5
+++ pager.c 1999/08/26 07:11:13
@@ -51,9 +51,9 @@
#define IsAttach(x) (x && (x)->bdy)
#define IsHeader(x) (x && (x)->hdr)
-static const char Not_available_in_this_menu[] = N_("Not available in this menu.");
-static const char Mailbox_is_read_only[] = N_("Mailbox is read-only.");
-static const char Function_not_permitted_in_attach_message_mode[] = N_("Function not
permitted in attach-message mode.");
+static const char *Not_available_in_this_menu = N_("Not available in this menu.");
+static const char *Mailbox_is_read_only = N_("Mailbox is read-only.");
+static const char *Function_not_permitted_in_attach_message_mode = N_("Function not
+permitted in attach-message mode.");
#define CHECK_MODE(x) if (!(x)) \
{ \
Index: recvattach.c
===================================================================
RCS file: /home/roessler/cvsroot/mutt/recvattach.c,v
retrieving revision 2.0.4.8
diff -u -u -r2.0.4.8 recvattach.c
--- recvattach.c 1999/07/26 18:26:49 2.0.4.8
+++ recvattach.c 1999/08/26 07:11:32
@@ -44,7 +44,7 @@
#include <string.h>
#include <errno.h>
-static const char Mailbox_is_read_only[] = N_("Mailbox is read-only.");
+static const char *Mailbox_is_read_only = N_("Mailbox is read-only.");
#define CHECK_READONLY if (Context->readonly) \
{\
PGP signature
