From 3e6be2d7f7492ecd6cf5c1a6647e403e9be59de9 Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Mon, 8 Jun 2009 21:08:02 +0000 Subject: [PATCH] fix to minor bug affecting the build process, a maintenance release will follow shortly. --- ChangeLog | 4 ++++ OpenFilesScreen.c | 1 + RichString.c | 4 ++-- RichString.h | 4 ++-- TraceScreen.c | 1 + configure.ac | 2 +- plpa-1.1/Makefile.in | 1 - plpa-1.1/src/Makefile.in | 1 - 8 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 708b9be4..8a397987 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ +What's new in version 0.8.2.1 + +* BUGFIX: Fix a minor bug which affected the build process. + What's new in version 0.8.2 * Integrated lsof (press 'l') diff --git a/OpenFilesScreen.c b/OpenFilesScreen.c index 156e6370..a312d0fb 100644 --- a/OpenFilesScreen.c +++ b/OpenFilesScreen.c @@ -180,6 +180,7 @@ void OpenFilesScreen_run(OpenFilesScreen* this) { break; case 'q': case 27: + case KEY_F(10): looping = false; break; case KEY_RESIZE: diff --git a/RichString.c b/RichString.c index 38cb76c5..753c8cfa 100644 --- a/RichString.c +++ b/RichString.c @@ -13,9 +13,9 @@ #include "debug.h" #include #ifdef HAVE_LIBNCURSESW -#include -#else #include +#else +#include #endif #define RICHSTRING_MAXLEN 300 diff --git a/RichString.h b/RichString.h index 05991aa4..994f504f 100644 --- a/RichString.h +++ b/RichString.h @@ -16,9 +16,9 @@ #include "debug.h" #include #ifdef HAVE_LIBNCURSESW -#include -#else #include +#else +#include #endif #define RICHSTRING_MAXLEN 300 diff --git a/TraceScreen.c b/TraceScreen.c index 02e2a85c..19254f99 100644 --- a/TraceScreen.c +++ b/TraceScreen.c @@ -150,6 +150,7 @@ void TraceScreen_run(TraceScreen* this) { break; case 'q': case 27: + case KEY_F(10): looping = false; break; case KEY_RESIZE: diff --git a/configure.ac b/configure.ac index 6da8f9fc..fdcc3e3f 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.57) -AC_INIT([htop],[0.8.2],[loderunner@users.sourceforge.net]) +AC_INIT([htop],[0.8.2.1],[loderunner@users.sourceforge.net]) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([htop.c]) AC_CONFIG_HEADER([config.h]) diff --git a/plpa-1.1/Makefile.in b/plpa-1.1/Makefile.in index 31dae872..a004a6a6 100644 --- a/plpa-1.1/Makefile.in +++ b/plpa-1.1/Makefile.in @@ -122,7 +122,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ diff --git a/plpa-1.1/src/Makefile.in b/plpa-1.1/src/Makefile.in index 8d420b0a..e7f55f94 100644 --- a/plpa-1.1/src/Makefile.in +++ b/plpa-1.1/src/Makefile.in @@ -157,7 +157,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@