Attachment 126874 Details for Bug 170651 – pr_bin_170651-harder.diff

[patch] pr_bin_170651-harder.diff

pr_bin_170651-harder.diff (text/plain; charset=us-ascii), 1.13 KB, created by Steffen "Daode" Nurpmeso on 2012-08-29 11:24:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steffen "Daode" Nurpmeso

Created: 2012-08-29 11:24:11 UTC

Size: 1.13 KB

patch

obsolete

>diff --git a/bin/sh/histedit.c b/bin/sh/histedit.c
>index 6371599..069ac04 100644
>--- a/bin/sh/histedit.c
>+++ b/bin/sh/histedit.c
>@@ -158,6 +158,16 @@ bad:
> 	}
> }
> 
>+void
>+hist_on_lc_change(void)
>+{
>+	if (iflag && editing) {
>+		if (el)
>+			el_set(el, EL_EDITOR, Vflag ? "vi" : "emacs");
>+		else
>+			histedit();
>+	}
>+}
> 
> void
> sethistsize(const char *hs)
>diff --git a/bin/sh/myhistedit.h b/bin/sh/myhistedit.h
>index e31276d..3193a09 100644
>--- a/bin/sh/myhistedit.h
>+++ b/bin/sh/myhistedit.h
>@@ -37,6 +37,7 @@ extern EditLine *el;
> extern int displayhist;
> 
> void histedit(void);
>+void hist_on_lc_change(void);
> void sethistsize(const char *);
> void setterm(const char *);
> 
>diff --git a/bin/sh/var.c b/bin/sh/var.c
>index 6041459..8f019bf 100644
>--- a/bin/sh/var.c
>+++ b/bin/sh/var.c
>@@ -515,6 +515,7 @@ bltinunsetlocale(void)
> 
> /*
>  * Update the localeisutf8 flag.
>+ * And force reinitialization of libedit's key mappings (PR bin/170651).
>  */
> void
> updatecharset(void)
>@@ -523,6 +524,9 @@ updatecharset(void)
> 
> 	charset = nl_langinfo(CODESET);
> 	localeisutf8 = !strcmp(charset, "UTF-8");
>+#ifndef NO_HISTORY
>+	hist_on_lc_change();
>+#endif
> }
> 
> void

Actions: View | Diff

Attachments on bug 170651: 126872 | 126873 | 126874