Received: from list by lists.gnu.org with archive (Exim 4.71) id 1U7pub-0004bH-Q4 for mharc-grub-devel@gnu.org; Tue, 19 Feb 2013 11:19:21 -0500 Received: from eggs.gnu.org ([208.118.235.92]:41263) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U7puV-0004aB-SQ for grub-devel@gnu.org; Tue, 19 Feb 2013 11:19:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U7puN-0004Kw-VQ for grub-devel@gnu.org; Tue, 19 Feb 2013 11:19:15 -0500 Received: from mail-lb0-f176.google.com ([209.85.217.176]:61812) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U7puN-0004Kb-Nr for grub-devel@gnu.org; Tue, 19 Feb 2013 11:19:07 -0500 Received: by mail-lb0-f176.google.com with SMTP id s4so5138792lbc.7 for ; Tue, 19 Feb 2013 08:19:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=x-received:from:to:subject:date:message-id:x-mailer; bh=cRKrTdJbfJVOHIX74owLKZ0Zack0f6rkgO+j7IYU4zo=; b=r2D/IHmVMwtqzJnOtZeb7M5qtiOw3pP3gBvxWULLfsZSIYxJL4X6BDqIE8O6dELj1T 6XHeoyM4DanqKOuGZ0ktrLc+QnFFM/0awpWwXTM4zX0gPniwMDbph4zhUD3V5We4pl0P lwZu8bmOC1+AGv9kiwnkM26bOBiuM8h0ARXHe6Dqr3DTRMTW22lMY1BmGU0hBILcZPz3 eybqBmc+SiW7/WWTEtacnoc0l71JLOYrfUjmqpWhncTRRLDUkj/dBcV2bwm0JPYY7K0W vonJr02K6sEjdkf8xWiZOkXobnAlznwla8lBwrPRwSCgJF90StU92Y8AItpqnUBagBfj fW+A== X-Received: by 10.152.132.138 with SMTP id ou10mr14823714lab.56.1361290746620; Tue, 19 Feb 2013 08:19:06 -0800 (PST) Received: from localhost.localdomain (ppp91-78-198-46.pppoe.mtu-net.ru. [91.78.198.46]) by mx.google.com with ESMTPS id f8sm22188808lbg.2.2013.02.19.08.19.05 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 19 Feb 2013 08:19:05 -0800 (PST) From: Andrey Borzenkov To: grub-devel@gnu.org Subject: [PATCH] Fix stuck down arrow in menu entry editor Date: Tue, 19 Feb 2013 20:17:45 +0400 Message-Id: <1361290665-14827-1-git-send-email-arvidjaar@gmail.com> X-Mailer: git-send-email 1.7.10.4 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.217.176 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Feb 2013 16:19:21 -0000 Variable `off' was never incremented so down arrow was always printed, even when we have scrolled to the end of entry. Signed-off-by: Andrey Borzenkov --- ChangeLog | 5 +++++ grub-core/normal/menu_entry.c | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 654ebcb..349ca7d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-02-19 Andrey Borzenkov + + * grub-core/normal/menu_entry.c (update_screen): remove + unused variable `off' which caused scroll down arrow to be always shown. + 2013-02-19 Paulo Flabiano Smorigo Support Openfirmware disks with non-512B sectors. diff --git a/grub-core/normal/menu_entry.c b/grub-core/normal/menu_entry.c index 7cd67f3..fbe360c 100644 --- a/grub-core/normal/menu_entry.c +++ b/grub-core/normal/menu_entry.c @@ -243,7 +243,6 @@ update_screen (struct screen *screen, struct per_term_screen *term_screen, do { - int off = 0; struct grub_term_pos **pos; if (linep >= screen->lines + screen->num_lines) @@ -301,7 +300,7 @@ update_screen (struct screen *screen, struct per_term_screen *term_screen, y += get_logical_num_lines (linep, term_screen); if (y >= term_screen->num_entries) { - if (off <= linep->len || i + 1 < screen->num_lines) + if (i + 1 < screen->num_lines) down_flag = 1; } -- tg: (cc35b49..) fu/stuck-down-arrow (depends on: master)