From: Arun Prakash Jana <engineerarun@gmail.com>
Date: Wed, 5 Oct 2016 15:11:32 +0000 (+0530)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v1.0~69
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=596da965cf7180bdf2a5b969b14fc064b29774de;p=nnn.git

Merge remote-tracking branch 'upstream/master'
---

596da965cf7180bdf2a5b969b14fc064b29774de
diff --cc config.def.h
index 663351a9,34386938..bffc69d5
--- a/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[] = {