[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#687909: unblock: mc/3:4.8.3-9



retitle 687909 unblock: mc/3:4.8.3-9

--

Updating according to new version uploaded to unstable (full diff from 
previous version is attached):

mc (3:4.8.3-9) unstable; urgency=low

  * new backported patch to fix ESC+TAB completion on paths
    starting with "~" (Closes: #688075).


Thank you.

Regards,
Dmitry.
diff --git a/debian/changelog b/debian/changelog
index 4d3b026..4e38404 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,11 @@
+mc (3:4.8.3-9) unstable; urgency=low
+
+  * new backported patch to fix ESC+TAB completion on paths
+    starting with "~" (Closes: #688075).
+
+ -- Dmitry Smirnov <onlyjob@member.fsf.org>  Mon, 24 Sep 2012 01:36:11 +1000
+
 mc (3:4.8.3-8) unstable; urgency=low
 
   * New backported patches:
     + to fix "cannot Copy/Move files with filename encoding change".
diff --git a/debian/patches/2898.patch b/debian/patches/2898.patch
new file mode 100644
index 0000000..1758655
--- /dev/null
+++ b/debian/patches/2898.patch
@@ -0,0 +1,35 @@
+Last-Update: 2012-09-24
+Author: Dmitry Smirnov <onlyjob@member.fsf.org>
+Origin: https://www.midnight-commander.org/changeset/dac67d1380c7d0dd6c71ecef8c334a28c3f6f17e
+Forwarded: not-needed
+Bug-MC: https://www.midnight-commander.org/ticket/2898
+Description: backported fix for q{ESC+TAB completion on ~}
+ fixes minor regression introduced in MC#2874
+
+--- a/lib/widget/input_complete.c
++++ b/lib/widget/input_complete.c
+@@ -120,7 +120,7 @@
+ static char *
+ filename_completion_function (const char *text, int state, input_complete_t flags)
+ {
+-    static DIR *directory;
++    static DIR *directory = NULL;
+     static char *filename = NULL;
+     static char *dirname = NULL;
+     static char *users_dirname = NULL;
+@@ -169,7 +169,6 @@
+             dirname = g_strdup (".");
+             filename = g_strdup (text);
+         }
+-        dirname_vpath = vfs_path_from_str (dirname);
+ 
+         /* We aren't done yet.  We also support the "~user" syntax. */
+ 
+@@ -177,6 +176,7 @@
+         users_dirname = dirname;
+         dirname = tilde_expand (dirname);
+         canonicalize_pathname (dirname);
++        dirname_vpath = vfs_path_from_str (dirname);
+ 
+         /* Here we should do something with variable expansion
+            and `command`.
diff --git a/debian/patches/series b/debian/patches/series
index b55fa04..b830a76 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -30,4 +30,5 @@ fix_nospace.patch
 2832.patch
 2833.patch
 2807.patch
 2874.patch
+2898.patch

Attachment: signature.asc
Description: This is a digitally signed message part.


Reply to: