Mercurial > vim

comparison src/misc1.c @ 20277:8a694c9447d7 v8.2.0694

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.0694: Haiku: channel and terminal do not work Commit: https://github.com/vim/vim/commit/80a8d3889bf1341c47f1c88c59825f183b2b4753 Author: Bram Moolenaar <Bram@vim.org> Date: Sun May 3 22:57:32 2020 +0200 patch 8.2.0694: Haiku: channel and terminal do not work Problem: Haiku: channel and terminal do not work. Solution: Close files when the job has finished. (Ozaki Kiichi, closes #6039)
author Bram Moolenaar <Bram@vim.org>
date Sun, 03 May 2020 23:00:04 +0200
parents aadd1cae2ff5
children d636f5e76347
comparison
equal deleted inserted replaced
20276:36edcb98d341 20277:8a694c9447d7
1664 if (p != NULL && *p == NUL) // empty is the same as not set 1664 if (p != NULL && *p == NUL) // empty is the same as not set
1665 p = NULL; 1665 p = NULL;
1666 1666
1667 if (p != NULL) 1667 if (p != NULL)
1668 return p; 1668 return p;
1669
1670 # ifdef __HAIKU__
1671 // special handling for user settings directory...
1672 if (STRCMP(name, "BE_USER_SETTINGS") == 0)
1673 {
1674 static char userSettingsPath[MAXPATHL];
1675
1676 if (find_directory(B_USER_SETTINGS_DIRECTORY, 0, false,
1677 userSettingsPath, MAXPATHL) == B_OK)
1678 return (char_u *)userSettingsPath;
1679 else
1680 return NULL;
1681 }
1682 # endif
1669 #endif 1683 #endif
1670 1684
1671 // handling $VIMRUNTIME and $VIM is below, bail out if it's another name. 1685 // handling $VIMRUNTIME and $VIM is below, bail out if it's another name.
1672 vimruntime = (STRCMP(name, "VIMRUNTIME") == 0); 1686 vimruntime = (STRCMP(name, "VIMRUNTIME") == 0);
1673 if (!vimruntime && STRCMP(name, "VIM") != 0) 1687 if (!vimruntime && STRCMP(name, "VIM") != 0)
1674 #if defined(__HAIKU__)
1675 // special handling for user settings directory...
1676 if (STRCMP(name, "BE_USER_SETTINGS") == 0)
1677 {
1678 static char userSettingsPath[MAXPATHL] = {0};
1679
1680 if (B_OK == find_directory(B_USER_SETTINGS_DIRECTORY, 0,
1681 false, userSettingsPath, MAXPATHL))
1682 return userSettingsPath;
1683 }
1684 else
1685 #endif
1686 return NULL; 1688 return NULL;
1687 1689
1688 /* 1690 /*
1689 * When expanding $VIMRUNTIME fails, try using $VIM/vim<version> or $VIM. 1691 * When expanding $VIMRUNTIME fails, try using $VIM/vim<version> or $VIM.
1690 * Don't do this when default_vimruntime_dir is non-empty. 1692 * Don't do this when default_vimruntime_dir is non-empty.