Commit 39f3eab4 authored by Dennis Real's avatar Dennis Real
Browse files

Merge branch 'master' of git://github.com/derf/feh

parents a3d28a95 f9609945

man/feh.pre

+4 −0
Original line number Diff line number Diff line
@@ -873,6 +873,10 @@ Image width 
.Nm

version

.

.It %V

.

Process ID

.

.It %z

.

current image zoom

src/slideshow.c

+4 −0
Original line number Diff line number Diff line
@@ -508,6 +508,10 @@ char *feh_printf(char *str, feh_file * file, winwidget winwid) 
			case 'v':

				strcat(ret, VERSION);

				break;

			case 'V':

				snprintf(buf, sizeof(buf), "%d", getpid());

				strcat(ret, buf);

				break;

			case 'w':

				if (file && (file->info || !feh_file_info_load(file, NULL))) {

					snprintf(buf, sizeof(buf), "%d", file->info->width);