diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2012-02-20 02:27:24 +0100 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2012-02-20 02:27:24 +0100 |
| commit | 883192d86cae854d6427266fdf66bf3714675252 (patch) | |
| tree | a1158dbda2ec6d0f8183eed11a22cf7dc3dc3c8f | |
| parent | 2dc004d5904f8f9a406b2a8e8f90c750a678f383 (diff) | |
| download | screen-883192d86cae854d6427266fdf66bf3714675252.tar.gz | |
Import and refresh patch 58-show-encoding-hardstatus from Ubuntu (Closes: #533498)
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/patches/58-show-encoding-hardstatus.patch | 41 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 45 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index dc2d969..1562ab3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,9 @@ screen (4.1.0~20110819git450e8f3-2) UNRELEASED; urgency=low * Changes taken from Ubuntu's screen package: - debian/init: Use find -delete rather than find -print0 | xargs rm to avoid starting two processes. + - debian/patches/58-show-encoding-hardstatus.patch (Closes: #533498; + the remaining part of #533498 has been fixed upstream, see + https://savannah.gnu.org/bugs/index.php?26401) [ Moritz Muehlenhoff ] * Enable hardening build flags (Closes: #656513) diff --git a/debian/patches/58-show-encoding-hardstatus.patch b/debian/patches/58-show-encoding-hardstatus.patch new file mode 100644 index 0000000..9735985 --- /dev/null +++ b/debian/patches/58-show-encoding-hardstatus.patch @@ -0,0 +1,41 @@ +Author: rascov@rascov.tw +Date: Wed Feb 11 05:51:31 CST 2009 +Subject: show encoding in hardstatus, orginal from FreeBSD by yzlin@cs.nctu.edu.tw +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/screen/+bug/286810 +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=533498 + +Index: screen/screen.c +=================================================================== +--- screen.orig/screen.c 2012-02-20 02:15:38.000000000 +0100 ++++ screen/screen.c 2012-02-20 02:15:53.000000000 +0100 +@@ -2801,6 +2801,18 @@ + } + p += strlen(p) - 1; + break; ++ #ifdef ENCODINGS ++ case 'e': ++ *p = 0; ++ D_encoding = nwin_options.encoding > 0 ? nwin_options.encoding : 0; ++ if (win && win->w_encoding) ++ { ++ *p++ = ' '; ++ strcpy(p, EncodingName(win->w_encoding)); ++ } ++ p += strlen(p) - 1; ++ break; ++ #endif + case '{': + { + char rbuf[128]; +Index: screen/process.c +=================================================================== +--- screen.orig/process.c 2012-02-20 02:15:37.000000000 +0100 ++++ screen/process.c 2012-02-20 02:15:53.000000000 +0100 +@@ -3673,6 +3673,7 @@ + { + WinSwitchEncoding(fore, n); + ResetCharsets(fore); ++ RedisplayDisplays(0); + } + else if (i && display) + D_encoding = n; diff --git a/debian/patches/series b/debian/patches/series index c14bed5..83d6414 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -20,5 +20,6 @@ 49long-usernames.patch 50increase-max-TERM-length.patch 51fix-utf8-status-padding-bug.patch +58-show-encoding-hardstatus.patch # 80-99: experimental patches, new features etc. 80EXP_session_creation_time.patch |