Rocco Rutte:

[apps/madmutt.git] / init.h

diff --git a/init.h b/init.h
index 4a443f8..2d0ad9b 100644 (file)
--- a/init.h
+++ b/init.h
@@ -1,20 +1,14 @@
 /*
+ * Copyright notice from original mutt:
  * Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>
  * Copyright (C) 2004 g10 Code GmbH
- * 
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *
+ * Parts were writte/modified by:
+ * Nico Golde <nico@ngolde.de>
+ *
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
  */
 
 #ifdef _MAKEDOC
@@ -114,7 +108,7 @@ struct feature_t {
 #endif
 
 struct option_t MuttVars[] = {
-  /*++ */
+  /*++*/
   {"abort_nosubject", DT_QUAD, R_NONE, OPT_SUBJECT, M_ASKYES},
   /*
    ** .pp
@@ -1545,7 +1539,7 @@ struct option_t MuttVars[] = {
    ** deeper threads to fit on the screen.
    */
 #ifdef USE_NNTP
-  {"news_cache_dir", DT_PATH, R_NONE, UL & NewsCacheDir, UL "~/.mutt"},
+  {"news_cache_dir", DT_PATH, R_NONE, UL & NewsCacheDir, UL "~/.muttng"},
   /*
    ** .pp
    ** Availability: NNTP
@@ -3712,11 +3706,6 @@ const struct mapping_t SortKeyMethods[] = {
 /* functions used to parse commands in a rc file */
 
 static int parse_list (BUFFER *, BUFFER *, unsigned long, BUFFER *);
-
-#if 0
-static int parse_rx_list (BUFFER *, BUFFER *, unsigned long, BUFFER *);
-static int parse_rx_unlist (BUFFER *, BUFFER *, unsigned long, BUFFER *);
-#endif
 static int parse_spam_list (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 static int parse_unlist (BUFFER *, BUFFER *, unsigned long, BUFFER *);