Adding upstream version 3:4.8.31.upstream/3%4.8.31upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

14 files changed, 20 insertions, 30 deletions

diff --git a/src/viewer/Makefile.in b/src/viewer/Makefile.in
index 26ff9c6..dc77f67 100644
--- a/src/viewer/Makefile.in
+++ b/src/viewer/Makefile.in
@@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \
-	$(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \
+	$(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \
diff --git a/src/viewer/actions_cmd.c b/src/viewer/actions_cmd.c
index 465f0f0..453eb78 100644
--- a/src/viewer/actions_cmd.c
+++ b/src/viewer/actions_cmd.c
@@ -2,7 +2,7 @@
    Internal file viewer for the Midnight Commander
    Callback function for some actions (hotkeys, menu)
 
-   Copyright (C) 1994-2023
+   Copyright (C) 1994-2024
    Free Software Foundation, Inc.
 
    Written by:
@@ -57,13 +57,13 @@
 #include "lib/charsets.h"
 #endif
 #include "lib/event.h"          /* mc_event_raise() */
-#include "lib/mcconfig.h"       /* mc_config_history_get() */
+#include "lib/mcconfig.h"       /* mc_config_history_get_recent_item() */
 
 #include "src/filemanager/layout.h"
 #include "src/filemanager/filemanager.h"        /* current_panel */
 #include "src/filemanager/ext.h"        /* regex_command_for() */
 
-#include "src/history.h"
+#include "src/history.h"        /* MC_HISTORY_SHARED_SEARCH */
 #include "src/file_history.h"   /* show_file_history() */
 #include "src/execute.h"
 #include "src/keymap.h"
@@ -139,16 +139,12 @@ mcview_continue_search_cmd (WView * view)
     else
     {
         /* find last search string in history */
-        GList *history;
+        char *s;
 
-        history = mc_config_history_get (MC_HISTORY_SHARED_SEARCH);
-        if (history != NULL)
+        s = mc_config_history_get_recent_item (MC_HISTORY_SHARED_SEARCH);
+        if (s != NULL)
         {
-            /* FIXME: is it possible that history->data == NULL? */
-            view->last_search_string = (gchar *) history->data;
-            history->data = NULL;
-            history = g_list_first (history);
-            g_list_free_full (history, g_free);
+            view->last_search_string = s;
 
             if (mcview_search_init (view))
             {
@@ -405,12 +401,6 @@ mcview_execute_cmd (WView * view, long command)
 
     switch (command)
     {
-    case CK_Help:
-        {
-            ev_help_t event_data = { NULL, "[Internal File Viewer]" };
-            mc_event_raise (MCEVENT_GROUP_CORE, "help", &event_data);
-        }
-        break;
     case CK_HexMode:
         /* Toggle between hex view and text view */
         mcview_toggle_hex_mode (view);
diff --git a/src/viewer/ascii.c b/src/viewer/ascii.c
index f786dcc..c406feb 100644
--- a/src/viewer/ascii.c
+++ b/src/viewer/ascii.c
@@ -2,7 +2,7 @@
    Internal file viewer for the Midnight Commander
    Function for plain view
 
-   Copyright (C) 1994-2023
+   Copyright (C) 1994-2024
    Free Software Foundation, Inc.
 
    Written by:
diff --git a/src/viewer/coord_cache.c b/src/viewer/coord_cache.c
index 190dbd5..2ea23c2 100644
--- a/src/viewer/coord_cache.c
+++ b/src/viewer/coord_cache.c
@@ -2,7 +2,7 @@
    Internal file viewer for the Midnight Commander
    Function for work with coordinate cache (ccache)
 
-   Copyright (C) 1994-2023
+   Copyright (C) 1994-2024
    Free Software Foundation, Inc.
 
    Written by:
diff --git a/src/viewer/datasource.c b/src/viewer/datasource.c
index ea4199c..94c8099 100644
--- a/src/viewer/datasource.c
+++ b/src/viewer/datasource.c
@@ -2,7 +2,7 @@
    Internal file viewer for the Midnight Commander
    Functions for datasources
 
-   Copyright (C) 1994-2023
+   Copyright (C) 1994-2024
    Free Software Foundation, Inc.
 
    Written by:
diff --git a/src/viewer/dialogs.c b/src/viewer/dialogs.c
index f15c2ff..4a2fe39 100644
--- a/src/viewer/dialogs.c
+++ b/src/viewer/dialogs.c
@@ -2,7 +2,7 @@
    Internal file viewer for the Midnight Commander
    Function for paint dialogs
 
-   Copyright (C) 1994-2023
+   Copyright (C) 1994-2024
    Free Software Foundation, Inc.
 
    Written by:
diff --git a/src/viewer/display.c b/src/viewer/display.c
index e76c4dd..08fdb64 100644
--- a/src/viewer/display.c
+++ b/src/viewer/display.c
@@ -2,7 +2,7 @@
    Internal file viewer for the Midnight Commander
    Function for whow info on display
 
-   Copyright (C) 1994-2023
+   Copyright (C) 1994-2024
    Free Software Foundation, Inc.
 
    Written by:
diff --git a/src/viewer/growbuf.c b/src/viewer/growbuf.c
index e18a527..f1fbb9b 100644
--- a/src/viewer/growbuf.c
+++ b/src/viewer/growbuf.c
@@ -2,7 +2,7 @@
    Internal file viewer for the Midnight Commander
    Function for work with growing buffers
 
-   Copyright (C) 1994-2023
+   Copyright (C) 1994-2024
    Free Software Foundation, Inc.
 
    Written by:
diff --git a/src/viewer/hex.c b/src/viewer/hex.c
index c0cf7d0..de037cd 100644
--- a/src/viewer/hex.c
+++ b/src/viewer/hex.c
@@ -2,7 +2,7 @@
    Internal file viewer for the Midnight Commander
    Function for hex view
 
-   Copyright (C) 1994-2023
+   Copyright (C) 1994-2024
    Free Software Foundation, Inc.
 
    Written by:
diff --git a/src/viewer/lib.c b/src/viewer/lib.c
index 5f2eb52..b427987 100644
--- a/src/viewer/lib.c
+++ b/src/viewer/lib.c
@@ -2,7 +2,7 @@
    Internal file viewer for the Midnight Commander
    Common finctions (used from some other mcviewer functions)
 
-   Copyright (C) 1994-2023
+   Copyright (C) 1994-2024
    Free Software Foundation, Inc.
 
    Written by:
diff --git a/src/viewer/mcviewer.c b/src/viewer/mcviewer.c
index 36d31c0..1ec75c3 100644
--- a/src/viewer/mcviewer.c
+++ b/src/viewer/mcviewer.c
@@ -2,7 +2,7 @@
    Internal file viewer for the Midnight Commander
    Interface functions
 
-   Copyright (C) 1994-2023
+   Copyright (C) 1994-2024
    Free Software Foundation, Inc
 
    Written by:
diff --git a/src/viewer/move.c b/src/viewer/move.c
index 4f15b7c..0bdf38f 100644
--- a/src/viewer/move.c
+++ b/src/viewer/move.c
@@ -2,7 +2,7 @@
    Internal file viewer for the Midnight Commander
    Functions for handle cursor movement
 
-   Copyright (C) 1994-2023
+   Copyright (C) 1994-2024
    Free Software Foundation, Inc.
 
    Written by:
diff --git a/src/viewer/nroff.c b/src/viewer/nroff.c
index 14dacd5..a7c7fe2 100644
--- a/src/viewer/nroff.c
+++ b/src/viewer/nroff.c
@@ -2,7 +2,7 @@
    Internal file viewer for the Midnight Commander
    Functions for searching in nroff-like view
 
-   Copyright (C) 1994-2023
+   Copyright (C) 1994-2024
    Free Software Foundation, Inc.
 
    Written by:
diff --git a/src/viewer/search.c b/src/viewer/search.c
index f470a36..9fce398 100644
--- a/src/viewer/search.c
+++ b/src/viewer/search.c
@@ -2,7 +2,7 @@
    Internal file viewer for the Midnight Commander
    Function for search data
 
-   Copyright (C) 1994-2023
+   Copyright (C) 1994-2024
    Free Software Foundation, Inc.
 
    Written by: