diff --git a/tcsh-6.19.00-012-display-default-in-editor.patch b/tcsh-6.19.00-012-display-default-in-editor.patch new file mode 100644 index 0000000..5364e7b --- /dev/null +++ b/tcsh-6.19.00-012-display-default-in-editor.patch @@ -0,0 +1,198 @@ +From 3162c42a739fe54e98ebf4a65de6a03026c9082c Mon Sep 17 00:00:00 2001 +From: christos +Date: Thu, 13 Aug 2015 08:54:04 +0000 +Subject: [PATCH] display the default compiled in editor with bindkey -d + (Luke Mewburn) + +--- + Fixes | 1 + + nls/C/set20 | 2 +- + nls/et/set20 | 2 +- + nls/finnish/set20 | 2 +- + nls/french/set20 | 2 +- + nls/german/set20 | 2 +- + nls/greek/set20 | 2 +- + nls/italian/set20 | 2 +- + nls/pl/set20 | 2 +- + nls/russian/set20 | 2 +- + nls/spanish/set20 | 2 +- + nls/ukrainian/set20 | 2 +- + tc.bind.c | 10 ++++++++-- + 13 files changed, 20 insertions(+), 13 deletions(-) + +diff --git a/Fixes b/Fixes +index e58d879..811e67c 100644 +--- a/Fixes ++++ b/Fixes +@@ -1,3 +1,4 @@ ++ 5. display what the compiled in editor is in bindkey -d (Luke Mewburn) + 4. run-fg-editor improvements and documentation (Luke Mewburn) + 3. Fix parsing of 'if (cond)then' (Fridolin Pokorny) + 2. PR/437: Fix handling of invalid unicode characters. +diff --git a/nls/C/set20 b/nls/C/set20 +index 8fd21bf..d3a8bbb 100644 +--- a/nls/C/set20 ++++ b/nls/C/set20 +@@ -19,7 +19,7 @@ $set 20 + 16 -c interpret COMMAND as a builtin or external command\n + 17 -v bind all keys to vi bindings\n + 18 -e bind all keys to emacs bindings\n +-19 -d bind all keys to default editor's bindings\n ++19 -d bind all keys to default editor's bindings (%s)\n + 20 -l list editor commands with descriptions\n + 21 -r remove KEY's binding\n + 22 -k interpret KEY as a symbolic arrow-key name\n +diff --git a/nls/et/set20 b/nls/et/set20 +index 61b21eb..deec04d 100644 +--- a/nls/et/set20 ++++ b/nls/et/set20 +@@ -19,7 +19,7 @@ $set 20 + 16 -c käsitle COMMAND kui sisemist või välist käsku\n + 17 -v seo kõik klahvid vi seostega\n + 18 -e seo kõik klahvid emacsi seostega\n +-19 -d seo kõik klahvid vaikimisi toimeti seostega\n ++19 -d seo kõik klahvid vaikimisi toimeti seostega (%s)\n + 20 -l esita toimeti käsud koos kirjeldustega\n + 21 -r kustuta KLAHVILT seos\n + 22 -k kasuta KLAHVI kui noole-klahvi sümbolnime\n +diff --git a/nls/finnish/set20 b/nls/finnish/set20 +index 2ed75b7..65754de 100644 +--- a/nls/finnish/set20 ++++ b/nls/finnish/set20 +@@ -19,7 +19,7 @@ $set 20 + 16 -c interpret COMMAND as a builtin or external command\n + 17 -v bind all keys to vi bindings\n + 18 -e bind all keys to emacs bindings\n +-19 -d bind all keys to default editor's bindings\n ++19 -d bind all keys to default editor's bindings (%s)\n + 20 -l list editor commands with descriptions\n + 21 -r remove KEY's binding\n + 22 -k interpret KEY as a symbolic arrow-key name\n +diff --git a/nls/french/set20 b/nls/french/set20 +index 51db9e5..5cda5a2 100644 +--- a/nls/french/set20 ++++ b/nls/french/set20 +@@ -19,7 +19,7 @@ $set 20 + 16 -c interprète COMMANDE comme une commande intégrée ou externe\n + 17 -v redéfinit toutes les touches pour vi\n + 18 -e redéfinit toutes les touches pour emacs\n +-19 -d redéfinit toutes les touches pour de l'éditeur par defaut\n ++19 -d redéfinit toutes les touches pour de l'éditeur par defaut (%s)\n + 20 -l liste les commandes de l'éditeur avec descriptions\n + 21 -r enlève la correspondance pour la TOUCHE\n + 22 -k interprète TOUCHE comme un nom de touche de direction symbolique\n +diff --git a/nls/german/set20 b/nls/german/set20 +index b8ed65e..e4f0ec9 100644 +--- a/nls/german/set20 ++++ b/nls/german/set20 +@@ -19,7 +19,7 @@ $set 20 + 16 -c belege einen Unix-Befehl anstelle eines Befehls\n + 17 -v initialisiere Belegungen mit Standard-Vi-Belegungen\n + 18 -e initialisiere Belegungen mit Standard-Emacs-Belegungen\n +-19 -d initialisiere Belegungen mit Standard-Belegungen\n ++19 -d initialisiere Belegungen mit Standard-Belegungen (%s)\n + 20 -l zeige verfügbare Funktionen mit Beschreibungen an\n + 21 -r entferne Belegung eines Tastes\n + 22 -k belege Pfeiltaste mit Namen in In-String\n +diff --git a/nls/greek/set20 b/nls/greek/set20 +index 9408253..647021e 100644 +--- a/nls/greek/set20 ++++ b/nls/greek/set20 +@@ -19,7 +19,7 @@ $set 20 + 16 -c ερμηνεία ΕΝΤΟΛΗς ως εσωτερικής ή εξωτερικής εντολής\n + 17 -v συσχέτιση όλων των πλήκτρων σε αντιστοιχία vi\n + 18 -e συσχέτιση όλων των πλήκτρων σε αντιστοιχία emacs\n +-19 -d συσχέτιση όλων των πλήκτρων στην default του editor\n ++19 -d συσχέτιση όλων των πλήκτρων στην default του editor (%s)\n + 20 -l εμφάνιση των εντολών του editor με περιγραφές\n + 21 -r κατάργηση συσχέτισης του ΠΛΗΚΤΡΟυ\n + 22 -k ερμηνεία ΠΛΗΚΤΡΟυ ως συμβολικό όνομα πλήκτρου βέλους\n +diff --git a/nls/italian/set20 b/nls/italian/set20 +index 452601f..fb317cb 100644 +--- a/nls/italian/set20 ++++ b/nls/italian/set20 +@@ -19,7 +19,7 @@ $set 20 + 16 -c interpreta COMANDO come un comando interno o esterno\n + 17 -v definisce tutti i tasti alla 'vi'\n + 18 -e definisce tutti i tasti alla 'emacs'\n +-19 -d definisce tutti i tasti in base all'editor di default\n ++19 -d definisce tutti i tasti in base all'editor di default (%s)\n + 20 -l elenca i comandi di modifica testo con relativa descrizione\n + 21 -r rimuove la definizione per TASTO\n + 22 -k interpreta TASTO come un nome simbolico di tasto freccia\n +diff --git a/nls/pl/set20 b/nls/pl/set20 +index 370e41a..cf8d0b1 100644 +--- a/nls/pl/set20 ++++ b/nls/pl/set20 +@@ -19,7 +19,7 @@ $set 20 + 16 -c interpret COMMAND as a builtin or external command\n + 17 -v bind all keys to vi bindings\n + 18 -e bind all keys to emacs bindings\n +-19 -d bind all keys to default editor's bindings\n ++19 -d bind all keys to default editor's bindings (%s)\n + 20 -l list editor commands with descriptions\n + 21 -r remove KEY's binding\n + 22 -k interpret KEY as a symbolic arrow-key name\n +diff --git a/nls/russian/set20 b/nls/russian/set20 +index 9a3ccae..beb9ee0 100644 +--- a/nls/russian/set20 ++++ b/nls/russian/set20 +@@ -19,7 +19,7 @@ $set 20 + 16 -c воспринимать КОМАНДу как встроенную или внешнюю команду\n + 17 -v привязать все клавиши в соответствии с редактором vi\n + 18 -e привязать все клавиши в соответствии с редактором emacs\n +-19 -d привязать все клавиши в соответствии с редактором по умолчанию\n ++19 -d привязать все клавиши в соответствии с редактором по умолчанию (%s)\n + 20 -l вывести список команд редактора и их описания\n + 21 -r удалить привязку КЛАВИШи\n + 22 -k воспринимать КЛАВИШу как явное название управляющей клавиши\n +diff --git a/nls/spanish/set20 b/nls/spanish/set20 +index db82eba..0b0170d 100644 +--- a/nls/spanish/set20 ++++ b/nls/spanish/set20 +@@ -19,7 +19,7 @@ $set 20 + 16 -c interpreta COMANDO como comando interno o externo\n + 17 -v usa las definiciones del editor vi\n + 18 -e usa las definiciones del editor vi\n +-19 -d usa las definiciones del editor por defecto\n ++19 -d usa las definiciones del editor por defecto (%s)\n + 20 -l lista los comandos del editor y sus descripciones\n + 21 -r elimina la definición asociada a TECLA\n + 22 -k interpreta TECLA como nombre simbólico de tecla de flecha\n +diff --git a/nls/ukrainian/set20 b/nls/ukrainian/set20 +index 0ab79f8..04ae8de 100644 +--- a/nls/ukrainian/set20 ++++ b/nls/ukrainian/set20 +@@ -19,7 +19,7 @@ $set 20 + 16 -c interpret COMMAND as a builtin or external command\n + 17 -v bind all keys to vi bindings\n + 18 -e bind all keys to emacs bindings\n +-19 -d bind all keys to default editor's bindings\n ++19 -d bind all keys to default editor's bindings (%s)\n + 20 -l list editor commands with descriptions\n + 21 -r remove KEY's binding\n + 22 -k interpret KEY as a symbolic arrow-key name\n +diff --git a/tc.bind.c b/tc.bind.c +index 46d2f17..3b3751a 100644 +--- a/tc.bind.c ++++ b/tc.bind.c +@@ -506,8 +506,14 @@ bindkey_usage(void) + " -v bind all keys to vi bindings\n")); + xprintf("%s", CGETS(20, 18, + " -e bind all keys to emacs bindings\n")); +- xprintf("%s", CGETS(20, 19, +- " -d bind all keys to default editor's bindings\n")); ++ xprintf(CGETS(20, 19, ++ " -d bind all keys to default editor's bindings (%s)\n"), ++#ifdef VIDEFAULT ++ "vi" ++#else /* EMACSDEFAULT */ ++ "emacs" ++#endif /* VIDEFAULT */ ++ ); + xprintf("%s", CGETS(20, 20, + " -l list editor commands with descriptions\n")); + xprintf("%s", CGETS(20, 21, +-- +2.5.5 + diff --git a/tcsh.spec b/tcsh.spec index 38c0d48..0f5f50e 100644 --- a/tcsh.spec +++ b/tcsh.spec @@ -40,6 +40,7 @@ Patch008: tcsh-6.19.00-008-fix-ln-1-completion.patch Patch009: tcsh-6.19.00-009-fix-parsing-of-if-statement.patch Patch010: tcsh-6.19.00-010-fix-editor-and-visual-variables-and-its-behaviour.patch Patch011: tcsh-6.19.00-011-man-page-spelling-fixes.patch +Patch012: tcsh-6.19.00-012-display-default-in-editor.patch # Downstream patches -- these should be always included when doing rebase: @@ -172,6 +173,7 @@ fi tcsh-6.19.00-009-fix-parsing-of-if-statement.patch tcsh-6.19.00-010-fix-editor-and-visual-variables-and-its-behaviour.patch tcsh-6.19.00-011-man-page-spelling-fixes.patch + tcsh-6.19.00-012-display-default-in-editor.patch * Thu Apr 21 2016 David Kaspar [Dee'Kej] - 6.19.00-6 - Drop tcsh-6.15.00-closem.patch - issue not reproducible, patch not accepted by upstream