Browse Source

Fixed source_codepage handling in editor (#402).

Signed-off-by: Andrew Borodin <borodin@borodin.zarya>
Andrew Borodin 15 years ago
parent
commit
efbbd3883f
2 changed files with 5 additions and 3 deletions
  1. 3 1
      edit/editcmd.c
  2. 2 2
      edit/editdraw.c

+ 3 - 1
edit/editcmd.c

@@ -2338,7 +2338,9 @@ edit_select_codepage_cmd (WEdit *edit)
     if (do_select_codepage ()) {
 	const char *cp_id;
 
-	cp_id = get_codepage_id (source_codepage);
+	cp_id = get_codepage_id (source_codepage >= 0 ?
+				    source_codepage : display_codepage);
+
 	if (cp_id != NULL)
 	    edit->utf8 = str_isutf8 (cp_id);
     }

+ 2 - 2
edit/editdraw.c

@@ -126,7 +126,7 @@ static void status_string (WEdit * edit, char *s, int w)
                         byte_str,
 
 #ifdef HAVE_CHARSET
-                        get_codepage_id ( source_codepage )
+                        source_codepage >= 0 ? get_codepage_id (source_codepage) : ""
 #else
                         ""
 #endif
@@ -150,7 +150,7 @@ static void status_string (WEdit * edit, char *s, int w)
                         byte_str,
 
 #ifdef HAVE_CHARSET
-                        get_codepage_id ( source_codepage )
+                        source_codepage >= 0 ? get_codepage_id (source_codepage) : ""
 #else
                         ""
 #endif