Ticket #1838: 0002-REBASE-CLEANUP-for-merge-with-5307c0bbda0a70b66ccb.patch

File 0002-REBASE-CLEANUP-for-merge-with-5307c0bbda0a70b66ccb.patch, 1.2 KB (added by slavazanko, 14 years ago)

Please, use one-style source coding

  • src/setup.c 

    From 297543c9e988cdd9820355ca9820f738e0d2465e Mon Sep 17 00:00:00 2001
From: Slava Zanko <slavazanko@gmail.com>
Date: Fri, 27 Nov 2009 12:59:30 +0200
Subject: [PATCH] REBASE: CLEANUP: for merge with 5307c0bbda0a70b66ccbaaedb7f87796b3297b33

run command:

git rebase -i 5307c0bbda0a70b66ccbaaedb7f87796b3297b33

and split this commit with 5307c0bbda

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
---
 src/setup.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/setup.c b/src/setup.c
index fac3216..f61fc62 100644
    a b load_setup (void) 
    819819            cp_source = get_codepage_id (source_codepage); 
    820820        } 
    821821        g_free(buffer); 
    822    } 
    823    
     822    } 
     823 
    824824  autodetect_codeset = mc_config_get_string(mc_main_config, "Misc", "autodetect_codeset", ""); 
    825825        if ( autodetect_codeset[0] != '\0' ) 
    826826        { 
    … … load_setup (void) 
    828828            cp_source = get_codepage_id (source_codepage); 
    829829        } 
    830830        //g_free(autodetect_codeset); // FIXME NEED FREE 
    831    
     831 
    832832    init_translation_table( source_codepage, display_codepage ); 
    833833    if ( get_codepage_id( display_codepage ) ) 
    834834        utf8_display = str_isutf8 (get_codepage_id( display_codepage ));