~ubuntu-branches/ubuntu/maverick/vim/maverick

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/feature.h

767

768

769

* +browse ":browse" command.

770

* or just the ":browse" command modifier

770

771

#if defined(FEAT_NORMAL) && (defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_PHOTON) || defined(FEAT_GUI_MAC))

772

# define FEAT_BROWSE

772

#if defined(FEAT_NORMAL)

773

# define FEAT_BROWSE_CMD

774

# if defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_PHOTON) || defined(FEAT_GUI_MAC)

775

# define FEAT_BROWSE

776

# endif

773

777

#endif

774

778

775

779

Older »