[SCM] Vim packaging branch, master-experimental, updated. debian/7.2b.001-1
James Vega
jamessan at debian.org
Mon Jul 14 16:28:50 UTC 2008
The following commit has been merged in the master-experimental branch:
commit f078ce7f08d72541c1a090eaf11207c46f347637
Merge: 517909def9752227d36c54fc6f3f630d5d5c4a0b 99501382881773ec5fc0f89173469344c841a5b1
Author: James Vega <jamessan at debian.org>
Date: Mon Jul 14 01:37:24 2008 -0400
Merge branch 'deb/runtime' into master-experimental
diff --combined src/Makefile
index fb8c3f3,69f091b..2c5c06a
--- a/src/Makefile
+++ b/src/Makefile
@@@ -310,6 -310,8 +310,8 @@@ CClink = $(CC
#CONF_ARGS = --exec-prefix=/usr
#CONF_ARGS = --with-vim-name=vim7 --with-ex-name=ex7 --with-view-name=view7
#CONF_ARGS = --with-global-runtime=/etc/vim
+ #CONF_ARGS = --with-local-dir=/usr/share
+ #CONF_ARGS = --without-local-dir
# Use this one if you distribute a modified version of Vim.
#CONF_ARGS = --with-modified-by="John Doe"
@@@ -899,7 -901,7 +901,7 @@@ MAN1DIR = /man
### Vim version (adjusted by a script)
VIMMAJOR = 7
- VIMMINOR = 2a
+ VIMMINOR = 2b
### Location of Vim files (should not need to be changed, and {{{1
### some things might not work when they are changed!)
@@@ -1742,7 -1744,7 +1744,7 @@@ test check
-if test -n "$(MAKEMO)" -a -f $(PODIR)/Makefile; then \
cd $(PODIR); $(MAKE) -f Makefile check VIM=../$(VIMTARGET); \
fi
- -if test $(VIMTARGET) != vim -a ! -e vim; then \
+ -if test $(VIMTARGET) != vim -a ! -r vim; then \
ln -s $(VIMTARGET) vim; \
fi
cd testdir; $(MAKE) -f Makefile $(GUI_TESTTARGET) VIMPROG=../$(VIMTARGET) $(GUI_TESTARG)
@@@ -1777,6 -1779,7 +1779,6 @@@ installvimbin: $(VIMTARGET) $(DESTDIR)$
rm -f $(DEST_BIN)/$(VIMNAME).rm; \
fi
$(INSTALL_PROG) $(VIMTARGET) $(DEST_BIN)
- $(STRIP) $(DEST_BIN)/$(VIMTARGET)
chmod $(BINMOD) $(DEST_BIN)/$(VIMTARGET)
# may create a link to the new executable from /usr/bin/vi
-$(LINKIT)
@@@ -1911,6 -1914,7 +1913,6 @@@ installtools: $(TOOLS) $(DESTDIR)$(exec
rm -f $(DEST_BIN)/xxd.rm; \
fi
$(INSTALL_PROG) xxd/xxd$(EXEEXT) $(DEST_BIN)
- $(STRIP) $(DEST_BIN)/xxd$(EXEEXT)
chmod $(BINMOD) $(DEST_BIN)/xxd$(EXEEXT)
-$(SHELL) ./installman.sh xxd $(DEST_MAN) "" $(INSTALLMANARGS)
diff --combined src/main.c
index 3de49db,587081b..3070ac7
--- a/src/main.c
+++ b/src/main.c
@@@ -7,7 -7,7 +7,7 @@@
* See README.txt for an overview of the Vim source code.
*/
- #if defined(MSDOS) || defined(WIN32) || defined(_WIN64)
+ #if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
# include "vimio.h" /* for close() and dup() */
#endif
@@@ -35,9 -35,6 +35,9 @@@
#define WIN_VER 2 /* "-O" vertically split windows */
#define WIN_TABS 3 /* "-p" windows on tab pages */
+#define SET_CP 1 /* "-C" set compatible */
+#define SET_NOCP 2 /* "-N" set nocompatible */
+
/* Struct for various parameters passed between main() and other functions. */
typedef struct
{
@@@ -90,10 -87,6 +90,10 @@@
#ifdef FEAT_DIFF
int diff_mode; /* start with 'diff' set */
#endif
+ int option_cp; /* 0, SET_CP, SET_NOCP */
+#ifdef SYS_TINYRC_FILE
+ int vi_mode; /* started as "vi" */
+#endif
} mparm_T;
/* Values for edit_type. */
@@@ -646,13 -639,6 +646,13 @@@ mai
}
#endif
+ /* -N/-C given on the command-line. Now that the startup files are done
+ * being sourced, we set the option. */
+ if (params.option_cp == SET_CP)
+ change_compatible(TRUE);
+ else if (params.option_cp == SET_NOCP)
+ change_compatible(FALSE);
+
#ifdef SPAWNO /* special MSDOS swapping library */
init_SPAWNO("", SWAP_ANY);
#endif
@@@ -1488,10 -1474,6 +1488,10 @@@ parse_command_name(parmp
}
else if (STRNICMP(initstr, "vim", 3) == 0)
initstr += 3;
+#ifdef SYS_TINYRC_FILE
+ else if (STRNICMP(initstr, "vi", 2) == 0)
+ parmp->vi_mode = TRUE;
+#endif
/* Catch "[r][g]vimdiff" and "[r][g]viewdiff". */
if (STRICMP(initstr, "diff") == 0)
@@@ -1773,7 -1755,7 +1773,7 @@@ command_line_scan(parmp
break;
case 'C': /* "-C" Compatible */
- change_compatible(TRUE);
+ parmp->option_cp = SET_CP;
break;
case 'e': /* "-e" Ex mode */
@@@ -1846,7 -1828,7 +1846,7 @@@
break;
case 'N': /* "-N" Nocompatible */
- change_compatible(FALSE);
+ parmp->option_cp = SET_NOCP;
break;
case 'n': /* "-n" no swap file */
@@@ -2765,12 -2747,7 +2765,12 @@@ source_startup_scripts(parmp
* Get system wide defaults, if the file name is defined.
*/
#ifdef SYS_VIMRC_FILE
- (void)do_source((char_u *)SYS_VIMRC_FILE, FALSE, DOSO_NONE);
+# if defined(SYS_TINYRC_FILE) && defined(TINY_VIMRC)
+ if (parmp->vi_mode)
+ (void)do_source((char_u *)SYS_TINYRC_FILE, FALSE, DOSO_NONE);
+ else
+# endif
+ (void)do_source((char_u *)SYS_VIMRC_FILE, FALSE, DOSO_NONE);
#endif
#ifdef MACOS_X
(void)do_source((char_u *)"$VIMRUNTIME/macmap.vim", FALSE, DOSO_NONE);
diff --combined src/po/zh_TW.UTF-8.po
index 24dc604,a046816..ff150b1
--- a/src/po/zh_TW.UTF-8.po
+++ b/src/po/zh_TW.UTF-8.po
@@@ -7,6 -7,8 +7,6 @@@
# FIRST RELEASE Thu Jun 14 14:24:17 CST 2001
# MAINTAINER: Debian VIM Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>
#
-# Last update: $LastChangedDate: 2006-04-16 22:06:40 -0400 (dom, 16 apr 2006) $
-#
# XXX This file is in need of a new maintainer, Debian VIM Maintainers maintain
# it only because patches have been submitted for it by Debian users and the
# former maintainer was MIA (Missing In Action), taking over its
@@@ -1372,7 -1374,7 +1372,7 @@@ msgstr "E203: Autocommand 刪除或釋æ
msgid "E204: Autocommand changed number of lines in unexpected way"
msgstr "E204: Autocommand æ„外地改變了行號"
- msgid "NetBeans dissallows writes of unmodified buffers"
+ msgid "NetBeans disallows writes of unmodified buffers"
msgstr "NetBeans ä¸èƒ½å¯«å‡ºæœªä¿®æ”¹çš„ç·©è¡å€"
msgid "Partial writes disallowed for NetBeans buffers"
@@@ -4526,14 -4528,14 +4526,14 @@@ msgstr "E440: 找ä¸åˆ°è¦ undo çš„è¡Œ
#. Only MS VC 4.1 and earlier can do Win32s
msgid ""
"\n"
- "MS-Windows 16/32 bit GUI version"
+ "MS-Windows 16/32-bit GUI version"
msgstr ""
"\n"
"MS-Windows 16/32 Bit 圖型界é¢ç‰ˆæœ¬"
msgid ""
"\n"
- "MS-Windows 32 bit GUI version"
+ "MS-Windows 32-bit GUI version"
msgstr ""
"\n"
"MS-Windows 32 Bit 圖型界é¢ç‰ˆæœ¬"
@@@ -4546,28 -4548,28 +4546,28 @@@ msgstr "æ”¯æ´ OLE
msgid ""
"\n"
- "MS-Windows 32 bit console version"
+ "MS-Windows 32-bit console version"
msgstr ""
"\n"
"MS-Windows 32 Bit console 版本"
msgid ""
"\n"
- "MS-Windows 16 bit version"
+ "MS-Windows 16-bit version"
msgstr ""
"\n"
"MS-Windows 32 Bit console 版本"
msgid ""
"\n"
- "32 bit MS-DOS version"
+ "32-bit MS-DOS version"
msgstr ""
"\n"
"32 Bit MS-DOS 版本"
msgid ""
"\n"
- "16 bit MS-DOS version"
+ "16-bit MS-DOS version"
msgstr ""
"\n"
"16 Bit MS-DOS 版本"
--
Vim packaging
More information about the pkg-vim-maintainers
mailing list