summaryrefslogtreecommitdiffstats
path: root/debian/patches/58-show-encoding-hardstatus.patch
blob: 54e9fffdbeafac8a0d00780b1b13ff25c721f290 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
Description: show encoding in hardstatus
Author: Yi-Jheng Lin <yzlin@cs.nctu.edu.tw>
Origin: https://svnweb.freebsd.org/ports/head/sysutils/screen/files/opt-showencoding?view=markup
Reviewed-By: rascov <rascov@rascov.tw>
Reviewed-By: Dustin Kirkland <kirkland@ubuntu.com>
Last-Update: Wed Feb 11 05:51:31 CST 2009
Bug-FreeBSD: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=124492
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/screen/+bug/286810
Bug-Debian: https://bugs.debian.org/533498

--- a/screen.c
+++ b/screen.c
@@ -2755,6 +2755,19 @@
       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];
--- a/process.c
+++ b/process.c
@@ -3784,6 +3784,7 @@
 	    {
 	      WinSwitchEncoding(fore, n);
 	      ResetCharsets(fore);
+	      RedisplayDisplays(0);
 	    }
 	  else if (i && display)
 	    D_encoding  = n;