[PATCH] more-prompt: add 'f' for scrolling back a screen

[Markus Heidelberg]

After reaching the end of the more prompt, hitting SPACE jumps out of
it. Add 'f' to avoid this problem and for consistency with 'b' in
"scroll down a screen".

This also changes the help message to contain "f" instead of "SPACE",
I'm not sure about this.
This change also adds a missing leading Space for fr.po and no.po and
missing trailing spaces for most of the other languages.


--~--~---------~--~----~------------~-------~--~----~
You received this message from the "vim_dev" maillist.
For more information, visit http://www.vim.org/maillist.php
-~----------~----~----~----~------~----~------~--~---


 runtime/doc/message.txt |    4 ++--
 src/message.c           |    3 ++-
 src/po/ca.po            |    4 ++--
 src/po/de.po            |    4 ++--
 src/po/eo.po            |    4 ++--
 src/po/fi.po            |    4 ++--
 src/po/fr.po            |    4 ++--
 src/po/ga.po            |    4 ++--
 src/po/it.po            |    4 ++--
 src/po/ja.po            |    4 ++--
 src/po/ja.sjis.po       |    4 ++--
 src/po/no.po            |    4 ++--
 src/po/pl.UTF-8.po      |    4 ++--
 src/po/pl.cp1250.po     |    4 ++--
 src/po/pl.po            |    4 ++--
 src/po/pt_BR.po         |    4 ++--
 src/po/sk.cp1250.po     |    4 ++--
 src/po/sk.po            |    4 ++--
 src/po/sv.po            |    4 ++--
 src/po/uk.cp1251.po     |    4 ++--
 src/po/uk.po            |    4 ++--
 src/po/zh_CN.UTF-8.po   |    4 ++--
 src/po/zh_CN.cp936.po   |    4 ++--
 src/po/zh_CN.po         |    4 ++--
 24 files changed, 48 insertions(+), 47 deletions(-)

diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt
index dc772c7..12864f1 100644
--- a/runtime/doc/message.txt
+++ b/runtime/doc/message.txt
@@ -786,7 +786,7 @@ group.
 
 						*more-prompt* *pager*  >
   -- More --
-  -- More -- SPACE/d/j: screen/page/line down, b/u/k: up, q: quit
+  -- More -- f/d/j: screen/page/line down, b/u/k: up, q: quit
 
 This message is given when the screen is filled with messages.  It is only
 given when the 'more' option is on.  It is highlighted with the |hl-MoreMsg|
@@ -795,7 +795,7 @@ group.
 Type					effect ~
      <CR> or <NL> or j or <Down>	one more line
      d					down a page (half a screen)
-     <Space> or <PageDown>		down a screen
+     <Space> or f or <PageDown>		down a screen
      G					down all the way, until the hit-enter
 					prompt
 
diff --git a/src/message.c b/src/message.c
index e0f2897..8dbfd8e 100644
--- a/src/message.c
+++ b/src/message.c
@@ -2517,6 +2517,7 @@ do_more_prompt(typed_char)
 	    break;
 
 	case ' ':		/* one extra page */
+	case 'f':
 	case K_PAGEDOWN:
 	case K_LEFTMOUSE:
 	    scroll = Rows - 1;
@@ -2840,7 +2841,7 @@ msg_moremsg(full)
     screen_puts(s, (int)Rows - 1, 0, attr);
     if (full)
 	screen_puts((char_u *)
-		_(" SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "),
+		_(" f/d/j: screen/page/line down, b/u/k: up, q: quit "),
 		(int)Rows - 1, vim_strsize(s), attr);
 }
 
diff --git a/src/po/ca.po b/src/po/ca.po
index a4d80c2..1cb38da 100644
--- a/src/po/ca.po
+++ b/src/po/ca.po
@@ -3724,8 +3724,8 @@ msgstr "%s l
 msgid "-- More --"
 msgstr "-- Més --"
 
-msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
-msgstr " ESPAI/d/j: pantalla/pàgina/línia avall, b/u/k: amunt, q: sortir"
+msgid " f/d/j: screen/page/line down, b/u/k: up, q: quit "
+msgstr " f/d/j: pantalla/pàgina/línia avall, b/u/k: amunt, q: sortir "
 
 msgid "Question"
 msgstr "Pregunta"
diff --git a/src/po/de.po b/src/po/de.po
index 1b3a0d7..f5c5270 100644
--- a/src/po/de.po
+++ b/src/po/de.po
@@ -3602,8 +3602,8 @@ msgstr "%s Zeile %ld"
 msgid "-- More --"
 msgstr "-- Mehr --"
 
-msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
-msgstr " LEERZEICHEN/d/j: Seite/halbe Seite/Zeile vorwärts, b/u/k: rückwärts, q: Ende"
+msgid " f/d/j: screen/page/line down, b/u/k: up, q: quit "
+msgstr " f/d/j: Seite/halbe Seite/Zeile vorwärts, b/u/k: rückwärts, q: Ende "
 
 msgid "Question"
 msgstr "Frage"
diff --git a/src/po/eo.po b/src/po/eo.po
index 78e1933..a871435 100644
--- a/src/po/eo.po
+++ b/src/po/eo.po
@@ -3811,8 +3811,8 @@ msgstr "%s linio %ld"
 msgid "-- More --"
 msgstr "-- Pli --"
 
-msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
-msgstr " SPACETO/d/j: ekrano/paĝo/sub linio, b/u/k: supre, q: eliri "
+msgid " f/d/j: screen/page/line down, b/u/k: up, q: quit "
+msgstr " f/d/j: ekrano/paĝo/sub linio, b/u/k: supre, q: eliri "
 
 msgid "Question"
 msgstr "Demando"
diff --git a/src/po/fi.po b/src/po/fi.po
index 8e4c8f1..7eb7892 100644
--- a/src/po/fi.po
+++ b/src/po/fi.po
@@ -3792,8 +3792,8 @@ msgstr "%s rivi %ld"
 msgid "-- More --"
 msgstr "-- Lisää --"
 
-msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
-msgstr " SPACE/d/j: ruutu/sivu/rivi alas, b/u/k: ylös, q: lopeta"
+msgid " f/d/j: screen/page/line down, b/u/k: up, q: quit "
+msgstr " f/d/j: ruutu/sivu/rivi alas, b/u/k: ylös, q: lopeta "
 
 msgid "Question"
 msgstr "Kysymys"
diff --git a/src/po/fr.po b/src/po/fr.po
index 7d163eb..055b339 100644
--- a/src/po/fr.po
+++ b/src/po/fr.po
@@ -4127,9 +4127,9 @@ msgstr "%s, ligne %ld"
 msgid "-- More --"
 msgstr "-- Plus --"
 
-msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
+msgid " f/d/j: screen/page/line down, b/u/k: up, q: quit "
 msgstr ""
-"ESPACE/d/j : écran/page/ligne vers le bas, b/u/k : vers le haut, q : quitter"
+" f/d/j : écran/page/ligne vers le bas, b/u/k : vers le haut, q : quitter "
 
 msgid "Question"
 msgstr "Question"
diff --git a/src/po/ga.po b/src/po/ga.po
index ae1bdba..12db084 100644
--- a/src/po/ga.po
+++ b/src/po/ga.po
@@ -3801,8 +3801,8 @@ msgstr "%s l
 msgid "-- More --"
 msgstr "-- Tuilleadh --"
 
-msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
-msgstr " SPÁS/d/j: scáileán/leathanach/líne síos, b/u/k: suas, q: scoir "
+msgid " f/d/j: screen/page/line down, b/u/k: up, q: quit "
+msgstr " f/d/j: scáileán/leathanach/líne síos, b/u/k: suas, q: scoir "
 
 msgid "Question"
 msgstr "Ceist"
diff --git a/src/po/it.po b/src/po/it.po
index 562757e..255c1fb 100644
--- a/src/po/it.po
+++ b/src/po/it.po
@@ -3786,8 +3786,8 @@ msgstr "%s linea %ld"
 msgid "-- More --"
 msgstr "-- Ancora --"
 
-msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
-msgstr " SPAZIO/d/j: schermo/pagina/riga giù, b/u/k: su, q: abbandona"
+msgid " f/d/j: screen/page/line down, b/u/k: up, q: quit "
+msgstr " f/d/j: schermo/pagina/riga giù, b/u/k: su, q: abbandona "
 
 msgid "Question"
 msgstr "Domanda"
diff --git a/src/po/ja.po b/src/po/ja.po
index b70f612..416a843 100644
--- a/src/po/ja.po
+++ b/src/po/ja.po
@@ -3747,8 +3747,8 @@ msgstr "%s 
 msgid "-- More --"
 msgstr "-- ·Ñ³ --"
 
-msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
-msgstr " SPACE/d/j: ²èÌÌ/¥Ú¡¼¥¸/¹Ô ²¼, b/uk: ¾å, q: ½ªÎ»"
+msgid " f/d/j: screen/page/line down, b/u/k: up, q: quit "
+msgstr " f/d/j: ²èÌÌ/¥Ú¡¼¥¸/¹Ô ²¼, b/uk: ¾å, q: ½ªÎ» "
 
 msgid "Question"
 msgstr "¼ÁÌä"
diff --git a/src/po/ja.sjis.po b/src/po/ja.sjis.po
index 5fd6592..428b16a 100644
--- a/src/po/ja.sjis.po
+++ b/src/po/ja.sjis.po
@@ -3747,8 +3747,8 @@ msgstr "%s 
 msgid "-- More --"
 msgstr "-- Œp‘± --"
 
-msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
-msgstr " SPACE/d/j: ‰æ–Ê/ƒy[ƒW/s ‰º, b/uk: ã, q: I—¹"
+msgid " f/d/j: screen/page/line down, b/u/k: up, q: quit "
+msgstr " f/d/j: ‰æ–Ê/ƒy[ƒW/s ‰º, b/uk: ã, q: I—¹ "
 
 msgid "Question"
 msgstr "Ž¿–â"
diff --git a/src/po/no.po b/src/po/no.po
index feb1540..fc50e20 100644
--- a/src/po/no.po
+++ b/src/po/no.po
@@ -3756,8 +3756,8 @@ msgstr "%s linje %ld"
 msgid "-- More --"
 msgstr "-- Mer --"
 
-msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
-msgstr "MELLOMROM/d/j: Skjerm/side/linje ned, b/u/k: Opp, q: Avslutt "
+msgid " f/d/j: screen/page/line down, b/u/k: up, q: quit "
+msgstr " f/d/j: Skjerm/side/linje ned, b/u/k: Opp, q: Avslutt "
 
 msgid "Question"
 msgstr "Spørsmål"
diff --git a/src/po/pl.UTF-8.po b/src/po/pl.UTF-8.po
index 37d7d48..52ac458 100644
--- a/src/po/pl.UTF-8.po
+++ b/src/po/pl.UTF-8.po
@@ -3748,8 +3748,8 @@ msgstr "%s wiersz %ld"
 msgid "-- More --"
 msgstr "-- Więcej --"
 
-msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
-msgstr " SPACE/d/j: ekran/strona/wiersz w dół, b/u/k: do góry, q: zakończ"
+msgid " f/d/j: screen/page/line down, b/u/k: up, q: quit "
+msgstr " f/d/j: ekran/strona/wiersz w dół, b/u/k: do góry, q: zakończ "
 
 msgid "Question"
 msgstr "Pytanie"
diff --git a/src/po/pl.cp1250.po b/src/po/pl.cp1250.po
index bf00c91..90287f5 100644
--- a/src/po/pl.cp1250.po
+++ b/src/po/pl.cp1250.po
@@ -3748,8 +3748,8 @@ msgstr "%s wiersz %ld"
 msgid "-- More --"
 msgstr "-- Wiêcej --"
 
-msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
-msgstr " SPACE/d/j: ekran/strona/wiersz w dó³, b/u/k: do góry, q: zakoñcz"
+msgid " f/d/j: screen/page/line down, b/u/k: up, q: quit "
+msgstr " f/d/j: ekran/strona/wiersz w dó³, b/u/k: do góry, q: zakoñcz "
 
 msgid "Question"
 msgstr "Pytanie"
diff --git a/src/po/pl.po b/src/po/pl.po
index 5cc6129..cf4854b 100644
--- a/src/po/pl.po
+++ b/src/po/pl.po
@@ -3748,8 +3748,8 @@ msgstr "%s wiersz %ld"
 msgid "-- More --"
 msgstr "-- Wiêcej --"
 
-msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
-msgstr " SPACE/d/j: ekran/strona/wiersz w dó³, b/u/k: do góry, q: zakoñcz"
+msgid " f/d/j: screen/page/line down, b/u/k: up, q: quit "
+msgstr " f/d/j: ekran/strona/wiersz w dó³, b/u/k: do góry, q: zakoñcz "
 
 msgid "Question"
 msgstr "Pytanie"
diff --git a/src/po/pt_BR.po b/src/po/pt_BR.po
index 5329741..04a2c40 100644
--- a/src/po/pt_BR.po
+++ b/src/po/pt_BR.po
@@ -3693,8 +3693,8 @@ msgstr "%s, linha %ld"
 msgid "-- More --"
 msgstr "-- Mais --"
 
-msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
-msgstr " ESPAÇO/d/j: tela/página/linha abaixo, b/u/k: acima, q: sair "
+msgid " f/d/j: screen/page/line down, b/u/k: up, q: quit "
+msgstr " f/d/j: tela/página/linha abaixo, b/u/k: acima, q: sair "
 
 msgid "Question"
 msgstr "Questão"
diff --git a/src/po/sk.cp1250.po b/src/po/sk.cp1250.po
index 9dd81e2..58a6343 100644
--- a/src/po/sk.cp1250.po
+++ b/src/po/sk.cp1250.po
@@ -3540,8 +3540,8 @@ msgstr "Stla
 msgid "-- More --"
 msgstr "-- Pokraèovanie --"
 
-msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
-msgstr " MEDZERA/d/j: obrazovka/stránka/riadok dole, b/u/k: hore, q: koniec"
+msgid " f/d/j: screen/page/line down, b/u/k: up, q: quit "
+msgstr " f/d/j: obrazovka/stránka/riadok dole, b/u/k: hore, q: koniec "
 
 msgid "Question"
 msgstr "Otázka"
diff --git a/src/po/sk.po b/src/po/sk.po
index 098910a..c638902 100644
--- a/src/po/sk.po
+++ b/src/po/sk.po
@@ -3540,8 +3540,8 @@ msgstr "Stla
 msgid "-- More --"
 msgstr "-- Pokraèovanie --"
 
-msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
-msgstr " MEDZERA/d/j: obrazovka/stránka/riadok dole, b/u/k: hore, q: koniec"
+msgid " f/d/j: screen/page/line down, b/u/k: up, q: quit "
+msgstr " f/d/j: obrazovka/stránka/riadok dole, b/u/k: hore, q: koniec "
 
 msgid "Question"
 msgstr "Otázka"
diff --git a/src/po/sv.po b/src/po/sv.po
index c7a0e45..69e9dc7 100644
--- a/src/po/sv.po
+++ b/src/po/sv.po
@@ -3734,8 +3734,8 @@ msgstr "%s rad %ld"
 msgid "-- More --"
 msgstr "-- Mer --"
 
-msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
-msgstr " BLANKSTEG/d/j: skärm/sida/rad ned, b/u/k: upp, q: quit"
+msgid " f/d/j: screen/page/line down, b/u/k: up, q: quit "
+msgstr " f/d/j: skärm/sida/rad ned, b/u/k: upp, q: quit "
 
 msgid "Question"
 msgstr "Fråga"
diff --git a/src/po/uk.cp1251.po b/src/po/uk.cp1251.po
index 8eefad8..bff938e 100644
--- a/src/po/uk.cp1251.po
+++ b/src/po/uk.cp1251.po
@@ -3819,8 +3819,8 @@ msgstr "%s 
 msgid "-- More --"
 msgstr "-- Ùå --"
 
-msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
-msgstr " ÏÐÎÁ²Ë/d/j: âíèç íà åêðàí/ñòîð³íêó/ðÿäîê, b/u/k: âãîðó, q: âèéòè "
+msgid " f/d/j: screen/page/line down, b/u/k: up, q: quit "
+msgstr " f/d/j: âíèç íà åêðàí/ñòîð³íêó/ðÿäîê, b/u/k: âãîðó, q: âèéòè "
 
 msgid "Question"
 msgstr "Çàïèòàííÿ"
diff --git a/src/po/uk.po b/src/po/uk.po
index 733827a..216a741 100644
--- a/src/po/uk.po
+++ b/src/po/uk.po
@@ -3819,8 +3819,8 @@ msgstr "%s рядок %ld"
 msgid "-- More --"
 msgstr "-- Ще --"
 
-msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
-msgstr " ПРОБІЛ/d/j: вниз на екран/сторінку/рядок, b/u/k: вгору, q: вийти "
+msgid " f/d/j: screen/page/line down, b/u/k: up, q: quit "
+msgstr " f/d/j: вниз на екран/сторінку/рядок, b/u/k: вгору, q: вийти "
 
 msgid "Question"
 msgstr "Запитання"
diff --git a/src/po/zh_CN.UTF-8.po b/src/po/zh_CN.UTF-8.po
index dbb5c72..d5dd0ed 100644
--- a/src/po/zh_CN.UTF-8.po
+++ b/src/po/zh_CN.UTF-8.po
@@ -3662,8 +3662,8 @@ msgstr "%s 第 %ld 行"
 msgid "-- More --"
 msgstr "-- 更多 --"
 
-msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
-msgstr " 空格/d/j: 屏幕/页/行 下翻，b/u/k: 上翻，q: 退出"
+msgid " f/d/j: screen/page/line down, b/u/k: up, q: quit "
+msgstr " f/d/j: 屏幕/页/行 下翻，b/u/k: 上翻，q: 退出 "
 
 msgid "Question"
 msgstr "问题"
diff --git a/src/po/zh_CN.cp936.po b/src/po/zh_CN.cp936.po
index 76309c7..d11f039 100644
--- a/src/po/zh_CN.cp936.po
+++ b/src/po/zh_CN.cp936.po
@@ -3662,8 +3662,8 @@ msgstr "%s 
 msgid "-- More --"
 msgstr "-- ¸ü¶à --"
 
-msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
-msgstr " ¿Õ¸ñ/d/j: ÆÁÄ»/Ò³/ÐÐ Ï·­£¬b/u/k: ÉÏ·­£¬q: Í˳ö"
+msgid " f/d/j: screen/page/line down, b/u/k: up, q: quit "
+msgstr " f/d/j: ÆÁÄ»/Ò³/ÐÐ Ï·­£¬b/u/k: ÉÏ·­£¬q: Í˳ö "
 
 msgid "Question"
 msgstr "ÎÊÌâ"
diff --git a/src/po/zh_CN.po b/src/po/zh_CN.po
index 3ad3d2c..b7637c8 100644
--- a/src/po/zh_CN.po
+++ b/src/po/zh_CN.po
@@ -3662,8 +3662,8 @@ msgstr "%s 
 msgid "-- More --"
 msgstr "-- ¸ü¶à --"
 
-msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
-msgstr " ¿Õ¸ñ/d/j: ÆÁÄ»/Ò³/ÐÐ Ï·­£¬b/u/k: ÉÏ·­£¬q: Í˳ö"
+msgid " f/d/j: screen/page/line down, b/u/k: up, q: quit "
+msgstr " f/d/j: ÆÁÄ»/Ò³/ÐÐ Ï·­£¬b/u/k: ÉÏ·­£¬q: Í˳ö "
 
 msgid "Question"
 msgstr "ÎÊÌâ"