To: vim-dev@vim.org
Subject: patch 5.5a.13 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
------------

Patch 5.5a.13
Problem:    OS/2: When $HOME is not defined, "C:/" is used for the viminfo
	    file.  That is very wrong when OS/2 is on another partition.
Solution:   Use $VIM for the viminfo file when it is defined, like for MSDOS.
	    Also: Makefile.os2 didn't depend on os_unix.h.
Files:	    src/os_unix.h, src/Makefile.os2


*** ../vim-5.5a.12/src/os_unix.h	Mon Aug 30 10:40:56 1999
--- src/os_unix.h	Tue Sep  7 21:17:13 1999
***************
*** 219,224 ****
--- 219,227 ----
  # ifndef VIMINFO_FILE
  #  define VIMINFO_FILE	"$HOME/.viminfo"
  # endif
+ # if !defined(VIMINFO_FILE2) && defined(OS2)
+ #  define VIMINFO_FILE2	"$VIM/.viminfo"
+ # endif
  #endif
  
  #ifndef EXRC_FILE
*** ../vim-5.5a.12/src/Makefile.os2	Mon Aug 30 10:40:50 1999
--- src/Makefile.os2	Tue Sep  7 21:23:44 1999
***************
*** 35,41 ****
  
  ###########################################################################
  
! INCL = vim.h globals.h option.h keymap.h macros.h ascii.h term.h os_msdos.h structs.h os_os2_cfg.h
  CFLAGS = -O2 -fno-strength-reduce -DOS2 -Wall -Iproto $(DEFINES)
  
  OBJ = \
--- 35,41 ----
  
  ###########################################################################
  
! INCL = vim.h globals.h option.h keymap.h macros.h ascii.h term.h os_unix.h structs.h os_os2_cfg.h
  CFLAGS = -O2 -fno-strength-reduce -DOS2 -Wall -Iproto $(DEFINES)
  
  OBJ = \
*** ../vim-5.5a.12/src/version.c	Mon Sep  6 20:17:36 1999
--- src/version.c	Tue Sep  7 21:27:11 1999
***************
*** 420,420 ****
--- 420,421 ----
  {   /* Add new patch number below this line */
+     13,

--
Females are strictly forbidden to appear unshaven in public.
		[real standing law in New Mexico, United States of America]

--/-/---- Bram Moolenaar ---- Bram@moolenaar.net ---- Bram@vim.org ---\-\--
  \ \    www.vim.org/iccf      www.moolenaar.net       www.vim.org    / /

.