X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=enter.c;h=5ad1f0a8d40d4090c49e32a95860982f83444ca9;hb=3714b39a106889e8f9ca6de2664e7aabe9a7e853;hp=4636c3abd56114dd434917543b0d39fee7dfda80;hpb=f353d90d89bbdaa8ff3f3c619384948ec8fe9c14;p=apps%2Fmadmutt.git

diff --git a/enter.c b/enter.c
index 4636c3a..5ad1f0a 100644
--- a/enter.c
+++ b/enter.c
@@ -32,8 +32,6 @@ enum
   M_REDRAW_LINE                /* redraw entire line */
 };
 
-static int _mutt_enter_string_foo (char *buf, size_t buflen, int y, int x, int flags, int multiple, char ***files, int *numfiles, ENTER_STATE *state, int att_save);
-
 static int my_wcwidth (wchar_t wc)
 {
   int n = wcwidth (wc);
@@ -186,23 +184,9 @@ int  mutt_enter_string(char *buf, size_t buflen, int y, int x, int flags)
   return rv;
 }
 
-int _mutt_enter_string(char *buf, size_t buflen, int y, int x,
-                        int flags, int multiple, char ***files, int *numfiles,
-                        ENTER_STATE *state)
-{
-  return _mutt_enter_string_foo(buf,buflen,y,x,flags,multiple,files,numfiles,state,0);
-}
-
-int _mutt_enter_string_att(char *buf, size_t buflen, int y, int x,
+int _mutt_enter_string (char *buf, size_t buflen, int y, int x,
                         int flags, int multiple, char ***files, int *numfiles,
                         ENTER_STATE *state)
-{
-  return _mutt_enter_string_foo(buf,buflen,y,x,flags,multiple,files,numfiles,state,1);
-}
-
-static int _mutt_enter_string_foo (char *buf, size_t buflen, int y, int x,
-                        int flags, int multiple, char ***files, int *numfiles,
-                        ENTER_STATE *state, int att_save) /* the last parameter is a hack!! */
 {
   int width = COLS - x - 1;
   int redraw;
@@ -630,9 +614,10 @@ self_insert:
       /* use the raw keypress */
       ch = LastKey;
 
-      if (att_save && ch == '.')
+      if ((ch == '#') && (flags & M_LASTFOLDER))
       {
         rv = 2;
+        my_wcstombs (buf, buflen, state->wbuf, state->lastchar);
         goto bye;
       }