← Back to branch summary

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

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

« back to all changes in this revision

Viewing changes to src/misc2.c

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

https://launchpad.net/bugs/296324

* 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

873

873

/* 3. check for available memory: call mch_avail_mem() */

874

874

if (mch_avail_mem(TRUE) < KEEP_ROOM && !releasing)

875

875

{

876

vim_free((char *)p); /* System is low... no go! */

876

free((char *)p); /* System is low... no go! */

877

877

p = NULL;

878

878

}

879

879

else

2561

2561

int key;

2562

2562

int dlen = 0;

2563

2563

2564

key = find_special_key(srcp, &modifiers, keycode);

2564

key = find_special_key(srcp, &modifiers, keycode, FALSE);

2565

2565

if (key == 0)

2566

2566

return 0;

2567

2567

2597

2597

* returns 0 if there is no match.

2598

2598

*/

2599

2599

int

2600

find_special_key(srcp, modp, keycode)

2600

find_special_key(srcp, modp, keycode, keep_x_key)

2601

2601

char_u **srcp;

2602

2602

int *modp;

2603

int keycode; /* prefer key code, e.g. K_DEL instead of DEL */

2603

int keycode; /* prefer key code, e.g. K_DEL instead of DEL */

2604

int keep_x_key; /* don't translate xHome to Home key */

2604

2605

{

2605

2606

char_u *last_dash;

2606

2607

char_u *end_of_name;

2668

2669

else

2669

2670

{

2670

2671

key = get_special_key_code(last_dash + 1);

2671

key = handle_x_keys(key);

2672

if (!keep_x_key)

2673

key = handle_x_keys(key);

2672

2674

}

2673

2675

2674

2676

/*

Older »