← Back to branch summary

~ubuntu-branches/debian/stretch/alpine/stretch

« back to all changes in this revision

Viewing changes to pico/main.c

  • Committer: Bazaar Package Importer
  • Author(s): Asheesh Laroia
  • Date: 2010-10-03 15:31:55 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20101003153155-2exypc96j1e8tw0p
Tags: 2.02-1
* New upstream release, based on re-alpine project
* Updated debian/copyright to reflect this fact
* re-alpine removed the non-free from the tarball, so now
  we do not repack the upstream tarball. (Yay!)

Show diffs side-by-side

added added

removed removed

Lines of Context:
pico/main.c
1
1
#if     !defined(lint) && !defined(DOS)
2
 
static char rcsid[] = "$Id: main.c 1019 2008-04-02 22:09:20Z hubert@u.washington.edu $";
 
2
static char rcsid[] = "$Id: main.c 1184 2008-12-16 23:52:15Z hubert@u.washington.edu $";
3
3
#endif
4
4
 
5
5
/*
160
160
    int      setlocale_collate = 1;
161
161
    char     bname[NBUFN];              /* buffer name of file to read  */
162
162
    char    *file_to_edit = NULL;
163
 
    char    *display_charmap = NULL;
 
163
    char    *display_charmap = NULL, *dc;
164
164
    char    *keyboard_charmap = NULL;
165
165
    int      use_system = 0;
166
166
    char    *err = NULL;
187
187
    if(display_character_set)
188
188
      display_charmap = cpstr(display_character_set);
189
189
#if   HAVE_LANGINFO_H && defined(CODESET)
190
 
    else
191
 
      display_charmap = cpstr(nl_langinfo_codeset_wrapper());
 
190
    else if((dc = nl_langinfo_codeset_wrapper()) != NULL)
 
191
      display_charmap = cpstr(dc);
192
192
#endif
193
193
 
194
194
    if(!display_charmap)