Merge branch 'iglosiggio-start-at-supports-urls'

share/applications/feh.pre

@@ -4,7 +4,7 @@ Name[en_US]=feh
 GenericName=Image viewer
 GenericName[en_US]=Image viewer
 Comment=Image viewer and cataloguer
-Exec=feh --start-at %f
+Exec=feh --start-at %u
 Terminal=false
 Type=Application
 Icon=feh

src/options.c

@@ -843,7 +843,9 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun)
 		}
 	}
 	else if (finalrun && !opt.filelistfile && !opt.bgmode) {
-		if (opt.start_list_at && !path_is_url(opt.start_list_at) && strrchr(opt.start_list_at, '/')) {
+		if (opt.start_list_at && path_is_url(opt.start_list_at)) {
+			add_file_to_filelist_recursively(opt.start_list_at, FILELIST_FIRST);
+		} else if (opt.start_list_at && strrchr(opt.start_list_at, '/')) {
 			char *target_directory = estrdup(opt.start_list_at);
 			char *filename_start = strrchr(target_directory, '/');
 			if (filename_start) {