using stls should not enable new CAPAs

[apps/madmutt.git] / lib-ui / complete.c

diff --git a/lib-ui/complete.c b/lib-ui/complete.c
index 426da78..f8a660a 100644 (file)
--- a/lib-ui/complete.c
+++ b/lib-ui/complete.c
@@ -12,9 +12,6 @@
 
 #include "mutt.h"
 #include <imap/imap.h>
-#ifdef USE_NNTP
-#include "nntp.h"
-#endif
 
 /* given a partial pathname, this routine fills in as much of the rest of the
  * path as is unique.
@@ -33,50 +30,6 @@ int mutt_complete (char *s, ssize_t slen)
 
   char imap_path[LONG_STRING];
 
-#ifdef USE_NNTP
-  if (option (OPTNEWS)) {
-    nntp_data_t *l = CurrentNewsSrv->list;
-
-    m_strcpy(filepart, sizeof(filepart), s);
-
-    /*
-     * special case to handle when there is no filepart yet.
-     * find the first subscribed newsgroup
-     */
-    if ((len = m_strlen(filepart)) == 0) {
-      for (; l; l = l->next) {
-        if (l->subscribed) {
-          m_strcpy(filepart, sizeof(filepart), l->group);
-          init++;
-          l = l->next;
-          break;
-        }
-      }
-    }
-
-    for (; l; l = l->next) {
-      if (l->subscribed && m_strncmp(l->group, filepart, len) == 0) {
-        if (init) {
-          for (i = 0; filepart[i] && l->group[i]; i++) {
-            if (filepart[i] != l->group[i]) {
-              filepart[i] = 0;
-              break;
-            }
-          }
-          filepart[i] = 0;
-        } else {
-          m_strcpy(filepart, sizeof(filepart), l->group);
-          init = 1;
-        }
-      }
-    }
-
-    m_strcpy(s, slen, filepart);
-
-    return (init ? 0 : -1);
-  }
-#endif
-
   /* we can use '/' as a delimiter, imap_complete rewrites it */
   if (*s == '=' || *s == '+' || *s == '!') {
       const char *q = NONULL(*s == '!' ? Spoolfile : Maildir);
@@ -139,7 +92,7 @@ int mutt_complete (char *s, ssize_t slen)
   }
 
   if (dirp == NULL) {
-    return (-1);
+    return -1;
   }
 
   /*
@@ -201,5 +154,5 @@ int mutt_complete (char *s, ssize_t slen)
   else
     m_strcpy(s, slen, filepart);
 
-  return (init ? 0 : -1);
+  return init ? 0 : -1;
 }