Changeset 5138:274b7ebd150f

Timestamp:

2007-04-15 14:54:07 (21 months ago)

Author:

Michael Elkins <me@…>

Parents:

5137:0c47f7b06158 (diff), 5136:021f494d5154 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Branch:

HEAD

Message:

merge with tip

Files:

• browser.c (modified) (3 diffs)
• browser.c (modified) (1 diff)

browser.c

@@ -142 +142 @@
 
 static const char *
-folder_format_str (char *dest, size_t destlen, char op, const char *src,
+folder_format_str (char *dest, size_t destlen, size_t col, char op, const char *src,
                    const char *fmt, const char *ifstring, const char *elsestring,
                    unsigned long data, format_flag flags)
@@ -301 +301 @@
 
   if (optional)
-    mutt_FormatString (dest, destlen, ifstring, folder_format_str, data, 0);
+    mutt_FormatString (dest, destlen, col, ifstring, folder_format_str, data, 0);
   else if (flags & M_FORMAT_OPTIONAL)
-    mutt_FormatString (dest, destlen, elsestring, folder_format_str, data, 0);
+    mutt_FormatString (dest, destlen, col, elsestring, folder_format_str, data, 0);
 
   return (src);
@@ -484 +484 @@
   folder.num = num;
   
-  mutt_FormatString (s, slen, NONULL(FolderFormat), folder_format_str, 
+  mutt_FormatString (s, slen, 0, NONULL(FolderFormat), folder_format_str, 
       (unsigned long) &folder, M_FORMAT_ARROWCURSOR);
 }

browser.c

@@ -621 +621 @@
       browser_sort (&state);
     }
-#endif
+    else
+#endif
+    {
+      i = mutt_strlen (LastDir);
+      while (i && LastDir[--i] == '/')
+        LastDir[i] = '\0';
+      if (!LastDir[0])
+        getcwd (LastDir, sizeof (LastDir));
+    }
   }