X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-ui%2Fcurs_lib.c;h=66ffbb477652ff526715df10d8e26fb1b5a88ab0;hb=05e61a9707a6da5c0bca77aa7c3c019a918494de;hp=81a817bfd09ba749cc2dea98cb5663e9e0dc3b37;hpb=f3cbb9f51357972f6e74244494236a41dc4d84cd;p=apps%2Fmadmutt.git

diff --git a/lib-ui/curs_lib.c b/lib-ui/curs_lib.c
index 81a817b..66ffbb4 100644
--- a/lib-ui/curs_lib.c
+++ b/lib-ui/curs_lib.c
@@ -18,6 +18,7 @@
 #include <langinfo.h>
 #endif
 
+#include <lib-lua/lib-lua.h>
 #include <lib-sys/unix.h>
 #include <lib-sys/mutt_signal.h>
 
@@ -111,11 +112,9 @@ int _mutt_get_field ( const char *field, char *buf, ssize_t buflen,
     addstr (field);
     mutt_refresh ();
     getyx (stdscr, y, x);
-    ret =
-      _mutt_enter_string (buf, buflen, y, x, complete, multiple, files,
-                          numfiles, es);
-  }
-  while (ret == 1);
+    ret = _mutt_enter_string(buf, buflen, y, x, complete, multiple, files,
+                             numfiles, es);
+  } while (ret == 1);
   CLEARLINE (LINES - 1);
   mutt_free_enter_state (&es);
 
@@ -140,12 +139,12 @@ void mutt_clear_error (void)
     CLEARLINE (LINES - 1);
 }
 
-void mutt_edit_file (const char *editor, const char *data)
+void mutt_edit_file(const char *data)
 {
   char cmd[LONG_STRING];
 
   mutt_endwin (NULL);
-  m_quotefile_fmt(cmd, sizeof (cmd), editor, data);
+  m_quotefile_fmt(cmd, sizeof (cmd), MCore.editor, data);
   if (mutt_system (cmd) == -1)
     mutt_error (_("Error running \"%s\"!"), cmd);
   keypad (stdscr, TRUE);
@@ -279,7 +278,7 @@ void mutt_curses_error (const char *fmt, ...)
 }
 
 void mutt_progress_bar (progress_t* progress, long pos) {
-  char posstr[SHORT_STRING];
+  char posstr[STRING];
 
   if (!pos) {
     if (!NetInc)
@@ -706,32 +705,3 @@ void mutt_paddstr (int n, const char *s)
     addch (' ');
 }
 
-/*
- * mutt_strwidth is like m_strlenexcept that it returns the width
- * refering to the number of characters cells.
- */
-
-int mutt_strwidth (const char *s)
-{
-  wchar_t wc;
-  int w;
-  ssize_t k, n;
-  mbstate_t mbstate;
-
-  if (!s)
-    return 0;
-
-  n = m_strlen(s);
-
-  p_clear(&mbstate, 1);
-  for (w = 0; n && (k = mbrtowc (&wc, s, n, &mbstate)); s += k, n -= k) {
-    if (k == -1 || k == -2) {
-      k = (k == -1) ? 1 : n;
-      wc = CharsetReplacement;
-    }
-    if (!iswprint(wc))
-      wc = '?';
-    w += wcwidth (wc);
-  }
-  return w;
-}