Package Details: htop-vim-solarized 2.2.0-1

Git Clone URL: https://aur.archlinux.org/htop-vim-solarized.git (read-only, click to copy)
Package Base: htop-vim-solarized
Description: Interactive process viewer with solarized and vim keybindings patch
Upstream URL: https://github.com/cprussin/htop-vim-solarized
Licenses: GPL
Conflicts: htop
Provides: htop
Submitter: cprussin
Maintainer: None
Last Packager: lrustand
Votes: 2
Popularity: 0.000044
First Submitted: 2017-08-15 18:34
Last Updated: 2019-08-08 20:30

Dependencies (5)

Required by (5)

Sources (5)

Latest Comments

Hekuran commented on 2020-11-02 21:16

After more than a year, its time to update. I did everything for you, here: https://filebin.net/8rmqbv2r5sj16nra/patch.diff?t=g55scq2o

(i hope my nvim settings didnt mess white space up) code:

diff --git a/.gitignore b/.gitignore
index b5cb1bf..8713e31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 *.tar.gz
-*.pkg.tar.xz
+*.pkg.tar.zst
 src/
 pkg/
 htop/
diff --git a/PKGBUILD b/PKGBUILD
index 30348f6..27d09ff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,85 +5,67 @@
 # Contributor: Eric Belanger <eric at archlinux.org>
 # Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
 # Contributor: Wesley Merkel <ooesili at gmail.com>
+# Contributor: Hekuran Gashi <hekurangashi at protonmail dot com>

 ##### OPTIONS ###############################################################

-# Set the following variable accordingly:
-#    * x if you would like to use x as the kill-process shortcut in htop
-#    * d if you would like to use d as the kill-process shortcut in htop
-# (we need one of these as htop's default shortcut k conflicts with vim
-#  movement keys!)
-
-kill_process_shortcut=x
-#kill_process_shortcut=d
+#Uncomment the following line if you wish to kill with `d`
+#cp d_for_kill.diff d_for_kill.patch

 #############################################################################

 _pkgname=htop
-pkgname=htop-vim-solarized
-pkgver=2.2.0
+pkgname=${_pkgname}-vim-solarized
+pkgver=3.0.2
 pkgrel=1
 pkgdesc="Interactive process viewer with solarized and vim keybindings patch"
-arch=('i686' 'x86_64')
-url="https://github.com/cprussin/htop-vim-solarized"
+arch=('any')
+url="https://github.com/htop-dev/${_pkgname}"
 license=('GPL')
-depends=('ncurses')
-makedepends=('git' 'python2')
+depends=('ncurses' 'libncursesw.so' 'libnl')
+makedepends=('git')
 optdepends=('lsof: show files opened by a process'
             'strace: attach to a running process')
 provides=('htop')
-conflicts=('htop')
+conflicts=('htop' 'htop-git' 'htop-vim-git' 'htop-vim-solarized-git')
 options=('!emptydirs')
-source=(
-    "http://hisham.hm/htop/releases/${pkgver}/htop-${pkgver}.tar.gz"
-    'solarized-colors.patch'
-    'vim-keybindings-common.patch'
-    'vim-keybindings-d-for-kill.patch'
-    'vim-keybindings-x-for-kill.patch'
-)
-sha384sums=('1db22d35dbd27753b7988f324c841b8c57db29957d2634c345f11b7be6f68ffef47b8f45ebfac160e94964e91f8ddf8d'
-            '3ffcf99a5d8ff9816340fd591859d3e5a1b710ad7f6e6ab5581a0d11573df1991533191366b86a0e6dfa80f8d4617020'
-            '3de0c03296baa0089380a3404a13e96b347b6caaf18380dacd6b5f9c81f3741940bdcd1f07f75bd13e05112e333d2635'
-            '353a675f5453b5b1ab503f9cbcb02e45b32bf429797f11e3cea96848fb4ad931129da7afa52b373fd6871c41657d52af'
-            '3b2071d412a6a98bf5d4d3a4bc74f69b205f9464b00063aa21e9947b80df2a008bb82aff7f8168b0dfbac0647bc0cb76')
-
-prepare() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
-
-    patch_list=(
+source=("${url}/archive/${pkgver}.tar.gz"
         'solarized-colors.patch'
-        'vim-keybindings-common.patch'
-        "vim-keybindings-${kill_process_shortcut}-for-kill.patch"
-    )
-
-    msg2 "Using '$kill_process_shortcut' as the kill-process shortcut in htop"
+        'vim-keybindings.patch'
+        'd_for_kill.diff')
+sha256sums=('b4744a3bea279f2a3725ed8e5e35ffd9cb10d66673bf07c8fe21feb3c4661305'
+            'ef49988c39a7c7e3dd9ffacf8ffbf53d626c0acaae15d93b2d7017ffba732790'
+            '74c3b7b3cc118c6d698c1d04fa404f39cf3f7f2d336e1e1709bacf39fe1bbd07'
+            'adfc123deae256b73527b90708c47d79d3534d8c17fe00e53058c34cd3c459a3')

-    for _p in "${patch_list[@]}"
-    do
-        msg2 "Applying $_p"
-        patch -p1 -i "../$_p"
-    done
-
-    ./autogen.sh
+prepare() {
+   cd "${srcdir}/../";patch < d_for_kill.patch && echo 'PATCHED FOR D KILL'
+   cd "${srcdir}/${_pkgname}-${pkgver}"

-    sed -i 's|ncursesw/curses.h|curses.h|' RichString.[ch] configure
-    sed -i 's|python|python2|' scripts/MakeHeader.py
+   for _p in ${srcdir}/*.patch
+   do
+       msg2 "Applying $_p"
+       patch -p1 -i $_p
+   done

-    ./configure \
-        --prefix=/usr \
-        --enable-unicode \
-        --enable-openvz \
-        --enable-vserver \
-        --enable-cgroup \
-        --enable-oom
+   autoreconf -fi
 }

 build() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
-    make
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+
+  ./configure \
+      --prefix=/usr \
+      --sysconfdir=/etc \
+      --enable-cgroup \
+      --enable-delayacct \
+      --enable-openvz \
+      --enable-unicode \
+      --enable-vserver
+
+  make
 }

 package() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
-    make DESTDIR="${pkgdir}" install
+    make -C "${srcdir}/${_pkgname}-${pkgver}" DESTDIR="$pkgdir" install
 }
diff --git a/d_for_kill.diff b/d_for_kill.diff
new file mode 100644
index 0000000..25d845b
--- /dev/null
+++ b/d_for_kill.diff
@@ -0,0 +1,22 @@
+diff --git a/vim-keybindings.patch b/vim-keybindings.patch
+index b60f105..7c8fa5e 100644
+--- a/vim-keybindings.patch
++++ b/vim-keybindings.patch
+@@ -16,7 +16,7 @@ index 233f132..c885197 100644
+     { .key = "      c: ", .info = "tag process and its children" },
+     { .key = "      U: ", .info = "untag all processes" },
+ -   { .key = "   F9 k: ", .info = "kill process/tagged processes" },
+-+   { .key = "   F9 x: ", .info = "kill process/tagged processes" },
+++   { .key = "   F9 d: ", .info = "kill process/tagged processes" },
+     { .key = "   F7 ]: ", .info = "higher priority (root only)" },
+     { .key = "   F8 [: ", .info = "lower priority (+ nice)" },
+  #if (defined(HAVE_LIBHWLOC) || defined(HAVE_LINUX_AFFINITY))
+@@ -47,7 +47,7 @@ index 233f132..c885197 100644
+     keys['a'] = actionSetAffinity;
+     keys[KEY_F(9)] = actionKill;
+ -   keys['k'] = actionKill;
+-+   keys['x'] = actionKill;
+++   keys['d'] = actionKill;
+     keys[KEY_RECLICK] = actionExpandOrCollapse;
+     keys['+'] = actionExpandOrCollapse;
+     keys['='] = actionExpandOrCollapse;
diff --git a/solarized-colors.patch b/solarized-colors.patch
index 20da2de..dc5ef54 100644
--- a/solarized-colors.patch
+++ b/solarized-colors.patch
@@ -1,74 +1,11 @@
-diff --git a/CRT.c b/CRT.c
-index 237e30e..fe68208 100644
 --- a/CRT.c
 +++ b/CRT.c
-@@ -226,7 +226,7 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
-       [CPU_NICE_TEXT] = A_BOLD | ColorPair(Blue,Black),
-       [CPU_NORMAL] = ColorPair(Green,Black),
-       [CPU_KERNEL] = ColorPair(Red,Black),
--      [CPU_IOWAIT] = A_BOLD | ColorPair(Black, Black),
-+      [CPU_IOWAIT] = A_BOLD | ColorPair(Green, Black),
-       [CPU_IRQ] = ColorPair(Yellow,Black),
-       [CPU_SOFTIRQ] = ColorPair(Magenta,Black),
-       [CPU_STEAL] = ColorPair(Cyan,Black),
-@@ -351,10 +351,10 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
-       [CPU_GUEST] = ColorPair(Cyan,White),
-    },
-    [COLORSCHEME_LIGHTTERMINAL] = {
--      [RESET_COLOR] = ColorPair(Black,Black),
--      [DEFAULT_COLOR] = ColorPair(Black,Black),
-+      [RESET_COLOR] = ColorPair(Green,Black),
-+      [DEFAULT_COLOR] = ColorPair(Green,Black),
-       [FUNCTION_BAR] = ColorPair(Black,Cyan),
--      [FUNCTION_KEY] = ColorPair(Black,Black),
-+      [FUNCTION_KEY] = ColorPair(Green,Black),
-       [PANEL_HEADER_FOCUS] = ColorPair(Black,Green),
-       [PANEL_HEADER_UNFOCUS] = ColorPair(Black,Green),
-       [PANEL_SELECTION_FOCUS] = ColorPair(Black,Cyan),
-@@ -365,10 +365,10 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
-       [BATTERY] = ColorPair(Yellow,Black),
-       [LARGE_NUMBER] = ColorPair(Red,Black),
-       [METER_TEXT] = ColorPair(Blue,Black),
--      [METER_VALUE] = ColorPair(Black,Black),
-+      [METER_VALUE] = ColorPair(Green,Black),
-       [LED_COLOR] = ColorPair(Green,Black),
-       [TASKS_RUNNING] = ColorPair(Green,Black),
--      [PROCESS] = ColorPair(Black,Black),
-+      [PROCESS] = ColorPair(Green,Black),
-       [PROCESS_SHADOW] = A_BOLD | ColorPairGrayBlack,
-       [PROCESS_TAG] = ColorPair(White,Blue),
-       [PROCESS_MEGABYTES] = ColorPair(Blue,Black),
-@@ -389,25 +389,25 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
-       [MEMORY_BUFFERS] = ColorPair(Cyan,Black),
-       [MEMORY_BUFFERS_TEXT] = ColorPair(Cyan,Black),
-       [MEMORY_CACHE] = ColorPair(Yellow,Black),
--      [LOAD_AVERAGE_FIFTEEN] = ColorPair(Black,Black),
--      [LOAD_AVERAGE_FIVE] = ColorPair(Black,Black),
--      [LOAD_AVERAGE_ONE] = ColorPair(Black,Black),
-+      [LOAD_AVERAGE_FIFTEEN] = ColorPair(Green,Black),
-+      [LOAD_AVERAGE_FIVE] = ColorPair(Green,Black),
-+      [LOAD_AVERAGE_ONE] = ColorPair(Green,Black),
-       [LOAD] = ColorPair(White,Black),
-       [HELP_BOLD] = ColorPair(Blue,Black),
-       [CLOCK] = ColorPair(White,Black),
-       [CHECK_BOX] = ColorPair(Blue,Black),
--      [CHECK_MARK] = ColorPair(Black,Black),
--      [CHECK_TEXT] = ColorPair(Black,Black),
-+      [CHECK_MARK] = ColorPair(Green,Black),
-+      [CHECK_TEXT] = ColorPair(Green,Black),
-       [HOSTNAME] = ColorPair(White,Black),
-       [CPU_NICE] = ColorPair(Cyan,Black),
-       [CPU_NICE_TEXT] = ColorPair(Cyan,Black),
-       [CPU_NORMAL] = ColorPair(Green,Black),
-       [CPU_KERNEL] = ColorPair(Red,Black),
--      [CPU_IOWAIT] = A_BOLD | ColorPair(Black, Black),
-+      [CPU_IOWAIT] = A_BOLD | ColorPair(Green, Black),
-       [CPU_IRQ] = A_BOLD | ColorPair(Blue,Black),
-       [CPU_SOFTIRQ] = ColorPair(Blue,Black),
--      [CPU_STEAL] = ColorPair(Black,Black),
--      [CPU_GUEST] = ColorPair(Black,Black),
-+      [CPU_STEAL] = ColorPair(Green,Black),
-+      [CPU_GUEST] = ColorPair(Green,Black),
-    },
-    [COLORSCHEME_MIDNIGHT] = {
-       [RESET_COLOR] = ColorPair(White,Blue),
+@@ -732,5 +732,8 @@ void CRT_setColors(int colorScheme) {
+                      : 0;
+    init_pair(ColorIndexGrayBlack, grayBlackFg, grayBlackBg);
+ 
++   if (colorScheme == COLORSCHEME_DEFAULT) {
++        colorScheme = COLORSCHEME_BROKENGRAY;
++   }
+    CRT_colors = CRT_colorSchemes[colorScheme];
+ }
diff --git a/vim-keybindings-d-for-kill.patch b/vim-keybindings-d-for-kill.patch
deleted file mode 100644
index 360d84c..0000000
--- a/vim-keybindings-d-for-kill.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/Action.c
-+++ b/Action.c
-@@ -403,7 +403,7 @@ static struct { const char* key; const char* info; } helpRight[] = {
-    { .key = "  Space: ", .info = "tag process" },
-    { .key = "      c: ", .info = "tag process and its children" },
-    { .key = "      U: ", .info = "untag all processes" },
--   { .key = "   F9 k: ", .info = "kill process/tagged processes" },
-+   { .key = "   F9 d: ", .info = "kill process/tagged processes" },
-    { .key = "   F7 ]: ", .info = "higher priority (root only)" },
-    { .key = "   F8 [: ", .info = "lower priority (+ nice)" },
- #if (HAVE_LIBHWLOC || HAVE_LINUX_AFFINITY)
-@@ -551,7 +552,7 @@ void Action_setBindings(Htop_Action* keys) {
-    keys['q'] = actionQuit;
-    keys['a'] = actionSetAffinity;
-    keys[KEY_F(9)] = actionKill;
--   keys['k'] = actionKill;
-+   keys['d'] = actionKill;
-    keys[KEY_RECLICK] = actionExpandOrCollapse;
-    keys['+'] = actionExpandOrCollapse;
-    keys['='] = actionExpandOrCollapse;
diff --git a/vim-keybindings-x-for-kill.patch b/vim-keybindings-x-for-kill.patch
deleted file mode 100644
index 36dcda1..0000000
--- a/vim-keybindings-x-for-kill.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/Action.c
-+++ b/Action.c
-@@ -403,7 +403,7 @@ static struct { const char* key; const char* info; } helpRight[] = {
-    { .key = "  Space: ", .info = "tag process" },
-    { .key = "      c: ", .info = "tag process and its children" },
-    { .key = "      U: ", .info = "untag all processes" },
--   { .key = "   F9 k: ", .info = "kill process/tagged processes" },
-+   { .key = "   F9 x: ", .info = "kill process/tagged processes" },
-    { .key = "   F7 ]: ", .info = "higher priority (root only)" },
-    { .key = "   F8 [: ", .info = "lower priority (+ nice)" },
- #if (HAVE_LIBHWLOC || HAVE_LINUX_AFFINITY)
-@@ -551,7 +552,7 @@ void Action_setBindings(Htop_Action* keys) {
-    keys['q'] = actionQuit;
-    keys['a'] = actionSetAffinity;
-    keys[KEY_F(9)] = actionKill;
--   keys['k'] = actionKill;
-+   keys['x'] = actionKill;
-    keys[KEY_RECLICK] = actionExpandOrCollapse;
-    keys['+'] = actionExpandOrCollapse;
-    keys['='] = actionExpandOrCollapse;
diff --git a/vim-keybindings-common.patch b/vim-keybindings.patch
similarity index 63%
rename from vim-keybindings-common.patch
rename to vim-keybindings.patch
index e8b10da..aae7211 100644
--- a/vim-keybindings-common.patch
+++ b/vim-keybindings.patch
@@ -1,31 +1,41 @@
 diff --git a/Action.c b/Action.c
-index a6394ac..f82ff21 100644
+index 233f132..c885197 100644
 --- a/Action.c
 +++ b/Action.c
-@@ -382,7 +382,7 @@ static Htop_Reaction actionRedraw() {
+@@ -393,7 +393,7 @@ static Htop_Reaction actionRedraw(ATTR_UNUSED State *st) {
  }
- 
+
  static const struct { const char* key; const char* info; } helpLeft[] = {
 -   { .key = " Arrows: ", .info = "scroll process list" },
 +   { .key = "   hjkl: ", .info = "scroll process list" },
     { .key = " Digits: ", .info = "incremental PID search" },
     { .key = "   F3 /: ", .info = "incremental name search" },
     { .key = "   F4 \\: ",.info = "incremental name filtering" },
-@@ -411,11 +411,11 @@ static const struct { const char* key; const char* info; } helpRight[] = {
+@@ -414,7 +414,7 @@ static const struct { const char* key; const char* info; } helpRight[] = {
+    { .key = "  Space: ", .info = "tag process" },
+    { .key = "      c: ", .info = "tag process and its children" },
+    { .key = "      U: ", .info = "untag all processes" },
+-   { .key = "   F9 k: ", .info = "kill process/tagged processes" },
++   { .key = "   F9 x: ", .info = "kill process/tagged processes" },
+    { .key = "   F7 ]: ", .info = "higher priority (root only)" },
+    { .key = "   F8 [: ", .info = "lower priority (+ nice)" },
+ #if (defined(HAVE_LIBHWLOC) || defined(HAVE_LINUX_AFFINITY))
+@@ -422,11 +422,11 @@ static const struct { const char* key; const char* info; } helpRight[] = {
  #endif
     { .key = "      e: ", .info = "show process environment" },
     { .key = "      i: ", .info = "set IO priority" },
 -   { .key = "      l: ", .info = "list open files with lsof" },
 +   { .key = "      L: ", .info = "list open files with lsof" },
     { .key = "      s: ", .info = "trace syscalls with strace" },
-    { .key = "         ", .info = "" },
+-   { .key = "         ", .info = "" },
++   { .key = "      w: ", .info = "wrap process command in multiple lines" },
     { .key = " F2 C S: ", .info = "setup" },
 -   { .key = "   F1 h: ", .info = "show this help screen" },
 +   { .key = "   F1 ?: ", .info = "show this help screen" },
     { .key = "  F10 q: ", .info = "quit" },
     { .key = NULL, .info = NULL }
  };
-@@ -543,6 +543,7 @@ void Action_setBindings(Htop_Action* keys) {
+@@ -566,6 +566,7 @@ void Action_setBindings(Htop_Action* keys) {
     keys['I'] = actionInvertSortOrder;
     keys[KEY_F(6)] = actionExpandCollapseOrSortColumn;
     keys[KEY_F(18)] = actionExpandCollapseOrSortColumn;
@@ -33,7 +43,16 @@ index a6394ac..f82ff21 100644
     keys['<'] = actionSetSortColumn;
     keys[','] = actionSetSortColumn;
     keys['>'] = actionSetSortColumn;
-@@ -561,12 +562,11 @@ void Action_setBindings(Htop_Action* keys) {
+@@ -574,7 +575,7 @@ void Action_setBindings(Htop_Action* keys) {
+    keys['q'] = actionQuit;
+    keys['a'] = actionSetAffinity;
+    keys[KEY_F(9)] = actionKill;
+-   keys['k'] = actionKill;
++   keys['x'] = actionKill;
+    keys[KEY_RECLICK] = actionExpandOrCollapse;
+    keys['+'] = actionExpandOrCollapse;
+    keys['='] = actionExpandOrCollapse;
+@@ -585,12 +586,11 @@ void Action_setBindings(Htop_Action* keys) {
     keys['S'] = actionSetup;
     keys['C'] = actionSetup;
     keys[KEY_F(2)] = actionSetup;
@@ -48,10 +67,10 @@ index a6394ac..f82ff21 100644
     keys['U'] = actionUntagAll;
     keys['c'] = actionTagAllChildren;
 diff --git a/Panel.c b/Panel.c
-index 8c4d44f..c00012c 100644
+index 315f388..5842cc7 100644
 --- a/Panel.c
 +++ b/Panel.c
-@@ -376,10 +376,12 @@ bool Panel_onKey(Panel* this, int key) {
+@@ -318,10 +318,12 @@ bool Panel_onKey(Panel* this, int key) {
     int size = Vector_size(this->items);
     switch (key) {
     case KEY_DOWN:
@@ -64,14 +83,14 @@ index 8c4d44f..c00012c 100644
     case KEY_CTRL('P'):
        this->selected--;
        break;
-@@ -394,23 +396,33 @@ bool Panel_onKey(Panel* this, int key) {
+@@ -336,23 +338,33 @@ bool Panel_onKey(Panel* this, int key) {
        break;
     #endif
     case KEY_LEFT:
 -   case KEY_CTRL('B'):
 +   case 'h':
        if (this->scrollH > 0) {
-          this->scrollH -= MAX(CRT_scrollHAmount, 0);
+          this->scrollH -= MAXIMUM(CRT_scrollHAmount, 0);
           this->needsRedraw = true;
        }
        break;
@@ -92,31 +111,34 @@ index 8c4d44f..c00012c 100644
     case KEY_PPAGE:
 +   case KEY_CTRL('B'):
        this->selected -= (this->h - 1);
-       this->scrollV = MAX(0, this->scrollV - this->h + 1);
+       this->scrollV = MAXIMUM(0, this->scrollV - this->h + 1);
        this->needsRedraw = true;
        break;
     case KEY_NPAGE:
 +   case KEY_CTRL('F'):
        this->selected += (this->h - 1);
-       this->scrollV = MAX(0, MIN(Vector_size(this->items) - this->h,
+       this->scrollV = MAXIMUM(0, MINIMUM(Vector_size(this->items) - this->h,
                                   this->scrollV + this->h - 1));
-@@ -455,7 +467,7 @@ bool Panel_onKey(Panel* this, int key) {
-    if (this->selected < 0 || size == 0) {
+@@ -374,9 +386,11 @@ bool Panel_onKey(Panel* this, int key) {
+       break;
+    }
+    case KEY_HOME:
++   case 'g':
        this->selected = 0;
-       this->needsRedraw = true;
--   } else if (this->selected >= size) {   
-+   } else if (this->selected >= size) {
+       break;
+    case KEY_END:
++   case 'G':
        this->selected = size - 1;
-       this->needsRedraw = true;
-    }
+       break;
+    case KEY_CTRL('A'):
 diff --git a/README b/README
-index 33a8739..e07bd58 100644
+index 67f80ef..84f90d7 100644
 --- a/README
 +++ b/README
-@@ -17,6 +17,44 @@ but we also have code for running under FreeBSD and Mac OS X
- This software has evolved considerably over the years,
- and is reasonably complete, but there is always room for improvement.
- 
+@@ -15,6 +15,47 @@
+ For more information and details on how to contribute to `htop`
+ visit [htop.dev](https://htop.dev).
+
 +Vim keybindings
 +----------------
 +
@@ -149,20 +171,23 @@ index 33a8739..e07bd58 100644
 +In order to accomodate these keybindings, the following changes
 +were made to the original keybindings:
 +
-+* Ctrl+F and Ctrt+B can now longer be used to navigate horizontally
++* Ctrl+F and Ctrt+B can no longer be used to navigate horizontally
 +* 'h' can no longer be used to access the help, leaving Ctrl+F1 & '?'
 +* 'k' can no longer be used to kill processes, being replaced with 'x'
 +* 'l' can no longer be used to list open files, being replaced with 'L'
 +
 +
- Comparison between `htop` and classic `top`
- -------------------------------------------
- 
++Comparison between `htop` and classic `top`
++-------------------------------------------
++
+ ## Build instructions
+
+ This program is distributed as a standard autotools-based package.
 diff --git a/ScreenManager.c b/ScreenManager.c
-index 05e1c02..df2ac4a 100644
+index 2a2cb1d..705ae17 100644
 --- a/ScreenManager.c
 +++ b/ScreenManager.c
-@@ -279,7 +279,7 @@ void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey) {
+@@ -250,7 +250,7 @@ void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey) {
           continue;
        }
        case KEY_LEFT:
@@ -171,7 +196,7 @@ index 05e1c02..df2ac4a 100644
           if (this->panelCount < 2) {
              goto defaultHandler;
           }
-@@ -293,7 +293,7 @@ void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey) {
+@@ -264,7 +264,7 @@ void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey) {
              goto tryLeft;
           break;
        case KEY_RIGHT: