From: Michael Prokop <mika@grml.org>
Date: Mon, 18 Dec 2006 00:35:00 +0000 (+0100)
Subject: zsh-login: run unicode_start if running inside utf environment
X-Git-Tag: 0.9.10
X-Git-Url: http://git.grml.org/?p=grml-scripts.git;a=commitdiff_plain;h=e0999fecdb06e51a86f6078435efbd0fdc8cd6a5

zsh-login: run unicode_start if running inside utf environment
---

diff --git a/debian/changelog b/debian/changelog
index cf9798a..d86969f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+grml-scripts (0.9.10) unstable; urgency=low
+
+  * grml-slrn: do not activate 'set charset isolatin' and
+    'set mime_charset "iso-8859-15"' by default so slrn works in
+    UTF-8 mode as well.
+  * zsh-login: run unicode_start if running inside utf environment
+
+ -- Michael Prokop <mika@grml.org>  Mon, 18 Dec 2006 00:31:57 +0100
+
 grml-scripts (0.9.9) unstable; urgency=low
 
   * grml-hostname: do not execute 'hostname $NEWHOSTNAME', the
diff --git a/usr_bin/grml-slrn b/usr_bin/grml-slrn
index a59e3b3..8ba20f5 100755
--- a/usr_bin/grml-slrn
+++ b/usr_bin/grml-slrn
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Sun Jan 15 22:46:00 CET 2006 [mika]
+# Latest change: Mon Dez 18 00:31:53 CET 2006 [mika]
 ################################################################################
 
 PATH=${PATH:-'/bin/:/sbin/:/usr/local/bin:/usr/bin:/usr/sbin'}
@@ -111,9 +111,9 @@ cat > $SLRNRC << EOF
 
   set spoiler_display_mode 1
 
-  set charset isolatin
   set use_mime 1
-  set mime_charset "iso-8859-15"
+%  set charset isolatin
+%  set mime_charset "iso-8859-15"
 
   set sorting_method 5
   set check_new_groups 1         % let slrn check for new newsgroups
diff --git a/usr_bin/zsh-login b/usr_bin/zsh-login
index c9d4e2e..69688f1 100755
--- a/usr_bin/zsh-login
+++ b/usr_bin/zsh-login
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Son Mai 28 14:20:08 CEST 2006 [mika]
+# Latest change: Mon Dez 18 01:34:26 CET 2006 [mika]
 ################################################################################
 
 [ -r /etc/grml_version ] && GRMLVERSION=$(cat /etc/grml_version) || GRMLVERSION='(no version information available)'
@@ -32,6 +32,11 @@ if [ -x /usr/bin/flite ] ; then
  esac
 fi
 
+# activate unicode console if running within utf8 environment
+if [ -r /etc/default/locale ] ; then
+   grep -q "LANG=.*UTF" /etc/default/locale && unicode_start
+fi
+
 exec /bin/zsh -l
 
 ## END OF FILE #################################################################