From 4ca1867975c2c1f247557d4f33ea6ca6dbe9eae0 Mon Sep 17 00:00:00 2001
From: nion <nion@e385b8ad-14ed-0310-8656-cc95a2468c6d>
Date: Wed, 9 Mar 2005 15:01:55 +0000
Subject: [PATCH] Nico Golde: - improved mutt_buffy_check call in compose
 because it should be just called if there is a sidebar - name changes

git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@159 e385b8ad-14ed-0310-8656-cc95a2468c6d
---
 compose.c            |  3 ++-
 contrib/muttng.spec  |  4 ++--
 curs_lib.c           |  2 +-
 curs_main.c          |  2 +-
 doc/manual.sgml.head | 10 +++-------
 main.c               |  4 ++--
 po/de.po             | 12 ++++++------
 7 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/compose.c b/compose.c
index 036f30e..d529d4a 100644
--- a/compose.c
+++ b/compose.c
@@ -588,7 +588,8 @@ int mutt_compose_menu (HEADER *msg,   /* structure for new message */
 #endif
   menu->help = mutt_compile_help (helpstr, sizeof (helpstr), MENU_COMPOSE, ComposeHelp);
   
-  mutt_buffy_check(1);
+  if (option (OPTSTATUSONTOP))
+    mutt_buffy_check(1);
   while (loop)
   {
 #ifdef USE_NNTP
diff --git a/contrib/muttng.spec b/contrib/muttng.spec
index e475bcb..44d88e8 100644
--- a/contrib/muttng.spec
+++ b/contrib/muttng.spec
@@ -14,10 +14,10 @@ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildPrereq: /usr/sbin/sendmail slang-devel /usr/bin/automake-1.4
 
 %description
-Mutt-ng is a text-mode mail user agent. Mutt supports color, threading,
+Mutt-ng is a text-mode mail user agent. Mutt-ng supports color, threading,
 arbitrary key remapping, and a lot of customization.
 
-You should install mutt if you have used it in the past and you prefer
+You should install Mutt-ng if you have used it in the past and you prefer
 it, or if you are new to mail programs and have not decided which one
 you are going to use.
 
diff --git a/curs_lib.c b/curs_lib.c
index 76388f4..6601ce8 100644
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -284,7 +284,7 @@ void mutt_query_exit (void)
   curs_set (1);
   if (Timeout)
     timeout (-1); /* restore blocking operation */
-  if (mutt_yesorno (_("Exit Mutt?"), M_YES) == M_YES)
+  if (mutt_yesorno (_("Exit Mutt-ng?"), M_YES) == M_YES)
   {
     endwin ();
     exit (1);
diff --git a/curs_main.c b/curs_main.c
index e5b9b63..45952ef 100644
--- a/curs_main.c
+++ b/curs_main.c
@@ -1066,7 +1066,7 @@ CHECK_IMAP_ACL(IMAP_ACL_DELETE);
          break;
         }
 
-        if (query_quadoption (OPT_QUIT, _("Quit Mutt?")) == M_YES)
+        if (query_quadoption (OPT_QUIT, _("Quit Mutt-ng?")) == M_YES)
         {
           int check;
           
diff --git a/doc/manual.sgml.head b/doc/manual.sgml.head
index c32036c..a8f069b 100644
--- a/doc/manual.sgml.head
+++ b/doc/manual.sgml.head
@@ -13,7 +13,7 @@
 
 <sect>Introduction
 <p>
-<bf/Mutt/ is a small but very powerful text-based MIME mail client.  Mutt is
+<bf/Mutt-ng/ is a small but very powerful text-based MIME mail client.  Mutt-ng is
 highly configurable, and is well suited to the mail power user with advanced
 features like key bindings, keyboard macros, mail threading, regular
 expression searches and a powerful pattern matching language for selecting
@@ -26,15 +26,11 @@ add other new features. Features specific to Mutt-ng will be discussed in
 an extra section. Don't be confused when most of the documentation talk about
 Mutt and not Mutt-ng, Mutt-ng contains all Mutt-ng features, plus many more.
 
-<sect1>Mutt Home Page
-<p>
-<htmlurl url="http://www.mutt.org/"
-name="http://www.mutt.org/">
 
 <sect1>Mutt-ng Home Page
 <p>
-<htmlurl url="http://mutt-ng.berlios.de/"
-name="http://mutt-ng.berlios.de/">
+<htmlurl url="http://www.muttng.org/"
+name="http://www.muttng.org">
 
 <sect1>Mailing Lists
 <p>
diff --git a/main.c b/main.c
index c081229..5848472 100644
--- a/main.c
+++ b/main.c
@@ -58,7 +58,7 @@ To report a bug, please use the fleang(1) utility.\n");
 
 static const char *Notice = N_("\
 Copyright (C) 1996-2002 Michael R. Elkins and others.\n\
-Mutt comes with ABSOLUTELY NO WARRANTY; for details type `muttng -vv'.\n\
+Mutt-ng comes with ABSOLUTELY NO WARRANTY; for details type `muttng -vv'.\n\
 Mutt is free software, and you are welcome to redistribute it\n\
 under certain conditions; type `muttng -vv' for details.\n");
 
@@ -121,7 +121,7 @@ options:\n\
   -H <file>\tspecify a draft file to read header and body from\n\
   -i <file>\tspecify a file which Mutt should include in the body\n\
   -m <type>\tspecify a default mailbox type\n\
-  -n\t\tcauses Mutt not to read the system Muttrc\n\
+  -n\t\tcauses Mutt-ng not to read the system Muttngrc\n\
   -p\t\trecall a postponed message\n\
   -Q <variable>\tquery a configuration variable\n\
   -R\t\topen mailbox in read-only mode\n\
diff --git a/po/de.po b/po/de.po
index 89524c2..77823c3 100644
--- a/po/de.po
+++ b/po/de.po
@@ -813,8 +813,8 @@ msgstr "nein"
 
 #. restore blocking operation
 #: curs_lib.c:287
-msgid "Exit Mutt?"
-msgstr "Mutt verlassen?"
+msgid "Exit Mutt-ng?"
+msgstr "Mutt-ng verlassen?"
 
 #: curs_lib.c:380 mutt_socket.c:530 mutt_ssl.c:328
 msgid "unknown error"
@@ -935,8 +935,8 @@ msgid "Limit to messages matching: "
 msgstr "Begrenze auf Nachrichten nach Muster: "
 
 #: curs_main.c:873
-msgid "Quit Mutt?"
-msgstr "Mutt beenden?"
+msgid "Quit Mutt-ng?"
+msgstr "Mutt-ng beenden?"
 
 #: curs_main.c:952
 msgid "Tag messages matching: "
@@ -964,8 +964,8 @@ msgid "%s is not a mailbox."
 msgstr "%s ist keine Mailbox."
 
 #: curs_main.c:1165
-msgid "Exit Mutt without saving?"
-msgstr "Mutt verlassen, ohne Änderungen zu speichern?"
+msgid "Exit Mutt-ng without saving?"
+msgstr "Mutt-ng verlassen, ohne Änderungen zu speichern?"
 
 #: curs_main.c:1199 curs_main.c:1224
 msgid "You are on the last message."
-- 
2.20.1