Merge remote-tracking branch 'upstream/master'

diff --cc Makefile
Simple merge

diff --cc config.def.h
index 663351a9090a0a7aab7a18e47cc097a57e080e87,343869386c319ede671598e2def58b23e9819115..bffc69d534343b9a365bf960cde734a06bf11db7
--- 1/config.def.h
--- 2/config.def.h
+++ b/config.def.h
@@@ -3,19 -3,18 +3,20 @@@
  #define CURSR " > "
  #define EMPTY "   "
  
- int mtimeorder = 0; /* Set to 1 to sort by time modified */
+ int mtimeorder  = 0; /* Set to 1 to sort by time modified */
  int idletimeout = 0; /* Screensaver timeout in seconds, 0 to disable */
- char *idlecmd = "rain"; /* The screensaver program */
+ int showhidden  = 0; /* Set to 1 to show hidden files by default */
+ char *idlecmd   = "rain"; /* The screensaver program */
  
  struct assoc assocs[] = {
 -      { "\\.(avi|mp4|mkv|mp3|ogg|flac|mov)$", "mplayer" },
 -      { "\\.(png|jpg|gif)$", "feh" },
 -      { "\\.(html|svg)$", "firefox" },
 -      { "\\.pdf$", "mupdf" },
 +      //{ "\\.(avi|mp4|mkv|mp3|ogg|flac|mov)$", "mpv" },
 +      { "\\.(c|cpp|h|txt|log)$", "vim" },
 +      { "\\.(wma|mp3|ogg|flac)$", "fmedia" },
 +      //{ "\\.(png|jpg|gif)$", "feh" },
 +      //{ "\\.(html|svg)$", "firefox" },
 +      { "\\.pdf$", "zathura" },
        { "\\.sh$", "sh" },
 -      { ".", "less" },
 +      //{ ".", "less" },
  };
  
  struct key bindings[] = {

diff --cc noice.c
Simple merge