From f387f330838dfd92aed0ee431cff0f22140d5f3d Mon Sep 17 00:00:00 2001
From: Chris Allegretta <chrisa@asty.org>
Date: Wed, 9 Dec 2009 17:09:37 +0000
Subject: [PATCH] 2009-12-07 David Lawrence Ramsey <pooka109@gmail.com>
* global.c (shortcut_init), browser.c (do_browser): Fix M-W not being bound
to research in either main menu or browser.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4461 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---
ChangeLog | 4 ++++
src/browser.c | 2 +-
src/global.c | 4 ++--
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 721eeb4b..ae3ff1f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-12-07 David Lawrence Ramsey <pooka109@gmail.com>
+ * global.c (shortcut_init), browser.c (do_browser): Fix M-W not being bound to
+ research in either main menu or browser.
+
2009-12-09 Chris Allegretta <chrisa@asty.org>
* files.c (read_file) - Add parameter for whether we should even try to check
file writability, as the message is useless when we're inserting into an
diff --git a/src/browser.c b/src/browser.c
index fca72e3c..029aad70 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -184,7 +184,7 @@ char *do_browser(char *path, DIR *dir)
do_filesearch();
curs_set(0);
/* Search for another filename. */
- } else if (f->scfunc == WHEREIS_NEXT_MSG) {
+ } else if (f->scfunc == DO_RESEARCH) {
do_fileresearch();
} else if (f->scfunc == DO_PAGE_UP) {
if (selected >= (editwinrows + fileline % editwinrows) *
diff --git a/src/global.c b/src/global.c
index 74260b0e..ad5c1917 100644
--- a/src/global.c
+++ b/src/global.c
@@ -1062,8 +1062,8 @@ void shortcut_init(bool unjustify)
add_to_sclist(MMAIN, "^^", DO_MARK, 0, TRUE);
add_to_sclist(MMAIN, "F15", DO_MARK, 0, TRUE);
add_to_sclist(MMAIN, "M-A", DO_MARK, 0, TRUE);
- add_to_sclist(MALL, "M-W", DO_RESEARCH, 0, TRUE);
- add_to_sclist(MALL, "F16", DO_RESEARCH, 0, TRUE);
+ add_to_sclist(MMAIN|MBROWSER, "M-W", DO_RESEARCH, 0, TRUE);
+ add_to_sclist(MMAIN|MBROWSER, "F16", DO_RESEARCH, 0, TRUE);
add_to_sclist(MMAIN, "M-^", DO_COPY_TEXT, 0, TRUE);
add_to_sclist(MMAIN, "M-6", DO_COPY_TEXT, 0, TRUE);
add_to_sclist(MMAIN, "M-}", DO_INDENT_VOID, 0, TRUE);
--
GitLab