[vim] 02/10: Revert "Support sourcing a vimrc.tiny when Vim is invoked as vi"

James McCoy jamessan at debian.org
Mon Aug 8 04:49:32 UTC 2016


This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch debian/sid
in repository vim.

commit ec78b719e8fadafdba35d7163ed8d55fa8a1cc82
Author: James McCoy <jamessan at debian.org>
Date:   Sun Aug 7 15:32:37 2016 -0400

    Revert "Support sourcing a vimrc.tiny when Vim is invoked as vi"
    
    This reverts commit 7f1cac2cae3ed85828289a5273e32f2f6051d439 so that it
    can be managed by gbp-pq instead.
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 src/main.c    | 14 +-------------
 src/os_unix.h |  3 ---
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/main.c b/src/main.c
index fa0bcf2..ee37500 100644
--- a/src/main.c
+++ b/src/main.c
@@ -81,9 +81,6 @@ typedef struct
 #ifdef FEAT_DIFF
     int		diff_mode;		/* start with 'diff' set */
 #endif
-#ifdef SYS_TINYRC_FILE
-    int		vi_mode;		/* started as "vi" */
-#endif
 } mparm_T;
 
 /* Values for edit_type. */
@@ -1683,10 +1680,6 @@ parse_command_name(mparm_T *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)
@@ -3013,12 +3006,7 @@ source_startup_scripts(mparm_T *parmp)
 	 * Get system wide defaults, if the file name is defined.
 	 */
 #ifdef SYS_VIMRC_FILE
-# 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);
+	(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 --git a/src/os_unix.h b/src/os_unix.h
index 075cc96..73881af 100644
--- a/src/os_unix.h
+++ b/src/os_unix.h
@@ -221,9 +221,6 @@ typedef struct dsc$descriptor   DESC;
 /*
  * Unix system-dependent file names
  */
-#ifndef SYS_TINYRC_FILE
-# define SYS_TINYRC_FILE "$VIM/vimrc.tiny"
-#endif
 #ifndef SYS_VIMRC_FILE
 # define SYS_VIMRC_FILE "$VIM/vimrc"
 #endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vim/vim.git



More information about the pkg-vim-maintainers mailing list