diff options
| author | Bram Moolenaar <Bram@vim.org> | 2009-07-14 15:38:41 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2009-07-14 15:38:41 +0000 |
| commit | 2572492ebad632ac0162b32961ce049c785cfd8c (patch) | |
| tree | 0e33a83ff82deeea201892835b5be877034d4df4 | |
| parent | 3f947ead6fb56a4ff5101069fb56e70476ca9905 (diff) | |
updated for version 7.2-232v7.2.232
| -rw-r--r-- | src/os_unix.c | 23 | ||||
| -rw-r--r-- | src/os_unix.h | 5 | ||||
| -rw-r--r-- | src/proto/os_unix.pro | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 26 insertions, 5 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index 102b654a7c..3aa397bf63 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -319,6 +319,23 @@ static struct signalinfo {-1, "Unknown!", FALSE} }; + int +mch_chdir(path) + char *path; +{ + if (p_verbose >= 5) + { + verbose_enter(); + smsg((char_u *)"chdir(%s)", path); + verbose_leave(); + } +# ifdef VMS + return chdir(vms_fixfilename(path)); +# else + return chdir(path); +# endif +} + /* * Write s[len] to the screen. */ @@ -2424,6 +2441,12 @@ mch_FullName(fname, buf, len, force) #ifdef HAVE_FCHDIR if (fd >= 0) { + if (p_verbose >= 5) + { + verbose_enter(); + MSG("fchdir() to previous dir"); + verbose_leave(); + } l = fchdir(fd); close(fd); } diff --git a/src/os_unix.h b/src/os_unix.h index 944cc1b838..5fd28af7d0 100644 --- a/src/os_unix.h +++ b/src/os_unix.h @@ -482,11 +482,6 @@ typedef struct dsc$descriptor DESC; # else int mch_rename __ARGS((const char *src, const char *dest)); # endif -# ifdef VMS -# define mch_chdir(s) chdir(vms_fixfilename(s)) -# else -# define mch_chdir(s) chdir(s) -# endif # ifndef VMS # ifdef __MVS__ /* on OS390 Unix getenv() doesn't return a pointer to persistent diff --git a/src/proto/os_unix.pro b/src/proto/os_unix.pro index 36193bb00d..e4cad51de4 100644 --- a/src/proto/os_unix.pro +++ b/src/proto/os_unix.pro @@ -1,4 +1,5 @@ /* os_unix.c */ +int mch_chdir __ARGS((char *path)); void mch_write __ARGS((char_u *s, int len)); int mch_inchar __ARGS((char_u *buf, int maxlen, long wtime, int tb_change_cnt)); int mch_char_avail __ARGS((void)); diff --git a/src/version.c b/src/version.c index b3624ef6b8..6d1b28b417 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 232, +/**/ 231, /**/ 230, |