diff options
| -rw-r--r-- | src/imlib.c | 2 | ||||
| -rw-r--r-- | src/options.c | 8 | ||||
| -rw-r--r-- | src/options.h | 2 | 
3 files changed, 6 insertions, 6 deletions
| diff --git a/src/imlib.c b/src/imlib.c index 2c04128..a48d654 100644 --- a/src/imlib.c +++ b/src/imlib.c @@ -1204,7 +1204,7 @@ void feh_edit_inplace(winwidget w, int op)  	if (!w->file || !w->file->data || !FEH_FILE(w->file->data)->filename)  		return; -	if (opt.no_inplace_edit) { +	if (!opt.edit) {  		imlib_context_set_image(w->im);  		if (op == INPLACE_EDIT_FLIP)  			imlib_image_flip_vertical(); diff --git a/src/options.c b/src/options.c index dc6a9ff..19e47f6 100644 --- a/src/options.c +++ b/src/options.c @@ -398,6 +398,7 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun)  		{"bg-fill"       , 0, 0, 218},  		{"bg-max"        , 0, 0, 219},  		{"no-jump-on-resort", 0, 0, 220}, +		{"edit"          , 0, 0, 221},  #ifdef HAVE_LIBEXIF  		{"draw-exif"     , 0, 0, 223},  		{"auto-rotate"   , 0, 0, 242}, @@ -418,7 +419,6 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun)  		{"conversion-timeout" , 1, 0, 245},  		{"version-sort"  , 0, 0, 246},  		{"offset"        , 1, 0, 247}, -		{"no-inplace-edit", 0, 0, 248},  		{0, 0, 0, 0}  	};  	int optch = 0, cmdx = 0; @@ -731,6 +731,9 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun)  		case 220:  			opt.jump_on_resort = 0;  			break; +		case 221: +			opt.edit = 1; +			break;  #ifdef HAVE_LIBEXIF  		case 223:  			opt.draw_exif = 1; @@ -806,9 +809,6 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun)  			opt.offset_flags = XParseGeometry(optarg, &opt.offset_x,  					&opt.offset_y, (unsigned int *)&discard, (unsigned int *)&discard);  			break; -		case 248: -			opt.no_inplace_edit = 1; -			break;  		default:  			break;  		} diff --git a/src/options.h b/src/options.h index 5734b54..1c68fa0 100644 --- a/src/options.h +++ b/src/options.h @@ -80,6 +80,7 @@ struct __fehoptions {  	unsigned char keep_zoom_vp;  	unsigned char insecure_ssl;  	unsigned char filter_by_dimensions; +	unsigned char edit;  	char *output_file;  	char *output_dir; @@ -110,7 +111,6 @@ struct __fehoptions {  	double reload;  	int sort;  	int version_sort; -	int no_inplace_edit;  	int debug;  	int geom_enabled;  	int geom_flags; | 
