diff options
| author | Jean Delvare <khali@linux-fr.org> | 2006-05-25 07:19:22 +0000 |
|---|---|---|
| committer | Jean Delvare <khali@linux-fr.org> | 2006-05-25 07:19:22 +0000 |
| commit | fb27983ea696a9758e50de0fcefe0e6108bab624 (patch) | |
| tree | 8a39c11f503b13fd36c60442f13a595f80021f2f | |
| parent | 9a8382b0cf89f29c6dafb6dfb81a72c08d3b22ef (diff) | |
| download | quilt-fb27983ea696a9758e50de0fcefe0e6108bab624.tar.gz | |
- quilt/edit.in, quilt/header.in, quilt/mail.in: Run $EDITOR with
LANG=$ORIGINAL_LANG. Fallback to $ORIGINAL_LANG rather than
$LANG for charset detection. Patch from Thomas Petazzoni.
| -rw-r--r-- | quilt.changes | 7 | ||||
| -rw-r--r-- | quilt/edit.in | 2 | ||||
| -rw-r--r-- | quilt/header.in | 2 | ||||
| -rw-r--r-- | quilt/mail.in | 4 |
4 files changed, 11 insertions, 4 deletions
diff --git a/quilt.changes b/quilt.changes index b6d72fa..c4ca730 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu May 25 09:12:08 CEST 2006 - khali@linux-fr.org + +- quilt/edit.in, quilt/header.in, quilt/mail.in: Run $EDITOR with + LANG=$ORIGINAL_LANG. Fallback to $ORIGINAL_LANG rather than + $LANG for charset detection. Patch from Thomas Petazzoni. + +------------------------------------------------------------------- Tue May 23 16:56:02 CEST 2006 - khali@linux-fr.org - quilt/scripts/edmail.in: Declare option parameters as mandatory diff --git a/quilt/edit.in b/quilt/edit.in index cc9af27..b9a84dd 100644 --- a/quilt/edit.in +++ b/quilt/edit.in @@ -65,7 +65,7 @@ if [ $status -ne 0 -a $status -ne 2 ] then exit $status fi -$EDITOR "${@/#/$SUBDIR}" +LANG=$ORIGINAL_LANG $EDITOR "${@/#/$SUBDIR}" status=$? for file in "$@" do diff --git a/quilt/header.in b/quilt/header.in index a7bd4f9..70c48b2 100644 --- a/quilt/header.in +++ b/quilt/header.in @@ -149,7 +149,7 @@ else if [ -n "$opt_edit" ] then - $EDITOR "$tmp" || exit 1 + LANG=$ORIGINAL_LANG $EDITOR "$tmp" || exit 1 fi maybe_strip_diffstat < $tmp \ diff --git a/quilt/mail.in b/quilt/mail.in index 627fead..99cf6e9 100644 --- a/quilt/mail.in +++ b/quilt/mail.in @@ -171,7 +171,7 @@ Could not determine the envelope sender address. Please use --sender." >&2 fi if [ -z "$opt_charset" ]; then - case "${LC_ALL:-$LANG}" in + case "${LC_ALL:-$ORIGINAL_LANG}" in *.UTF-8) opt_charset=UTF-8 ;; @@ -354,7 +354,7 @@ introduction="$(gen_tempfile)" if [ -z "$opt_message" ] then - if ! $EDITOR $introduction; then + if ! LANG=$ORIGINAL_LANG $EDITOR $introduction; then rm -f $introduction exit 1 fi |