~ted/ubuntu/karmic/vim/add-breaks

Committer: Bazaar Package Importer
Author(s): Colin Watson
Date: 2009-01-13 18:39:18 UTC
mfrom: (1.1.7 upstream)
Revision ID: james.westby@ubuntu.com-20090113183918-kgq1jzdwsbbex4pq

Tags: 2:7.2.079-1ubuntu1

* Resynchronise with Debian (diversions fix closes LP: #296324). Remaining
  changes:
  - runtime/syntax/debcontrol.vim:
    + Add "metapackages" to the list of valid sections.
  - runtime/syntax/debchangelog.vim:
    + Add "jaunty" to the list of valid suites.
  - Drop vim-lesstif package and lesstif2-dev build-dependency.
  - Enable Python interpreter on basic builds.
  - Create a .pot file for translations.
  - Disable autoindent, line-wrapping, and backup files by default.
  - runtime/syntax/debsources.vim:
    + Add "jaunty" to debsourcesDistrKeyword
  - runtime/syntax/grub.vim:
    + Add Ubuntu-specific 'quiet' keyword.

files modified:
debian/README

debian/changelog

debian/policy/legal.xml

debian/policy/vim-policy.xml

debian/rules

debian/update-patches

debian/vim-runtime.install.in

debian/vim-runtime.postinst

debian/vim-runtime.preinst.in

debian/vim-variant.postinst

runtime/doc/cmdline.txt

runtime/doc/eval.txt

runtime/doc/netbeans.txt

runtime/doc/options.txt

runtime/doc/spell.txt

runtime/doc/starting.txt

runtime/doc/tags

runtime/doc/usr_21.txt

runtime/ftplugin/gitcommit.vim

runtime/syntax/debchangelog.vim

runtime/syntax/debsources.vim

runtime/syntax/python.vim

runtime/syntax/updatedb.vim

src/auto/configure

src/buffer.c

src/configure.in

src/diff.c

src/eval.c

src/ex_cmds.c

src/ex_cmds.h

src/ex_cmds2.c

src/ex_docmd.c

src/ex_getln.c

src/feature.h

src/fileio.c

src/fold.c

src/getchar.c

src/globals.h

src/gui.c

src/gui_at_sb.c

src/gui_gtk_x11.c

src/gui_mac.c

src/gui_riscos.c

src/gui_w32.c

src/gui_w48.c

src/gui_x11.c

src/gui_xmdlg.c

src/gui_xmebw.c

src/if_perl.xs

src/if_python.c

src/if_sniff.c

src/if_xcmdsrv.c

src/main.c

src/mark.c

src/mbyte.c

src/message.c

src/misc1.c

src/misc2.c

src/move.c

src/netbeans.c

src/normal.c

src/ops.c

src/option.c

src/os_mswin.c

src/os_unix.c

src/os_vms.c

src/os_w32exe.c

src/os_win16.c

src/os_win32.c

src/po/fr.po

src/popupmnu.c

src/proto/buffer.pro

src/proto/eval.pro

src/proto/ex_cmds.pro

src/proto/ex_getln.pro

src/proto/mark.pro

src/proto/misc2.pro

src/proto/netbeans.pro

src/proto/os_mswin.pro

src/quickfix.c

src/spell.c

src/structs.h

src/tag.c

src/testdir/test42.ok

src/ui.c

src/version.c

src/vim.h

src/window.c

src/workshop.c

Show diffs side-by-side

added added

removed removed

src/gui_xmdlg.c

369

char buf[TEMP_BUF_SIZE];

370

XmString items[MAX_ENTRIES_IN_LIST];

371

int i;

372

int index;

372

int idx;

373

374

for (index = (int)ENCODING; index < (int)NONE; ++index)

375

count[index] = 0;

374

for (idx = (int)ENCODING; idx < (int)NONE; ++idx)

375

count[idx] = 0;

376

377

/* First we insert the wild char into every single list. */

378

if (fix != ENCODING)

503

504

* Now loop trough the remaining lists and set them up.

505

506

for (index = (int)NAME; index < (int)NONE; ++index)

506

for (idx = (int)NAME; idx < (int)NONE; ++idx)

507

{

508

Widget w;

509

510

if (fix == (enum ListSpecifier)index)

510

if (fix == (enum ListSpecifier)idx)

511

continue;

512

513

switch ((enum ListSpecifier)index)

513

switch ((enum ListSpecifier)idx)

514

{

515

case NAME:

516

w = data->list[NAME];

525

w = (Widget)0; /* for lint */

526

}

527

528

for (i = 0; i < count[index]; ++i)

528

for (i = 0; i < count[idx]; ++i)

529

{

530

items[i] = XmStringCreateLocalized(list[index][i]);

531

XtFree(list[index][i]);

530

items[i] = XmStringCreateLocalized(list[idx][i]);

531

XtFree(list[idx][i]);

532

}

533

XmListDeleteAllItems(w);

534

XmListAddItems(w, items, count[index], 1);

535

if (data->sel[index])

534

XmListAddItems(w, items, count[idx], 1);

535

if (data->sel[idx])

536

{

537

XmStringFree(items[0]);

538

items[0] = XmStringCreateLocalized(data->sel[index]);

538

items[0] = XmStringCreateLocalized(data->sel[idx]);

539

XmListSelectItem(w, items[0], False);

540

XmListSetBottomItem(w, items[0]);

541

}

542

for (i = 0; i < count[index]; ++i)

542

for (i = 0; i < count[idx]; ++i)

543

XmStringFree(items[i]);

544

}

545

}

695

int n;

696

XmString str;

697

Arg args[4];

698

char *msg = _("no specific match");

698

char *nomatch_msg = _("no specific match");

699

700

n = 0;

701

str = XmStringCreateLocalized(msg);

701

str = XmStringCreateLocalized(nomatch_msg);

702

XtSetArg(args[n], XmNlabelString, str); ++n;

703

XtSetValues(data->sample, args, n);

704

apply_fontlist(data->sample);

705

XmTextSetString(data->name, msg);

705

XmTextSetString(data->name, nomatch_msg);

706

XmStringFree(str);

707

708

return False;

886

{

887

int i;

888

int max;

889

int index = 0;

889

int idx = 0;

890

int size;

891

char str[128];

891

char buf[128];

892

893

for (i = 0, max = 0; i < data->num; i++)

894

{

895

get_part(fn(data, i), 7, str);

896

size = atoi(str);

895

get_part(fn(data, i), 7, buf);

896

size = atoi(buf);

897

if ((size > max) && (size < MAX_DISPLAY_SIZE))

898

{

899

index = i;

899

idx = i;

900

max = size;

901

}

902

}

903

strcpy(big_font, fn(data, index));

903

strcpy(big_font, fn(data, idx));

904

}

905

data->old = XLoadQueryFont(XtDisplay(parent), big_font);

906

data->old_list = gui_motif_create_fontlist(data->old);

1217

1218

if (i != 0)

1219

{

1220

char name[TEMP_BUF_SIZE];

1221

char style[TEMP_BUF_SIZE];

1222

char size[TEMP_BUF_SIZE];

1223

char encoding[TEMP_BUF_SIZE];

1220

char namebuf[TEMP_BUF_SIZE];

1221

char stylebuf[TEMP_BUF_SIZE];

1222

char sizebuf[TEMP_BUF_SIZE];

1223

char encodingbuf[TEMP_BUF_SIZE];

1224

char *found;

1225

1226

found = names[0];

1227

1228

name_part(found, name);

1229

style_part(found, style);

1230

size_part(found, size, data->in_pixels);

1231

encoding_part(found, encoding);

1228

name_part(found, namebuf);

1229

style_part(found, stylebuf);

1230

size_part(found, sizebuf, data->in_pixels);

1231

encoding_part(found, encodingbuf);

1232

1233

if (strlen(name) > 0

1234

&& strlen(style) > 0

1235

&& strlen(size) > 0

1236

&& strlen(encoding) > 0)

1233

if (strlen(namebuf) > 0

1234

&& strlen(stylebuf) > 0

1235

&& strlen(sizebuf) > 0

1236

&& strlen(encodingbuf) > 0)

1237

{

1238

data->sel[NAME] = XtNewString(name);

1239

data->sel[STYLE] = XtNewString(style);

1240

data->sel[SIZE] = XtNewString(size);

1241

data->sel[ENCODING] = XtNewString(encoding);

1238

data->sel[NAME] = XtNewString(namebuf);

1239

data->sel[STYLE] = XtNewString(stylebuf);

1240

data->sel[SIZE] = XtNewString(sizebuf);

1241

data->sel[ENCODING] = XtNewString(encodingbuf);

1242

data->font_name = XtNewString(names[0]);

1243

display_sample(data);

1244

XmTextSetString(data->name, data->font_name);

Older »