From 5cfa41634d9a2c2e8bcf392ff0f2ee0c93794b37 Mon Sep 17 00:00:00 2001 From: Pierre Habouzit Date: Tue, 7 Nov 2006 22:25:32 +0100 Subject: [PATCH] more muttng -> madmutt Signed-off-by: Pierre Habouzit --- configure.ac | 2 +- doc/Makefile.in | 50 ++++++++-------- doc/{muttng-manual.xsl => madmutt-manual.xsl} | 36 +++++------ doc/{muttng-tex.xsl => madmutt-tex.xsl} | 44 +++++++------- doc/{muttng.css => madmutt.css} | 0 doc/{muttng.ist => madmutt.ist} | 0 doc/{muttng.sty => madmutt.sty} | 0 init.c | 18 +++--- init.h | 60 +++++++++---------- lib/debug.c | 4 +- main.c | 22 +++---- makedoc.c | 4 +- muttlib.c | 2 +- sendlib.c | 2 +- 14 files changed, 122 insertions(+), 122 deletions(-) rename doc/{muttng-manual.xsl => madmutt-manual.xsl} (85%) rename doc/{muttng-tex.xsl => madmutt-tex.xsl} (93%) rename doc/{muttng.css => madmutt.css} (100%) rename doc/{muttng.ist => madmutt.ist} (100%) rename doc/{muttng.sty => madmutt.sty} (100%) diff --git a/configure.ac b/configure.ac index 69a09ca..033ef14 100644 --- a/configure.ac +++ b/configure.ac @@ -398,7 +398,7 @@ fi AC_MSG_CHECKING(where to put the documentation) AC_ARG_WITH(docdir, AC_HELP_STRING([--with-docdir=PATH], [Specify where to put the documentation]), [mutt_cv_docdir=$withval], - [mutt_cv_docdir="${prefix}/doc/muttng"]) + [mutt_cv_docdir="${prefix}/doc/madmutt"]) AC_MSG_RESULT($mutt_cv_docdir) docdir=$mutt_cv_docdir diff --git a/doc/Makefile.in b/doc/Makefile.in index 4b820ec..9359fe0 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -50,9 +50,9 @@ DISTFILES = Makefile.in dotlock.man \ instdoc.sh.in \ patch-notes.txt \ smime-notes.txt \ - muttng-manual.xsl \ - muttng-tex.xsl \ - muttng.sty \ + madmutt-manual.xsl \ + madmutt-tex.xsl \ + madmutt.sty \ html.xsl chunk.xsl BUILT_DISTFILES = stamp-doc-xml stamp-doc-man stamp-doc-chunked \ @@ -68,19 +68,19 @@ topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog \ all: ../makedoc$(EXEEXT) $(MAKE) makedoc-all -makedoc-all: muttng.1 muttrc.man manual.html stamp-doc-chunked manual.txt +makedoc-all: madmutt.1 muttrc.man manual.html stamp-doc-chunked manual.txt install: all instdoc $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1 $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man5 - ./instdoc muttng.1 $(DESTDIR)$(mandir)/man1/muttng.1 - ./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/muttng-flea.1 - echo ".so $(mandir)/man1/muttng-flea.1" > $(DESTDIR)$(mandir)/man1/muttngbug.1 - echo ".so $(mandir)/man1/muttng-flea.1" > $(DESTDIR)$(mandir)/man1/fleang.1 + ./instdoc madmutt.1 $(DESTDIR)$(mandir)/man1/madmutt.1 + ./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/madmutt-flea.1 + echo ".so $(mandir)/man1/madmutt-flea.1" > $(DESTDIR)$(mandir)/man1/madmuttbug.1 + echo ".so $(mandir)/man1/madmutt-flea.1" > $(DESTDIR)$(mandir)/man1/fleang.1 ./instdoc $(srcdir)/dotlock.man \ - $(DESTDIR)$(mandir)/man1/muttng_dotlock.1 - ./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttngrc.5 - ./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/muttng-mbox.5 + $(DESTDIR)$(mandir)/man1/madmutt_dotlock.1 + ./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/madmuttrc.5 + ./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/madmutt-mbox.5 $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir) for f in $(topsrcdir_DOCFILES) ; do \ $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \ @@ -93,13 +93,13 @@ install: all instdoc -cd html; for file in *.html ; do \ $(INSTALL) -m 644 $$file $(DESTDIR)$(docdir)/html/ || true ;\ done - -$(INSTALL) -m 644 muttng.css $(DESTDIR)$(docdir)/html || true + -$(INSTALL) -m 644 madmutt.css $(DESTDIR)$(docdir)/html || true uninstall: - for f in muttng.1 mutt_dotlock.1 fleang.1 muttng-flea.1 muttngbug.1 ; do \ + for f in madmutt.1 mutt_dotlock.1 fleang.1 madmutt-flea.1 madmuttbug.1 ; do \ rm -f $(DESTDIR)$(mandir)/man1/$$f ; \ done - for f in muttngrc.5 muttng-mbox.5 ; do \ + for f in madmuttrc.5 madmutt-mbox.5 ; do \ rm -f $(DESTDIR)$(mandir)/man5/$$f ; \ done -rm -rf $(DESTDIR)$(docdir)/* @@ -109,12 +109,12 @@ manual.txt: manual.html @HTML2TXT_CMD@ manual.html: $(srcdir)/html.xsl manual.xml - -xsltproc --nonet --stringparam html.stylesheet muttng.css -o $@ $^ + -xsltproc --nonet --stringparam html.stylesheet madmutt.css -o $@ $^ @HTMLCLEAN_CMD@ $@ || true manual-chunked stamp-doc-chunked: $(srcdir)/chunk.xsl manual.xml test -d html || mkdir html - -xsltproc --nonet --stringparam html.stylesheet muttng.css -o html/ $^ + -xsltproc --nonet --stringparam html.stylesheet madmutt.css -o html/ $^ touch stamp-doc-chunked cd html; for file in *.html ; do \ @HTMLCLEAN_CMD@ $$file || true ; \ @@ -129,21 +129,21 @@ manual.tex stamp-doc-tex: manual.xml fi touch stamp-doc-tex -manual-ng.tex: manual.xml muttng-tex.xsl - xsltproc -o manual-ng.tex $(srcdir)/muttng-tex.xsl manual-pre.xml +manual-ng.tex: manual.xml madmutt-tex.xsl + xsltproc -o manual-ng.tex $(srcdir)/madmutt-tex.xsl manual-pre.xml -manual-ng.pdf: manual-ng.tex muttng.sty +manual-ng.pdf: manual-ng.tex madmutt.sty (BD=`pwd`; cd $(srcdir); pdflatex -file-line-error -output-directory $$BD $(builddir)/manual-ng.tex) (BD=`pwd`; cd $(srcdir); pdflatex -file-line-error -output-directory $$BD $(builddir)/manual-ng.tex) touch manual-ng.idx - makeindex -s $(srcdir)/muttng.ist -o manual-ng.ind manual-ng.idx + makeindex -s $(srcdir)/madmutt.ist -o manual-ng.ind manual-ng.idx (BD=`pwd`; cd $(srcdir); pdflatex -file-line-error -output-directory $$BD $(builddir)/manual-ng.tex) -manual-ng.ps: manual-ng.tex muttng.sty +manual-ng.ps: manual-ng.tex madmutt.sty (BD=`pwd`; cd $(srcdir); latex -file-line-error -output-directory $$BD $(builddir)/manual-ng.tex) (BD=`pwd`; cd $(srcdir); latex -file-line-error -output-directory $$BD $(builddir)/manual-ng.tex) touch manual-ng.idx - makeindex -s $(srcdir)/muttng.ist -o manual-ng.ind manual-ng.idx + makeindex -s $(srcdir)/madmutt.ist -o manual-ng.ind manual-ng.idx (BD=`pwd`; cd $(srcdir); latex -file-line-error -output-directory $$BD $(builddir)/manual-ng.tex) dvips -o manual-ng.ps manual-ng.dvi @@ -197,7 +197,7 @@ EDIT=sed -e 's,@sysconfdir\@,$(sysconfdir),g' \ -e 's,@bindir\@,$(bindir),g' \ -e 's,@docdir\@,$(docdir),g' -muttng.1: $(srcdir)/mutt.man +madmutt.1: $(srcdir)/mutt.man $(EDIT) $(srcdir)/mutt.man > $@ muttrc.man stamp-doc-man: ../makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.head muttrc.man.tail @@ -206,9 +206,9 @@ muttrc.man stamp-doc-man: ../makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.he > muttrc.man touch stamp-doc-man -manual.xml stamp-doc-xml: ../makedoc$(EXEEXT) $(top_srcdir)/init.h muttng-manual.xsl manual.xml.head manual.xml.tail $(top_srcdir)/VERSION.in +manual.xml stamp-doc-xml: ../makedoc$(EXEEXT) $(top_srcdir)/init.h madmutt-manual.xsl manual.xml.head manual.xml.tail $(top_srcdir)/VERSION.in ( sed -e "s/@VERSION\@/`cat $(top_srcdir)/VERSION.in`-rgit/" $(srcdir)/manual.xml.head ;\ $(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -s ) | \ cat - $(srcdir)/manual.xml.tail > manual-pre.xml - -xsltproc --novalid --nonet $(srcdir)/muttng-manual.xsl manual-pre.xml > manual.xml + -xsltproc --novalid --nonet $(srcdir)/madmutt-manual.xsl manual-pre.xml > manual.xml touch stamp-doc-xml diff --git a/doc/muttng-manual.xsl b/doc/madmutt-manual.xsl similarity index 85% rename from doc/muttng-manual.xsl rename to doc/madmutt-manual.xsl index be48b95..2763a03 100644 --- a/doc/muttng-manual.xsl +++ b/doc/madmutt-manual.xsl @@ -11,7 +11,7 @@ - + @@ -44,21 +44,21 @@ - + $ - + - + @@ -71,14 +71,14 @@ - + - + ~ /= @@ -87,7 +87,7 @@ - + <> (default: ) @@ -95,7 +95,7 @@ - + @@ -108,7 +108,7 @@ - + <xsl:value-of select="concat('$',@name)"/> @@ -118,40 +118,40 @@ - + $ - + <> - + RfC RfC - + - + - + - + @@ -160,7 +160,7 @@ - + diff --git a/doc/muttng-tex.xsl b/doc/madmutt-tex.xsl similarity index 93% rename from doc/muttng-tex.xsl rename to doc/madmutt-tex.xsl index 42f057b..f711b37 100644 --- a/doc/muttng-tex.xsl +++ b/doc/madmutt-tex.xsl @@ -14,11 +14,11 @@ - + + xmlns:madmutt-doc="http://mutt-ng.berlios.de/doc/#NS"> @@ -29,7 +29,7 @@ \documentclass[a4paper]{scrbook} - \usepackage{muttng} + \usepackage{madmutt} @@ -366,9 +366,9 @@ - + - + \man [} - + \web{} - + \envvar{} - + \hook{} - + \cmddef{}{ } - + \cmdref{} - + \funcref{} - + \funcdef{ }{ - } + } - + \varref{} - + \vardef{ } @@ -423,26 +423,26 @@ - + \rfc{} - + \begin{verbatim} \end{verbatim} - + \begin{verbatim} \end{verbatim} - + \begin{verbatim} \end{verbatim} - + \pat [1] @@ -451,7 +451,7 @@ select="@name"/>} - + \key{ - @@ -460,7 +460,7 @@ } - + diff --git a/doc/muttng.css b/doc/madmutt.css similarity index 100% rename from doc/muttng.css rename to doc/madmutt.css diff --git a/doc/muttng.ist b/doc/madmutt.ist similarity index 100% rename from doc/muttng.ist rename to doc/madmutt.ist diff --git a/doc/muttng.sty b/doc/madmutt.sty similarity index 100% rename from doc/muttng.sty rename to doc/madmutt.sty diff --git a/init.c b/init.c index f86e465..7de40b8 100644 --- a/init.c +++ b/init.c @@ -263,15 +263,15 @@ static void sys_to_string (char* dst, size_t dstlen, char *val = NULL, *t = NULL; int clean = 0; - /* get some $muttng_ values dynamically */ - if (ascii_strcmp ("muttng_pwd", option->option) == 0) { + /* get some $madmutt_ values dynamically */ + if (ascii_strcmp ("madmutt_pwd", option->option) == 0) { val = p_new(char, _POSIX_PATH_MAX); val = getcwd (val, _POSIX_PATH_MAX-1); clean = 1; - } else if (ascii_strcmp ("muttng_folder_path", option->option) == 0 && + } else if (ascii_strcmp ("madmutt_folder_path", option->option) == 0 && CurrentFolder && *CurrentFolder) { val = CurrentFolder; - } else if (ascii_strcmp ("muttng_folder_name", option->option) == 0 && + } else if (ascii_strcmp ("madmutt_folder_name", option->option) == 0 && CurrentFolder && *CurrentFolder) { ssize_t Maildirlength = m_strlen(Maildir); @@ -2006,7 +2006,7 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data, break; } - /* the $muttng_ variables are read-only */ + /* the $madmutt_ variables are read-only */ if (!FuncTable[DTYPE (option->type)].opt_from_string) { snprintf (err->data, err->dsize, _("$%s is read-only"), option->option); @@ -2762,18 +2762,18 @@ void mutt_init (int skip_sys_rc, LIST * commands) if (!Muttrc) { #if 0 - snprintf (buffer, sizeof(buffer), "%s/.muttngrc-%s", NONULL (Homedir), + snprintf (buffer, sizeof(buffer), "%s/.madmuttrc-%s", NONULL (Homedir), MUTT_VERSION); if (access (buffer, F_OK) == -1) #endif - snprintf (buffer, sizeof(buffer), "%s/.muttngrc", NONULL (Homedir)); + snprintf (buffer, sizeof(buffer), "%s/.madmuttrc", NONULL (Homedir)); if (access (buffer, F_OK) == -1) #if 0 - snprintf (buffer, sizeof(buffer), "%s/.muttng/muttngrc-%s", + snprintf (buffer, sizeof(buffer), "%s/.madmutt/madmuttrc-%s", NONULL (Homedir), MUTT_VERSION); if (access (buffer, F_OK) == -1) #endif - snprintf (buffer, sizeof(buffer), "%s/.muttng/muttngrc", + snprintf (buffer, sizeof(buffer), "%s/.madmutt/madmuttrc", NONULL (Homedir)); default_rc = 1; diff --git a/init.h b/init.h index ac29376..65d5e1f 100644 --- a/init.h +++ b/init.h @@ -35,7 +35,7 @@ #define DT_SYN 9 /* synonym for another variable */ #define DT_ADDR 10 /* e-mail address */ #define DT_USER 11 /* user defined via $user_ */ -#define DT_SYS 12 /* pre-defined via $muttng_ */ +#define DT_SYS 12 /* pre-defined via $madmutt_ */ #define DTYPE(x) ((x) & DT_MASK) @@ -146,7 +146,7 @@ struct option_t MuttVars[] = { ** check only happens after the \fIfirst\fP edit of the file). When set ** to \fIno\fP, composition will never be aborted. */ - {"alias_file", DT_PATH, R_NONE, UL &AliasFile, "~/.muttngrc"}, + {"alias_file", DT_PATH, R_NONE, UL &AliasFile, "~/.madmuttrc"}, /* ** .pp ** The default file in which to save aliases created by the @@ -280,7 +280,7 @@ struct option_t MuttVars[] = { {"attach_remind_regexp", DT_RX, R_NONE, UL &AttachRemindRegexp, "attach"}, /* ** .pp - ** If this variable is non-empty, muttng will scan a message's contents + ** If this variable is non-empty, madmutt will scan a message's contents ** before sending for this regular expression. If it is found, it will ** ask for what to do depending on the setting of $$abort_noattach. ** .pp @@ -478,7 +478,7 @@ struct option_t MuttVars[] = { ** If it is \fIset\fP and Mutt-ng was build with gpgme support, the gpgme code for ** S/MIME and PGP will be used instead of the classic code. ** .pp - ** \fBNote\fP: You need to use this option in your \fT.muttngrc\fP configuration + ** \fBNote\fP: You need to use this option in your \fT.madmuttrc\fP configuration ** file as it won't have any effect when used interactively. */ @@ -525,7 +525,7 @@ struct option_t MuttVars[] = { ** \fT-d\fP command line option. ** ** .pp - ** Currently, this number must be >= 0 and <= 5 and muttng + ** Currently, this number must be >= 0 and <= 5 and madmutt ** must be started with \fT-d\fP to enable debugging at all; ** enabling at runtime is not possible. */ @@ -586,13 +586,13 @@ struct option_t MuttVars[] = { ** filtered message is read from the standard output. */ #if defined(USE_DOTLOCK) - {"dotlock_program", DT_PATH, R_NONE, UL &MuttDotlock, "$muttng_bindir/muttng_dotlock"}, + {"dotlock_program", DT_PATH, R_NONE, UL &MuttDotlock, "$madmutt_bindir/muttng_dotlock"}, /* ** .pp ** Availability: Dotlock ** ** .pp - ** Contains the path of the \fTmuttng_dotlock(1)\fP binary to be used by + ** Contains the path of the \fTmadmutt_dotlock(1)\fP binary to be used by ** Mutt-ng. */ #endif @@ -1001,7 +1001,7 @@ struct option_t MuttVars[] = { ** mailing list when this option is set, use the \fIlist-reply\fP ** function; \fIgroup-reply\fP will reply to both the sender and the ** list. - ** Remember: This option works only for mailing lists which are explicitly set in your muttngrc + ** Remember: This option works only for mailing lists which are explicitly set in your madmuttrc ** configuration file. */ {"imap_authenticators", DT_STR, R_NONE, UL &ImapAuthenticators, "" }, @@ -1413,45 +1413,45 @@ struct option_t MuttVars[] = { ** This specifies the folder into which read mail in your ``$$spoolfile'' ** folder will be appended. */ - {"muttng_version", DT_SYS, R_NONE, 0, VERSION }, + {"madmutt_version", DT_SYS, R_NONE, 0, VERSION }, /* ** .pp - ** \fIThis is a read-only system property and specifies muttng's + ** \fIThis is a read-only system property and specifies madmutt's ** version string.\fP */ - {"muttng_revision", DT_SYS, R_NONE, 0, MUTT_REVISION }, + {"madmutt_revision", DT_SYS, R_NONE, 0, MUTT_REVISION }, /* ** .pp - ** \fIThis is a read-only system property and specifies muttng's + ** \fIThis is a read-only system property and specifies madmutt's ** subversion revision string.\fP */ - {"muttng_sysconfdir", DT_SYS, R_NONE, 0, SYSCONFDIR }, + {"madmutt_sysconfdir", DT_SYS, R_NONE, 0, SYSCONFDIR }, /* ** .pp ** \fIThis is a read-only system property and specifies the - ** directory containing the muttng system-wide configuration.\fP + ** directory containing the madmutt system-wide configuration.\fP */ - {"muttng_bindir", DT_SYS, R_NONE, 0, BINDIR }, + {"madmutt_bindir", DT_SYS, R_NONE, 0, BINDIR }, /* ** .pp ** \fIThis is a read-only system property and specifies the - ** directory containing the muttng binary.\fP + ** directory containing the madmutt binary.\fP */ - {"muttng_docdir", DT_SYS, R_NONE, 0, PKGDOCDIR }, + {"madmutt_docdir", DT_SYS, R_NONE, 0, PKGDOCDIR }, /* ** .pp ** \fIThis is a read-only system property and specifies the - ** directory containing the muttng documentation.\fP + ** directory containing the madmutt documentation.\fP */ #ifdef USE_HCACHE #if HAVE_QDBM - {"muttng_hcache_backend", DT_SYS, R_NONE, 0, "qdbm" }, + {"madmutt_hcache_backend", DT_SYS, R_NONE, 0, "qdbm" }, #elif HAVE_GDBM - {"muttng_hcache_backend", DT_SYS, R_NONE, 0, "gdbm" }, + {"madmutt_hcache_backend", DT_SYS, R_NONE, 0, "gdbm" }, #elif HAVE_DB4 - {"muttng_hcache_backend", DT_SYS, R_NONE, 0, "db4" }, + {"madmutt_hcache_backend", DT_SYS, R_NONE, 0, "db4" }, #else - {"muttng_hcache_backend", DT_SYS, R_NONE, 0, "unknown" }, + {"madmutt_hcache_backend", DT_SYS, R_NONE, 0, "unknown" }, #endif /* ** .pp @@ -1459,14 +1459,14 @@ struct option_t MuttVars[] = { ** header chaching's database backend.\fP */ #endif - {"muttng_folder_path", DT_SYS, R_NONE, 0, "" }, + {"madmutt_folder_path", DT_SYS, R_NONE, 0, "" }, /* ** .pp ** \fIThis is a read-only system property and, at runtime, ** specifies the full path or URI of the folder currently ** open (if any).\fP */ - {"muttng_folder_name", DT_SYS, R_NONE, 0, "" }, + {"madmutt_folder_name", DT_SYS, R_NONE, 0, "" }, /* ** .pp ** \fIThis is a read-only system property and, at runtime, @@ -1476,7 +1476,7 @@ struct option_t MuttVars[] = { ** For detection, $$$folder is first taken into account ** and simply stripped to form the result when a match is found. For ** example, with $$$folder being \fTimap://host\fP and the folder is - ** \fTimap://host/INBOX/foo\fP, $$$muttng_folder_name will be just + ** \fTimap://host/INBOX/foo\fP, $$$madmutt_folder_name will be just ** \fTINBOX/foo\fP.) ** .pp ** Second, if the initial portion of a name is not $$$folder, @@ -1485,11 +1485,11 @@ struct option_t MuttVars[] = { ** Third and last, the result will be just the name if neither ** $$$folder nor a ``/'' were found in the name. */ - {"muttng_pwd", DT_SYS, R_NONE, 0, "" }, + {"madmutt_pwd", DT_SYS, R_NONE, 0, "" }, /* ** .pp ** \fIThis is a read-only system property and, at runtime, - ** specifies the current working directory of the muttng + ** specifies the current working directory of the madmutt ** binary.\fP */ {"operating_system", DT_STR, R_NONE, UL &OperatingSystem, "" }, @@ -1758,7 +1758,7 @@ struct option_t MuttVars[] = { ** deeper threads to fit on the screen. */ #ifdef USE_NNTP - {"nntp_cache_dir", DT_PATH, R_NONE, UL &NewsCacheDir, "~/.muttng"}, + {"nntp_cache_dir", DT_PATH, R_NONE, UL &NewsCacheDir, "~/.madmutt"}, /* ** .pp ** Availability: NNTP @@ -2592,7 +2592,7 @@ struct option_t MuttVars[] = { ** certificate that is signed with one of these CA certificates are ** also automatically accepted. ** .pp - ** Example: \fTset certificate_file=~/.muttng/certificates\fP + ** Example: \fTset certificate_file=~/.madmutt/certificates\fP */ # if defined(_MAKEDOC) || !defined (USE_GNUTLS) {"ssl_usesystemcerts", DT_BOOL, R_NONE, OPTSSLSYSTEMCERTS, "yes" }, @@ -3510,7 +3510,7 @@ struct option_t MuttVars[] = { ** .pp ** When \fIunset\fP, Mutt-ng won't stop when the user presses the terminal's ** \fIsusp\fP key, usually \fTCTRL+Z\fP. This is useful if you run Mutt-ng - ** inside an xterm using a command like ``\fTxterm -e muttng\fP.'' + ** inside an xterm using a command like ``\fTxterm -e madmutt\fP.'' */ {"text_flowed", DT_BOOL, R_NONE, OPTTEXTFLOWED, "no" }, /* diff --git a/lib/debug.c b/lib/debug.c index 523d7c6..6034ef9 100644 --- a/lib/debug.c +++ b/lib/debug.c @@ -41,8 +41,8 @@ void debug_start (const char* basedir) { return; /* rotate the old debug logs */ for (i = 3; i >= 0; i--) { - snprintf (buf, sizeof (buf), "%s/.muttngdebug%d", NONULL (basedir), i); - snprintf (buf2, sizeof (buf2), "%s/.muttngdebug%d", NONULL (basedir), i + 1); + snprintf (buf, sizeof (buf), "%s/.madmuttdebug%d", NONULL (basedir), i); + snprintf (buf2, sizeof (buf2), "%s/.madmuttdebug%d", NONULL (basedir), i + 1); rename (buf, buf2); } if ((DebugFile = safe_fopen (buf, "w")) != NULL) { diff --git a/main.c b/main.c index 9cf0437..30148f0 100644 --- a/main.c +++ b/main.c @@ -93,9 +93,9 @@ 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-ng comes with ABSOLUTELY NO WARRANTY; for details type `muttng -vv'.\n\ +Mutt-ng comes with ABSOLUTELY NO WARRANTY; for details type `madmutt -vv'.\n\ Mutt is free software, and you are welcome to redistribute it\n\ -under certain conditions; type `muttng -vv' for details.\n"); +under certain conditions; type `madmutt -vv' for details.\n"); static const char *Copyright_Mutt = N_("\ Copyright (C) 1996-2004 Michael R. Elkins \n\ @@ -146,16 +146,16 @@ static void mutt_usage (void) puts (mutt_make_version (1)); puts - _("usage: muttng [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f ]\n\ - muttng [ -nR ] [ -e ] [ -F ] -Q [ -Q ] [...]\n\ - muttng [ -nR ] [ -e ] [ -F ] -A [ -A ] [...]\n\ - muttng [ -nR ] [ -e ] [ -F ] -t"); + _("usage: madmutt [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f ]\n\ + madmutt [ -nR ] [ -e ] [ -F ] -Q [ -Q ] [...]\n\ + madmutt [ -nR ] [ -e ] [ -F ] -A [ -A ] [...]\n\ + madmutt [ -nR ] [ -e ] [ -F ] -t"); puts _("\ - muttng [ -nR ] [ -e ] [ -F ] -T\n\ - muttng [ -nx ] [ -e ] [ -a ] [ -F ] [ -H ] [ -i ] [ -s ] [ -b ] [ -c ] [ ... ]\n\ - muttng [ -n ] [ -e ] [ -F ] -p\n\ - muttng -v[v]\n\ + madmutt [ -nR ] [ -e ] [ -F ] -T\n\ + madmutt [ -nx ] [ -e ] [ -a ] [ -F ] [ -H ] [ -i ] [ -s ] [ -b ] [ -c ] [ ... ]\n\ + madmutt [ -n ] [ -e ] [ -F ] -p\n\ + madmutt -v[v]\n\ \n\ options:\n\ -A \texpand the given alias\n\ @@ -163,7 +163,7 @@ options:\n\ -b
\tspecify a blind carbon-copy (BCC) address\n\ -c
\tspecify a carbon-copy (CC) address"); #if DEBUG - puts _(" -d \tlog debugging output to ~/.muttngdebug0"); + puts _(" -d \tlog debugging output to ~/.madmuttdebug0"); #endif puts _("\ -e \tspecify a command to be executed after initialization\n\ diff --git a/makedoc.c b/makedoc.c index 6910e54..df72d5d 100644 --- a/makedoc.c +++ b/makedoc.c @@ -738,7 +738,7 @@ static void print_confline (const char *varname, int type, const char *val) /* SGML based manual */ case F_SGML: { - add_s ("\n\nType: "); add_s (type2human (type)); @@ -1164,7 +1164,7 @@ static int print_it (int special, char *str, int docstat) } case SP_END_SECT: { - add_s ("\n"); + add_s ("\n"); break; } case SP_STR: diff --git a/muttlib.c b/muttlib.c index a9d58e9..f4654df 100644 --- a/muttlib.c +++ b/muttlib.c @@ -590,7 +590,7 @@ void mutt_merge_envelopes(ENVELOPE* base, ENVELOPE** extra) void _mutt_mktemp (char *s, const char *src, int line) { - snprintf (s, _POSIX_PATH_MAX, "%s/muttng-%s-%d-%d-%d-%x%x", NONULL (Tempdir), + snprintf (s, _POSIX_PATH_MAX, "%s/madmutt-%s-%d-%d-%d-%x%x", NONULL (Tempdir), NONULL (Hostname), (int) getuid (), (int) getpid (), Counter++, (unsigned int) rand(), (unsigned int) rand()); debug_print (1, ("%s:%d: mutt_mktemp returns \"%s\".\n", src, line, s)); diff --git a/sendlib.c b/sendlib.c index 02d0ee0..57e4de8 100644 --- a/sendlib.c +++ b/sendlib.c @@ -887,7 +887,7 @@ int mutt_lookup_mime_type (BODY * att, const char *path) snprintf (buf, sizeof (buf), "%s/.mime.types", NONULL (Homedir)); break; case 1: - m_strcpy(buf, sizeof(buf), SYSCONFDIR "/muttng-mime.types"); + m_strcpy(buf, sizeof(buf), SYSCONFDIR "/madmutt-mime.types"); break; case 2: m_strcpy(buf, sizeof(buf), PKGDATADIR "/mime.types"); -- 2.20.1