Re: "make shadow" forgets to link ../../po/sjiscorr.c from $SHADOWDIR/po; but if I do it manually, it changes runtime/*.desktop preventing further Mercurial pulls
P.S. I tried popping the changes into an mq patch. Strangely enough, AFAICT the changes done by "make" in the desktop files seem to consist in the _removal_ of the German localizations (see attachment). Best regards, Tony. -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout. # HG changeset patch # Parent 676ccae494cefc72467e72b44ca35dc396eec15a files changes by make diff --git a/runtime/gvim.desktop b/runtime/gvim.desktop --- a/runtime/gvim.desktop +++ b/runtime/gvim.desktop @@ -8,34 +8,32 @@ Name=GVim GenericName[de]=Texteditor GenericName=Text Editor # Translators: This is the comment used in the Vim desktop file Comment[de]=Textdateien bearbeiten Comment=Edit text files # The translations should come from the po file. Leave them here for now, they will # be overwritten by the po file when generating the desktop.file! GenericName[da]=Teksteditor -GenericName[de]=Texteditor GenericName[eo]=Tekstoredaktilo GenericName[fr]=Éditeur de texte GenericName[pl]=Edytor tekstu GenericName[is]=Ritvinnsluforrit Comment[af]=Redigeer tekslêers Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ Comment[ar]=حرّر ملفات نصية Comment[az]=Mətn fayllarını redaktə edin Comment[be]=Рэдагаваньне тэкставых файлаў Comment[bg]=Редактиране на текстови файлове Comment[bn]=টেক্স্ট ফাইল এডিট করুন Comment[bs]=Izmijeni tekstualne datoteke Comment[ca]=Edita fitxers de text Comment[cs]=Úprava textových souborů Comment[cy]=Golygu ffeiliau testun Comment[da]=Rediger tekstfiler -Comment[de]=Textdateien bearbeiten Comment[el]=Επεξεργασία αρχείων κειμένου Comment[en_CA]=Edit text files Comment[en_GB]=Edit text files Comment[eo]=Redakti tekstajn dosierojn Comment[es]=Edita archivos de texto Comment[et]=Redigeeri tekstifaile Comment[eu]=Editatu testu-fitxategiak Comment[fa]=ویرایش پروندههای متنی diff --git a/runtime/vim.desktop b/runtime/vim.desktop --- a/runtime/vim.desktop +++ b/runtime/vim.desktop @@ -8,32 +8,30 @@ Name=Vim GenericName[de]=Texteditor GenericName=Text Editor # Translators: This is the comment used in the Vim desktop file Comment[de]=Textdateien bearbeiten Comment=Edit text files # The translations should come from the po file. Leave them here for now, they will # be overwritten by the po file when generating the desktop.file. GenericName[da]=Teksteditor -GenericName[de]=Texteditor GenericName[pl]=Edytor tekstu GenericName[is]=Ritvinnsluforrit Comment[af]=Redigeer tekslêers Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ Comment[ar]=حرّر ملفات نصية Comment[az]=Mətn fayllarını redaktə edin Comment[be]=Рэдагаваньне тэкставых файлаў Comment[bg]=Редактиране на текстови файлове Comment[bn]=টেক্স্ট ফাইল এডিট করুন Comment[bs]=Izmijeni tekstualne datoteke Comment[ca]=Edita fitxers de text Comment[cs]=Úprava textových souborů Comment[cy]=Golygu ffeiliau testun Comment[da]=Rediger tekstfiler -Comment[de]=Textdateien bearbeiten Comment[el]=Επεξεργασία αρχείων κειμένου Comment[en_CA]=Edit text files Comment[en_GB]=Edit text files Comment[es]=Edita archivos de texto Comment[et]=Redigeeri tekstifaile Comment[eu]=Editatu testu-fitxategiak Comment[fa]=ویرایش پروندههای متنی Comment[fi]=Muokkaa tekstitiedostoja
"make shadow" forgets to link ../../po/sjiscorr.c from $SHADOWDIR/po; but if I do it manually, it changes runtime/*.desktop preventing further Mercurial pulls
1. hg --verbose clone https://bitbucket.org/vim-mirror/vim vim-hg
2. cd vim-hg/src
3. make distclean # IMPORTANT! otherwise "make shadow" will run
configure first)
4. SHADOWDIR=shadow-huge make -e shadow
5. cd shadow-huge
6. ln -svf ../Makefile
7. ln -sv ../../../hugecfg myconfig # preset "export" statements for
config arguments
8. set -o verbose; source myconfig; set +o verbose
9. make config
10. make
Step 10 fails (for any Normal or bigger build, but not for Tiny and
Small which have -multi_lang) because step 4 forgot to link
po/sjiscorr.c ("no rule to make sjuscorr.c needed by sjiscorr") --
let's try to do it manually
11. pushd po
12. ln -sv ../../po/sjiscorr.c
13. popd
14. make
Now the make succeeds, but I have another problem: runtime/vim.desktop
and runtime/gvim.desktop have just been modified below my clone, which
means that the next time I try to pull the changes, Mercurial will
refuse to do it, because I have "uncommitted changes".
So what should I do in order not to have to clone everything from
scratch whenever there are changes?
Best regards,
Tony.
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
Patch 8.1.1234
Patch 8.1.1234
Problem:Swap file test fails on MS-Windows.
Solution: Only compare the tail of the file names.
Files: src/testdir/test_swap.vim
*** ../vim-8.1.1233/src/testdir/test_swap.vim 2019-04-28 22:25:03.244480028
+0200
--- src/testdir/test_swap.vim 2019-04-28 23:03:03.737664627 +0200
***
*** 194,200
let s:swapname = ''
split XswapfileText
quit
! call assert_equal(swapfile_name, s:swapname)
" Write the swapfile with a modified PID, now it will be automatically
" deleted. Process one should never be Vim.
--- 194,200
let s:swapname = ''
split XswapfileText
quit
! call assert_equal(fnamemodify(swapfile_name, ':t'), fnamemodify(s:swapname,
':t'))
" Write the swapfile with a modified PID, now it will be automatically
" deleted. Process one should never be Vim.
***
*** 211,217
let s:swapname = ''
split XswapfileText
quit
! call assert_equal(swapfile_name, s:swapname)
call delete('XswapfileText')
call delete(swapfile_name)
--- 211,217
let s:swapname = ''
split XswapfileText
quit
! call assert_equal(fnamemodify(swapfile_name, ':t'), fnamemodify(s:swapname,
':t'))
call delete('XswapfileText')
call delete(swapfile_name)
*** ../vim-8.1.1233/src/version.c 2019-04-28 22:53:37.440370169 +0200
--- src/version.c 2019-04-28 23:05:25.460992485 +0200
***
*** 769,770
--- 769,772
{ /* Add new patch number below this line */
+ /**/
+ 1234,
/**/
--
BLACK KNIGHT: I move for no man.
ARTHUR:So be it!
[hah] [parry thrust]
[ARTHUR chops the BLACK KNIGHT's left arm off]
ARTHUR:Now stand aside, worthy adversary.
BLACK KNIGHT: 'Tis but a scratch.
The Quest for the Holy Grail (Monty Python)
/// Bram Moolenaar -- b...@moolenaar.net -- http://www.Moolenaar.net \\\
///sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org///
\\\help me help AIDS victims -- http://ICCF-Holland.org///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
Patch 8.1.1233
Patch 8.1.1233
Problem:Cannot build tiny version.
Solution: Remove #ifdef for verb_msg().
Files: src/message.c
*** ../vim-8.1.1232/src/message.c 2019-04-28 19:46:17.030060105 +0200
--- src/message.c 2019-04-28 22:52:31.300689582 +0200
***
*** 101,108
return msg_attr_keep(s, 0, FALSE);
}
- #if defined(FEAT_EVAL) || defined(FEAT_X11) || defined(USE_XSMP) \
- || defined(FEAT_GUI_GTK) || defined(PROTO)
/*
* Like msg() but keep it silent when 'verbosefile' is set.
*/
--- 101,106
***
*** 117,123
return n;
}
- #endif
int
msg_attr(char *s, int attr)
--- 115,120
*** ../vim-8.1.1232/src/version.c 2019-04-28 22:50:36.157248454 +0200
--- src/version.c 2019-04-28 22:53:03.628533314 +0200
***
*** 769,770
--- 769,772
{ /* Add new patch number below this line */
+ /**/
+ 1233,
/**/
--
f y cn rd ths thn y cn hv grt jb n cmptr prgrmmng
/// Bram Moolenaar -- b...@moolenaar.net -- http://www.Moolenaar.net \\\
///sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org///
\\\help me help AIDS victims -- http://ICCF-Holland.org///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
Patch 8.1.1232
Patch 8.1.1232
Problem:Can't build on MS-Windows.
Solution: Define process_still_running.
Files: src/memline.c, src/os_win32.c, src/proto/os_win32.pro,
src/os_unix.c, src/proto/os_unix.pro
*** ../vim-8.1.1231/src/memline.c 2019-04-28 22:25:03.240480046 +0200
--- src/memline.c 2019-04-28 22:46:02.502595899 +0200
***
*** 2027,2033
}
#endif
! #if (defined(UNIX) || defined(VMS)) && (defined(FEAT_GUI_DIALOG) ||
defined(FEAT_CON_DIALOG))
static int process_still_running;
#endif
--- 2027,2035
}
#endif
! #if (defined(UNIX) || defined(VMS) || defined(MSWIN)) \
! && (defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG))
! # define HAVE_PROCESS_STILL_RUNNING
static int process_still_running;
#endif
***
*** 2160,2169
msg_puts(_("\nprocess ID: "));
msg_outnum(char_to_long(b0.b0_pid));
#if defined(UNIX) || defined(MSWIN)
! if (mch_process_running((pid_t)char_to_long(b0.b0_pid)))
{
msg_puts(_(" (STILL RUNNING)"));
! # if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)
process_still_running = TRUE;
# endif
}
--- 2162,2171
msg_puts(_("\nprocess ID: "));
msg_outnum(char_to_long(b0.b0_pid));
#if defined(UNIX) || defined(MSWIN)
! if (mch_process_running(char_to_long(b0.b0_pid)))
{
msg_puts(_(" (STILL RUNNING)"));
! # ifdef HAVE_PROCESS_STILL_RUNNING
process_still_running = TRUE;
# endif
}
***
*** 2203,2209
int fd;
struct block0 b0;
int ret = TRUE;
! #ifdef UNIX
long pid;
#endif
--- 2205,2211
int fd;
struct block0 b0;
int ret = TRUE;
! #if defined(UNIX) || defined(MSWIN)
long pid;
#endif
***
*** 2232,2238
#if defined(UNIX) || defined(MSWIN)
// process must known and not be running
pid = char_to_long(b0.b0_pid);
! if (pid == 0L || mch_process_running((pid_t)pid))
ret = FALSE;
#endif
--- 2234,2240
#if defined(UNIX) || defined(MSWIN)
// process must known and not be running
pid = char_to_long(b0.b0_pid);
! if (pid == 0L || mch_process_running(pid))
ret = FALSE;
#endif
***
*** 4825,4831
}
#endif
! #if (defined(UNIX) || defined(VMS)) && (defined(FEAT_GUI_DIALOG) ||
defined(FEAT_CON_DIALOG))
process_still_running = FALSE;
#endif
// It's safe to delete the swap file if all these are true:
--- 4827,4833
}
#endif
! #ifdef HAVE_PROCESS_STILL_RUNNING
process_still_running = FALSE;
#endif
// It's safe to delete the swap file if all these are true:
***
*** 4893,4905
name == NULL
? (char_u *)_("Swap file already
exists!")
: name,
! # if defined(UNIX) || defined(VMS)
process_still_running
? (char_u *)_(" Read-Only\n
anyway\n\n\n") :
# endif
(char_u *)_(" Read-Only\n
anyway\n\n it\n\n"), 1, NULL, FALSE);
! # if defined(UNIX) || defined(VMS)
if (process_still_running && choice >= 4)
choice++; /* Skip missing "Delete it" button */
# endif
--- 4895,4907
name == NULL
? (char_u *)_("Swap file already
exists!")
: name,
! # ifdef HAVE_PROCESS_STILL_RUNNING
process_still_running
? (char_u *)_(" Read-Only\n
anyway\n\n\n") :
# endif
(char_u *)_(" Read-Only\n
anyway\n\n it\n\n"), 1, NULL, FALSE);
! # ifdef HAVE_PROCESS_STILL_RUNNING
if (process_still_running && choice >= 4)
choice++; /* Skip missing "Delete it" button */
# endif
*** ../vim-8.1.1231/src/os_win32.c 2019-04-28 22:25:03.244480028 +0200
--- src/os_win32.c 2019-04-28 22:43:27.379376785 +0200
***
*** 2907,2913
* return TRUE if process "pid" is still running
*/
int
! mch_process_running(pid_t pid)
{
HANDLE hProcess = OpenProcess(PROCESS_QUERY_INFORMATION, 0, (DWORD)pid);
DWORD status = 0;
--- 2907,2913
* return TRUE if process "pid" is still running
*/
int
!
Patch 8.1.1231
Patch 8.1.1231
Problem:Asking about existing swap file unnecessarily.
Solution: When it is safe, delete the swap file. Remove
HAS_SWAP_EXISTS_ACTION, it is always defined. (closes #1237)
Files: src/memline.c, src/globals.h, src/buffer.c, src/ex_cmds.c,
src/fileio.c, src/main.c, src/testdir/test_swap.vim,
runtime/doc/usr_11.txt, src/os_win32.c, src/proto/os_win32.pro,
src/os_unix.c, src/proto/os_unix.pro
*** ../vim-8.1.1230/src/memline.c 2019-04-28 19:46:17.030060105 +0200
--- src/memline.c 2019-04-28 22:22:42.217091959 +0200
***
*** 2159,2167
{
msg_puts(_("\nprocess ID: "));
msg_outnum(char_to_long(b0.b0_pid));
! #if defined(UNIX)
! /* EMX kill() not working correctly, it seems */
! if (kill((pid_t)char_to_long(b0.b0_pid), 0) == 0)
{
msg_puts(_(" (STILL RUNNING)"));
# if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)
--- 2159,2166
{
msg_puts(_("\nprocess ID: "));
msg_outnum(char_to_long(b0.b0_pid));
! #if defined(UNIX) || defined(MSWIN)
! if (mch_process_running((pid_t)char_to_long(b0.b0_pid)))
{
msg_puts(_(" (STILL RUNNING)"));
# if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)
***
*** 2193,2198
--- 2192,2248
return x;
}
+ /*
+ * Return TRUE if the swap file looks OK and there are no changes, thus it can
+ * be safely deleted.
+ */
+ static time_t
+ swapfile_unchanged(char_u *fname)
+ {
+ stat_Tst;
+ int fd;
+ struct block0 b0;
+ int ret = TRUE;
+ #ifdef UNIX
+ long pid;
+ #endif
+
+ // must be able to stat the swap file
+ if (mch_stat((char *)fname, ) == -1)
+ return FALSE;
+
+ // must be able to read the first block
+ fd = mch_open((char *)fname, O_RDONLY | O_EXTRA, 0);
+ if (fd < 0)
+ return FALSE;
+ if (read_eintr(fd, , sizeof(b0)) != sizeof(b0))
+ {
+ close(fd);
+ return FALSE;
+ }
+
+ // the ID and magic number must be correct
+ if (ml_check_b0_id() == FAIL|| b0_magic_wrong())
+ ret = FALSE;
+
+ // must be unchanged
+ if (b0.b0_dirty)
+ ret = FALSE;
+
+ #if defined(UNIX) || defined(MSWIN)
+ // process must known and not be running
+ pid = char_to_long(b0.b0_pid);
+ if (pid == 0L || mch_process_running((pid_t)pid))
+ ret = FALSE;
+ #endif
+
+ // TODO: Should we check if the swap file was created on the current
+ // system? And the current user?
+
+ close(fd);
+ return ret;
+ }
+
static int
recov_file_names(char_u **names, char_u *path, int prepend_dot)
{
***
*** 4757,4765
if (differ == FALSE && !(curbuf->b_flags & BF_RECOVERED)
&& vim_strchr(p_shm, SHM_ATTENTION) == NULL)
{
- #if defined(HAS_SWAP_EXISTS_ACTION)
int choice = 0;
! #endif
#ifdef CREATE_DUMMY_FILE
int did_use_dummy = FALSE;
--- 4807,4814
if (differ == FALSE && !(curbuf->b_flags & BF_RECOVERED)
&& vim_strchr(p_shm, SHM_ATTENTION) == NULL)
{
int choice = 0;
! stat_T st;
#ifdef CREATE_DUMMY_FILE
int did_use_dummy = FALSE;
***
*** 4779,4791
#if (defined(UNIX) || defined(VMS)) && (defined(FEAT_GUI_DIALOG) ||
defined(FEAT_CON_DIALOG))
process_still_running = FALSE;
#endif
#if defined(FEAT_EVAL)
/*
* If there is an SwapExists autocommand and we can handle
* the response, trigger it. It may return 0 to ask the
* user anyway.
*/
! if (swap_exists_action != SEA_NONE
&& has_autocmd(EVENT_SWAPEXISTS, buf_fname, buf))
choice = do_swapexists(buf, fname);
--- 4828,4852
#if (defined(UNIX) || defined(VMS)) && (defined(FEAT_GUI_DIALOG) ||
defined(FEAT_CON_DIALOG))
process_still_running = FALSE;
#endif
+ // It's safe to delete the swap file if all these are true:
+ // - the edited file exists
+ // - the swap file has no changes and looks OK
+ if (mch_stat((char *)buf->b_fname, ) == 0
+ && swapfile_unchanged(fname))
+ {
+ choice = 4;
+ if (p_verbose > 0)
+ verb_msg(_("Found a swap file that is not useful,
Re: Build error on v8.1.1210 : expected ')' before 'compl' token
Le dimanche 28 avril 2019 17:02:09 UTC+2, niva...@gmail.com a écrit : > Hi All, > > Since v8.1.1210, I encounter this error : > > -o gobji686/if_ole.o if_ole.cpp > In file included from proto.h:230:0, > from vim.h:2084, > from if_ole.cpp:22: > proto/usercmd.pro:2:74: error: expected ')' before 'compl' token > char_u *find_ucmd(exarg_T *eap, char_u *p, int *full, expand_T *xp, int > *compl); > > ^ > proto/usercmd.pro:2:74: error: expected initializer before 'compl' token > make: *** [Make_cyg_ming.mak:1061: gobji686/if_ole.o] Error 1 > > Building under Windows 10 from MSYS2 32bits with this command: > make -f Make_ming.mak OLE=yes DEBUG=no GUI=yes XPM=no DIRECTx=yes > DYNAMIC_LUA=yes LUA=./lua-5.4.0/src LUA_VER=54 PYTHON3=/c/ThirdPart/Python37 > DYNAMIC_PYTHON3=yes PYTHON3_VER=37 DYNAMIC_RUBY=no RUBY_VER=26 > RUBY_API_VER_LONG=2.6.0 RUBY=/c/ThirdPart/Ruby26 TERMINAL=yes EVENT_LOOP=yes > > Thank you in advance for help > NiVa -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
Patch 8.1.1230
Patch 8.1.1230
Problem:A lot of code is shared between vim.exe and gvim.exe.
Solution: Optionally put the shared code in vim.dll. (Ken Takata,
closes #4287)
Files: Filelist, nsis/gvim.nsi, runtime/doc/gui_w32.txt,
src/Make_cyg_ming.mak, src/Make_mvc.mak, src/channel.c,
src/evalfunc.c, src/ex_cmds.c, src/ex_docmd.c, src/feature.h,
src/fileio.c, src/getchar.c, src/globals.h, src/gui.c, src/gui.h,
src/gui_gtk_x11.c, src/gui_w32.c, src/if_mzsch.c, src/main.c,
src/mbyte.c, src/memline.c, src/message.c, src/misc2.c,
src/normal.c, src/option.c, src/os_mswin.c, src/os_w32dll.c,
src/os_w32exe.c, src/os_win32.c, src/os_win32.h,
src/proto/gui.pro, src/proto/gui_w32.pro, src/proto/misc2.pro,
src/proto/os_mswin.pro, src/proto/os_win32.pro, src/syntax.c,
src/term.c, src/terminal.c, src/ui.c, src/version.c, src/vim.rc
*** ../vim-8.1.1229/Filelist2019-04-27 13:03:20.000715982 +0200
--- Filelist2019-04-28 18:55:14.804080057 +0200
***
*** 454,459
--- 454,460
src/iscygpty.h \
src/iid_ole.c \
src/os_dos.h \
+ src/os_w32dll.c \
src/os_w32exe.c \
src/os_win32.c \
src/os_mswin.c \
*** ../vim-8.1.1229/nsis/gvim.nsi 2019-04-12 21:29:30.213641315 +0200
--- nsis/gvim.nsi 2019-04-28 18:55:14.804080057 +0200
***
*** 322,327
--- 322,330
SetOutPath $0
File /oname=gvim.exe ${VIMSRC}\gvim_ole.exe
+ !if /FileExists "${VIMSRC}\vim${BIT}.dll"
+ File ${VIMSRC}\vim${BIT}.dll
+ !endif
File /oname=install.exe ${VIMSRC}\installw32.exe
File /oname=uninstal.exe ${VIMSRC}\uninstalw32.exe
File ${VIMSRC}\vimrun.exe
*** ../vim-8.1.1229/runtime/doc/gui_w32.txt 2018-05-17 13:41:40.0
+0200
--- runtime/doc/gui_w32.txt 2019-04-28 19:12:44.911186981 +0200
***
*** 31,36
--- 31,47
return with a command prompt after starting gvim. If not, you should use the
"start" command: >
start gvim [options] file ..
+ < *E988*
+ The console version with the |-g| option may also start the GUI by executing
+ gvim.exe: >
+ vim -g [options] file ..
+ To make this work, gvim.exe must exist in the same directory as the vim.exe,
+ and this feature must be enabled at compile time.
+
+ One may also use `:gui` from the console version. However, this is an
+ experimental feature and this feature must be enabled at compile time.
+ It uses a session file to recreate the current state of the console Vim in the
+ GUI Vim.
Note: All fonts (bold, italic) must be of the same size!!! If you don't do
this, text will disappear or mess up the display. Vim does not check the font
***
*** 442,448
XPM support *w32-xpm-support*
! Gvim can be build on MS-Windows with support for XPM files. |+xpm_w32|
See the Make_mvc.mak file for instructions, search for XPM.
To try out if XPM support works do this: >
--- 453,459
XPM support *w32-xpm-support*
! GVim can be build on MS-Windows with support for XPM files. |+xpm_w32|
See the Make_mvc.mak file for instructions, search for XPM.
To try out if XPM support works do this: >
*** ../vim-8.1.1229/src/Make_cyg_ming.mak 2019-04-27 13:03:20.000715982
+0200
--- src/Make_cyg_ming.mak 2019-04-28 18:55:14.804080057 +0200
***
*** 36,42
DEBUG=no
# set to yes to create a mapfile
! # MAP=yes
# set to SIZE for size, SPEED for speed, MAXSPEED for maximum optimization
OPTIMIZE=MAXSPEED
--- 36,42
DEBUG=no
# set to yes to create a mapfile
! #MAP=yes
# set to SIZE for size, SPEED for speed, MAXSPEED for maximum optimization
OPTIMIZE=MAXSPEED
***
*** 44,49
--- 44,54
# set to yes to make gvim, no for vim
GUI=yes
+ # set to yes to enable the DLL support (EXPERIMENTAL).
+ # Creates vim{32,64}.dll, and stub gvim.exe and vim.exe.
+ # "GUI" should be also set to "yes".
+ #VIMDLL=yes
+
# set to no if you do not want to use DirectWrite (DirectX)
# MinGW-w64 is needed, and ARCH should be set to i686 or x86-64.
DIRECTX=yes
***
*** 687,693
CFLAGS += -O2
endif
endif
! CFLAGS += -s
endif
LIB = -lkernel32 -luser32 -lgdi32 -ladvapi32 -lcomdlg32 -lcomctl32 -lnetapi32
-lversion
--- 692,698
CFLAGS += -O2
endif
endif
! LFLAGS += -s
endif
LIB = -lkernel32 -luser32 -lgdi32 -ladvapi32 -lcomdlg32 -lcomctl32 -lnetapi32
-lversion
***
*** 739,745
$(OUTDIR)/ops.o \
$(OUTDIR)/option.o \
$(OUTDIR)/os_mswin.o \
- $(OUTDIR)/os_w32exe.o \
$(OUTDIR)/os_win32.o \
$(OUTDIR)/pathdef.o \
Re: Patch 8.1.1225
Tony wrote: > On Sun, Apr 28, 2019 at 3:00 PM Bram Moolenaar wrote: > > > > > > Patch 8.1.1225 > > Problem:Cannot create a pty to use with :terminal on FreeBSD. > > Solution: Add support for posix_openpt(). (Ozaki Kiichi, closes #4306, > > closes #4289) > > Files: src/configure.ac, src/config.h.in, src/auto/configure, src/pty.c > > Warning in all builds except Tiny: for example in Small: > > gcc -c -I. -Iproto -DHAVE_CONFIG_H -DFEAT_GUI_MOTIF -O2 > -fno-strength-reduce -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 > -o objects/pty.o pty.c > pty.c: In function ‘mch_openpty’: > pty.c:198:14: warning: implicit declaration of function > ‘posix_openpt’; did you mean ‘mch_openpty’? > [-Wimplicit-function-declaration] > if ((f = posix_openpt(O_RDWR | O_NOCTTY | O_EXTRA)) == -1) > ^~~~ > mch_openpty I guess stdlib.h doesn't always define it. We can add a declaration. -- Q: How many hardware engineers does it take to change a lightbulb? A: None. We'll fix it in software. /// Bram Moolenaar -- b...@moolenaar.net -- http://www.Moolenaar.net \\\ ///sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org/// \\\help me help AIDS victims -- http://ICCF-Holland.org/// -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
Patch 8.1.1229
Patch 8.1.1229
Problem:Warning for posix_openpt() not declared. (Tony Mechelynck)
Solution: Add declaration.
Files: src/pty.c
*** ../vim-8.1.1228/src/pty.c 2019-04-28 14:59:55.845503790 +0200
--- src/pty.c 2019-04-28 17:53:07.209936126 +0200
***
*** 141,146
--- 141,147
char *ptsname(int);
int unlockpt(int);
int grantpt(int);
+ int posix_openpt(int flags);
#endif
static void
*** ../vim-8.1.1228/src/version.c 2019-04-28 18:04:56.062492159 +0200
--- src/version.c 2019-04-28 18:38:57.928152107 +0200
***
*** 769,770
--- 769,772
{ /* Add new patch number below this line */
+ /**/
+ 1229,
/**/
--
ARTHUR: Shut up! Will you shut up!
DENNIS: Ah, now we see the violence inherent in the system.
ARTHUR: Shut up!
DENNIS: Oh! Come and see the violence inherent in the system!
HELP! HELP! I'm being repressed!
The Quest for the Holy Grail (Monty Python)
/// Bram Moolenaar -- b...@moolenaar.net -- http://www.Moolenaar.net \\\
///sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org///
\\\help me help AIDS victims -- http://ICCF-Holland.org///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
Patch 8.1.1228
Patch 8.1.1228
Problem:Not possible to process tags with a function.
Solution: Add tagfunc() (Christian Brabandt, Andy Massimino, closes #4010)
Files: runtime/doc/options.txt, runtime/doc/tagsrch.txt,
runtime/optwin.vim, src/buffer.c, src/dict.c, src/ex_cmds.c,
src/globals.h, src/insexpand.c, src/normal.c, src/option.c,
src/option.h, src/proto/dict.pro, src/structs.h, src/tag.c,
src/testdir/Make_all.mak, src/testdir/test_alot.vim,
src/testdir/test_tagfunc.vim, src/vim.h, src/window.c
*** ../vim-8.1.1227/runtime/doc/options.txt 2019-04-28 16:00:05.367613425
+0200
--- runtime/doc/options.txt 2019-04-28 16:53:38.066933372 +0200
***
*** 7458,7463
--- 7458,7473
NOTE: This option is set to the Vi default value when 'compatible' is
set and to the Vim default value when 'compatible' is reset.
+ *'tagfunc'* *'tfu'*
+ 'tagfunc' 'tfu' string (default: empty)
+ local to buffer
+ {not available when compiled without the |+eval|
+ feature}
+ This option specifies a function to be used to perform tag searches.
+ The function gets the tag pattern and should return a List of matching
+ tags. See |tag-function| for an explanation of how to write the
+ function and an example.
+
*'taglength'* *'tl'*
'taglength' 'tl' number (default 0)
global
*** ../vim-8.1.1227/runtime/doc/tagsrch.txt 2019-03-30 21:19:16.426170240
+0100
--- runtime/doc/tagsrch.txt 2019-04-28 17:43:27.976705157 +0200
***
*** 14,19
--- 14,20
4. Tags details |tag-details|
5. Tags file format |tags-file-format|
6. Include file searches |include-search|
+ 7. Using 'tagfunc'|tag-function|
==
1. Jump to a tag *tag-commands*
***
*** 179,186
1 1 main 1 harddisk2:text/vim/test
2 1 FuncB59 harddisk2:text/vim/src/main.c
! The gettagstack() function returns the tag stack of a specified window. The
! settagstack() function modifies the tag stack of a window.
*E73*
When you try to use the tag stack while it doesn't contain anything you will
--- 180,187
1 1 main 1 harddisk2:text/vim/test
2 1 FuncB59 harddisk2:text/vim/src/main.c
! The |gettagstack()| function returns the tag stack of a specified window. The
! |settagstack()| function modifies the tag stack of a window.
*E73*
When you try to use the tag stack while it doesn't contain anything you will
***
*** 570,576
the bar) and ;" is used to have Vi ignore the rest of the
line. Example:
APP file.c call cursor(3, 4)|;"v
!
{field} ..A list of optional fields. Each field has the form:
{fieldname}:{value}
--- 571,577
the bar) and ;" is used to have Vi ignore the rest of the
line. Example:
APP file.c call cursor(3, 4)|;"v
!
{field} ..A list of optional fields. Each field has the form:
{fieldname}:{value}
***
*** 591,596
--- 592,598
The only other field currently recognized by Vim is "file:"
(with an empty value). It is used for a static tag.
+
The first lines in the tags file can contain lines that start with
!_TAG_
These are sorted to the first lines, only rare tags that start with "!" can
***
*** 870,873
< For a ":djump", ":dsplit", ":dlist" and ":dsearch" command the pattern
is used as a literal string, not as a search pattern.
! vim:tw=78:ts=8:ft=help:norl:
--- 872,941
< For a ":djump", ":dsplit", ":dlist" and ":dsearch" command the pattern
is used as a literal string, not as a search pattern.
! ==
! 7. Using 'tagfunc'*tag-function*
!
! It is possible to provide Vim with a function which will generate a list of
! tags used for commands like |:tag|, |:tselect| and Normal mode tag commands
! like |CTRL-]|.
!
! The function used for generating the taglist is specified by setting the
! 'tagfunc' option. The function will be called with three arguments:
!a:pattern The tag identifier used during the tag search.
!a:flagsList of flags to control the function
Re: Including the VIMDLL patch
Hi, 2019/4/29 Mon 0:11:49 UTC+9 Christian Brabandt wrote: > On So, 28 Apr 2019, Bram Moolenaar wrote: > > > Christian - > > > > Pull request #4287 moves common code from vim.exe and gvim.exe into a > > .dll file. If I include this patch, does this cause problems for the > > appimage stuff? > > I don't think it does, since appimage is for linux only and we shouldn't > be affected. The VIMDLL patch shuold not affect linux builds, and even not affect Windows builds without the VIMDLL=yes option. > Not sure if this will cause problems for the win32-installer, we have to > see. We might need to adjust the installer to include the dll 32bit and > 64bit versions, but I think we will be mostly okay. And I trust Ken to > also have a look at the win32-installer ;) If we build without the VIMDLL=yes option, nothing will be changed. If we are going to use the VIMDLL=yes option, we need to update the nsis script and the vim-win32-installer batch file, but the change for the nsis script is already included in the patch. Regards, Ken Takata -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
Re: Patch 8.1.1225
On Sun, Apr 28, 2019 at 3:00 PM Bram Moolenaar wrote: > > > Patch 8.1.1225 > Problem:Cannot create a pty to use with :terminal on FreeBSD. > Solution: Add support for posix_openpt(). (Ozaki Kiichi, closes #4306, > closes #4289) > Files: src/configure.ac, src/config.h.in, src/auto/configure, src/pty.c Warning in all builds except Tiny: for example in Small: gcc -c -I. -Iproto -DHAVE_CONFIG_H -DFEAT_GUI_MOTIF -O2 -fno-strength-reduce -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 -o objects/pty.o pty.c pty.c: In function ‘mch_openpty’: pty.c:198:14: warning: implicit declaration of function ‘posix_openpt’; did you mean ‘mch_openpty’? [-Wimplicit-function-declaration] if ((f = posix_openpt(O_RDWR | O_NOCTTY | O_EXTRA)) == -1) ^~~~ mch_openpty Best regards, Tony. -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
Re: Including the VIMDLL patch
On So, 28 Apr 2019, Bram Moolenaar wrote: > Christian - > > Pull request #4287 moves common code from vim.exe and gvim.exe into a > .dll file. If I include this patch, does this cause problems for the > appimage stuff? I don't think it does, since appimage is for linux only and we shouldn't be affected. Not sure if this will cause problems for the win32-installer, we have to see. We might need to adjust the installer to include the dll 32bit and 64bit versions, but I think we will be mostly okay. And I trust Ken to also have a look at the win32-installer ;) Best, Christian -- Letzte Worte eines Sportschützen: "So, jetzt noch nachstopfen." -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
Re: [vim/vim] Add support for tab-local directories (#4212)
> temporarily changing directory is used widely in plugins, maybe a function > form is better: > > ``` > function chdir(path, mode = 0) > ``` > > It will change current directory to `path`, and returns the previous path for > success, empty string for failure. When mode is zero (by default), it behaves > like normal `cd` command, otherwise it will take care of window/tab local > directory like `ecd`. > > And life will be much easier with `chdir()`: > > ```VimL > let previous = chdir(somewhere, 1) > ... > chdir(previous) > ``` > > No need for "exe" statement, no need for "fnameescape" too. True. I think we can drop the extra argument and always take care of local directories. Otherwise the existing :cd command can be used. Or we get a discussion that the argument should be "global", "local", "tab" or "auto". I don't think we need that. -- Q: How does a UNIX Guru pick up a girl? A: look; grep; which; eval; nice; uname; talk; date; /// Bram Moolenaar -- b...@moolenaar.net -- http://www.Moolenaar.net \\\ ///sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org/// \\\help me help AIDS victims -- http://ICCF-Holland.org/// -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
Build error on v8.1.1210 : expected ')' before 'compl' token
Hi All, Since v8.1.1210, I encounter this error : -o gobji686/if_ole.o if_ole.cpp In file included from proto.h:230:0, from vim.h:2084, from if_ole.cpp:22: proto/usercmd.pro:2:74: error: expected ')' before 'compl' token char_u *find_ucmd(exarg_T *eap, char_u *p, int *full, expand_T *xp, int *compl); ^ proto/usercmd.pro:2:74: error: expected initializer before 'compl' token make: *** [Make_cyg_ming.mak:1061: gobji686/if_ole.o] Error 1 Building under Windows 10 from MSYS2 32bits with this command: make -f Make_ming.mak OLE=yes DEBUG=no GUI=yes XPM=no DIRECTx=yes DYNAMIC_LUA=yes LUA=./lua-5.4.0/src LUA_VER=54 PYTHON3=/c/ThirdPart/Python37 DYNAMIC_PYTHON3=yes PYTHON3_VER=37 DYNAMIC_RUBY=no RUBY_VER=26 RUBY_API_VER_LONG=2.6.0 RUBY=/c/ThirdPart/Ruby26 TERMINAL=yes EVENT_LOOP=yes Thank you in advance for help NiVa -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
Build error on v8.1.11210 : expected ')' before 'compl' token
Hi all, Since v8.1.1210, I encounter this error : -o gobji686/if_ole.o if_ole.cpp In file included from proto.h:230:0, from vim.h:2084, from if_ole.cpp:22: proto/usercmd.pro:2:74: error: expected ')' before 'compl' token char_u *find_ucmd(exarg_T *eap, char_u *p, int *full, expand_T *xp, int *compl); ^ proto/usercmd.pro:2:74: error: expected initializer before 'compl' token make: *** [Make_cyg_ming.mak:1061: gobji686/if_ole.o] Error 1 Building under Windows 10 from MSYS2 32bits with this command: make -f Make_ming.mak OLE=yes DEBUG=no GUI=yes XPM=no DIRECTx=yes DYNAMIC_LUA=yes LUA=./lua-5.4.0/src LUA_VER=54 PYTHON3=/c/ThirdPart/Python37 DYNAMIC_PYTHON3=yes PYTHON3_VER=37 DYNAMIC_RUBY=no RUBY_VER=26 RUBY_API_VER_LONG=2.6.0 RUBY=/c/ThirdPart/Ruby26 TERMINAL=yes EVENT_LOOP=yes Thank you in advance for help NiVa -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
Including the VIMDLL patch
Christian - Pull request #4287 moves common code from vim.exe and gvim.exe into a .dll file. If I include this patch, does this cause problems for the appimage stuff? -- I'm sure that I asked CBuilder to do a "full" install. Looks like I got a "fool" install, instead. Charles E Campbell, Jr, PhD /// Bram Moolenaar -- b...@moolenaar.net -- http://www.Moolenaar.net \\\ ///sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org/// \\\help me help AIDS victims -- http://ICCF-Holland.org/// -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
Patch 8.1.1227
Patch 8.1.1227
Problem:Duplicate entries in the generate .desktop files. (Ralf Schandl)
Solution: Remove translated entries from the .in files. (closes #4313)
Files: src/po/gvim.desktop.in, src/po/vim.desktop.in
*** ../vim-8.1.1226/src/po/gvim.desktop.in 2019-04-11 13:09:57.786699880
+0200
--- src/po/gvim.desktop.in 2019-04-28 16:05:07.006189049 +0200
***
*** 10,16
# The translations should come from the po file. Leave them here for now,
they will
# be overwritten by the po file when generating the desktop.file!
GenericName[da]=Teksteditor
- GenericName[de]=Texteditor
GenericName[eo]=Tekstoredaktilo
GenericName[fr]=Éditeur de texte
GenericName[pl]=Edytor tekstu
--- 10,15
***
*** 27,33
Comment[cs]=Úprava textových souborů
Comment[cy]=Golygu ffeiliau testun
Comment[da]=Rediger tekstfiler
- Comment[de]=Textdateien bearbeiten
Comment[el]=Επεξεργασία αρχείων κειμένου
Comment[en_CA]=Edit text files
Comment[en_GB]=Edit text files
--- 26,31
*** ../vim-8.1.1226/src/po/vim.desktop.in 2019-04-11 13:09:57.786699880
+0200
--- src/po/vim.desktop.in 2019-04-28 16:05:46.202002282 +0200
***
*** 10,16
# The translations should come from the po file. Leave them here for now,
they will
# be overwritten by the po file when generating the desktop.file.
GenericName[da]=Teksteditor
- GenericName[de]=Texteditor
GenericName[pl]=Edytor tekstu
GenericName[is]=Ritvinnsluforrit
Comment[af]=Redigeer tekslêers
--- 10,15
***
*** 25,31
Comment[cs]=Úprava textových souborů
Comment[cy]=Golygu ffeiliau testun
Comment[da]=Rediger tekstfiler
- Comment[de]=Textdateien bearbeiten
Comment[el]=Επεξεργασία αρχείων κειμένου
Comment[en_CA]=Edit text files
Comment[en_GB]=Edit text files
--- 24,29
*** ../vim-8.1.1226/src/version.c 2019-04-28 16:00:05.367613425 +0200
--- src/version.c 2019-04-28 16:07:36.845473499 +0200
***
*** 769,770
--- 769,772
{ /* Add new patch number below this line */
+ /**/
+ 1227,
/**/
--
DENNIS: Listen -- strange women lying in ponds distributing swords is no
basis for a system of government. Supreme executive power derives
from a mandate from the masses, not from some farcical aquatic
ceremony.
The Quest for the Holy Grail (Monty Python)
/// Bram Moolenaar -- b...@moolenaar.net -- http://www.Moolenaar.net \\\
///sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org///
\\\help me help AIDS victims -- http://ICCF-Holland.org///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
Patch 8.1.1225
Patch 8.1.1225
Problem:Cannot create a pty to use with :terminal on FreeBSD.
Solution: Add support for posix_openpt(). (Ozaki Kiichi, closes #4306,
closes #4289)
Files: src/configure.ac, src/config.h.in, src/auto/configure, src/pty.c
*** ../vim-8.1.1224/src/configure.ac2019-04-11 15:25:36.983065343 +0200
--- src/configure.ac2019-04-28 14:36:00.332840687 +0200
***
*** 3746,3752
getpgid setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
sigprocmask sigvec strcasecmp strerror strftime stricmp strncasecmp \
strnicmp strpbrk strtol tgetent towlower towupper iswupper \
! usleep utime utimes mblen ftruncate unsetenv)
AC_FUNC_SELECT_ARGTYPES
AC_FUNC_FSEEKO
--- 3746,3752
getpgid setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
sigprocmask sigvec strcasecmp strerror strftime stricmp strncasecmp \
strnicmp strpbrk strtol tgetent towlower towupper iswupper \
! usleep utime utimes mblen ftruncate unsetenv posix_openpt)
AC_FUNC_SELECT_ARGTYPES
AC_FUNC_FSEEKO
*** ../vim-8.1.1224/src/config.h.in 2019-02-16 15:09:21.221946179 +0100
--- src/config.h.in 2019-04-28 14:36:00.332840687 +0200
***
*** 180,185
--- 180,186
#undef HAVE_NANOSLEEP
#undef HAVE_NL_LANGINFO_CODESET
#undef HAVE_OPENDIR
+ #undef HAVE_POSIX_OPENPT
#undef HAVE_PUTENV
#undef HAVE_QSORT
#undef HAVE_READLINK
*** ../vim-8.1.1224/src/auto/configure 2019-04-11 15:25:36.983065343 +0200
--- src/auto/configure 2019-04-28 14:42:11.567032096 +0200
***
*** 12658,12664
getpgid setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
sigprocmask sigvec strcasecmp strerror strftime stricmp strncasecmp \
strnicmp strpbrk strtol tgetent towlower towupper iswupper \
! usleep utime utimes mblen ftruncate unsetenv
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
--- 12658,12664
getpgid setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
sigprocmask sigvec strcasecmp strerror strftime stricmp strncasecmp \
strnicmp strpbrk strtol tgetent towlower towupper iswupper \
! usleep utime utimes mblen ftruncate unsetenv posix_openpt
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
*** ../vim-8.1.1224/src/pty.c 2019-01-26 15:12:52.558260916 +0100
--- src/pty.c 2019-04-28 14:42:05.411065909 +0200
***
*** 136,141
--- 136,148
# define O_NOCTTY 0
#endif
+ #if defined(HAVE_SVR4_PTYS) || defined(HAVE_POSIX_OPENPT)
+ // These should be in stdlib.h, but it depends on _XOPEN_SOURCE.
+ char *ptsname(int);
+ int unlockpt(int);
+ int grantpt(int);
+ #endif
+
static void
initmaster(int f UNUSED)
{
***
*** 178,183
--- 185,219
return 0;
}
+ #if defined(HAVE_POSIX_OPENPT) && !defined(PTY_DONE)
+ #define PTY_DONE
+ int
+ mch_openpty(char **ttyn)
+ {
+ int f;
+ char *m;
+ RETSIGTYPE (*sigcld) SIGPROTOARG;
+ static char TtyName[32]; // used for opening a new pty-pair
+
+ if ((f = posix_openpt(O_RDWR | O_NOCTTY | O_EXTRA)) == -1)
+ return -1;
+
+ // SIGCHLD set to SIG_DFL for grantpt() because it fork()s and
+ // exec()s pt_chmod
+ sigcld = signal(SIGCHLD, SIG_DFL);
+ if ((m = ptsname(f)) == NULL || grantpt(f) || unlockpt(f))
+ {
+ signal(SIGCHLD, sigcld);
+ close(f);
+ return -1;
+ }
+ signal(SIGCHLD, sigcld);
+ vim_strncpy((char_u *)TtyName, (char_u *)m, sizeof(TtyName) - 1);
+ initmaster(f);
+ *ttyn = TtyName;
+ return f;
+ }
+ #endif
#if defined(OSX) && !defined(PTY_DONE)
#define PTY_DONE
***
*** 280,288
{
int f;
char *m;
- char *(ptsname(int));
- int unlockpt(int);
- int grantpt(int);
RETSIGTYPE (*sigcld) SIGPROTOARG;
/* used for opening a new pty-pair: */
static char TtyName[32];
--- 316,321
*** ../vim-8.1.1224/src/version.c 2019-04-28 14:02:25.414687593 +0200
--- src/version.c 2019-04-28 14:39:18.375877759 +0200
***
*** 769,770
--- 769,772
{ /* Add new patch number below this line */
+ /**/
+ 1225,
/**/
--
ARTHUR: I am your king!
WOMAN: Well, I didn't vote for you.
ARTHUR: You don't vote for kings.
WOMAN: Well, 'ow did you become king then?
The Quest for the Holy Grail (Monty Python)
/// Bram Moolenaar -- b...@moolenaar.net -- http://www.Moolenaar.net \\\
///sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org///
\\\help me help AIDS victims --
Patch 8.1.1224
Patch 8.1.1224
Problem:MS-Windows: cannot specify font weight.
Solution: Add the "W" option to 'guifont'. (closes #4309) Move GUI font
explanation out of options.txt.
Files: runtime/doc/options.txt, runtime/doc/gui.txt,
runtime/doc/mbyte.txt, src/gui_w32.c, src/os_mswin.c
*** ../vim-8.1.1223/runtime/doc/options.txt 2019-04-27 20:36:52.526303597
+0200
--- runtime/doc/options.txt 2019-04-28 13:54:11.773008464 +0200
***
*** 3705,3795
{not in Vi}
{only available when compiled with GUI enabled}
This is a list of fonts which will be used for the GUI version of Vim.
! In its simplest form the value is just one font name. When
! the font cannot be found you will get an error message. To try other
! font names a list can be specified, font names separated with commas.
! The first valid font is used.
!
! On systems where 'guifontset' is supported (X11) and 'guifontset' is
! not empty, then 'guifont' is not used.
!
! Note: As to the GTK GUIs, no error is given against any invalid names,
! and the first element of the list is always picked up and made use of.
! This is because, instead of identifying a given name with a font, the
! GTK GUIs use it to construct a pattern and try to look up a font which
! best matches the pattern among available fonts, and this way, the
! matching never fails. An invalid name doesn't matter because a number
! of font properties other than name will do to get the matching done.
!
! Spaces after a comma are ignored. To include a comma in a font name
! precede it with a backslash. Setting an option requires an extra
! backslash before a space and a backslash. See also
! |option-backslash|. For example: >
! :set guifont=Screen15,\ 7x13,font\\,with\\,commas
! < will make Vim try to use the font "Screen15" first, and if it fails it
! will try to use "7x13" and then "font,with,commas" instead.
!
! If none of the fonts can be loaded, Vim will keep the current setting.
! If an empty font list is given, Vim will try using other resource
! settings (for X, it will use the Vim.font resource), and finally it
! will try some builtin default which should always be there ("7x13" in
! the case of X). The font names given should be "normal" fonts. Vim
! will try to find the related bold and italic fonts.
!
! For Win32, GTK, Motif, Mac OS and Photon: >
! :set guifont=*
! < will bring up a font requester, where you can pick the font you want.
!
! The font name depends on the GUI used. See |setting-guifont| for a
! way to set 'guifont' for various systems.
!
! For the GTK+ 2 and 3 GUIs, the font name looks like this: >
! :set guifont=Andale\ Mono\ 11
! < That's all. XLFDs are not used. For Chinese this is reported to work
! well: >
! if has("gui_gtk2")
! set guifont=Bitstream\ Vera\ Sans\ Mono\ 12,Fixed\ 12
! set guifontwide=Microsoft\ Yahei\ 12,WenQuanYi\ Zen\ Hei\ 12
! endif
! <
! (Replace gui_gtk2 with gui_gtk3 for the GTK+ 3 GUI)
!
! For Mac OSX you can use something like this: >
! :set guifont=Monaco:h10
! < Also see 'macatsui', it can help fix display problems.
! *E236*
! Note that the fonts must be mono-spaced (all characters have the same
! width). An exception is GTK: all fonts are accepted, but mono-spaced
! fonts look best.
!
! To preview a font on X11, you might be able to use the "xfontsel"
! program. The "xlsfonts" program gives a list of all available fonts.
!
! For the Win32 GUI *E244* *E245*
! - takes these options in the font name:
! hXX - height is XX (points, can be floating-point)
! wXX - width is XX (points, can be floating-point)
! b - bold
! i - italic
! u - underline
! s - strikeout
! cXX - character set XX. Valid charsets are: ANSI, ARABIC,
! BALTIC, CHINESEBIG5, DEFAULT, EASTEUROPE, GB2312, GREEK,
! HANGEUL, HEBREW, JOHAB, MAC, OEM, RUSSIAN, SHIFTJIS,
! SYMBOL, THAI, TURKISH, VIETNAMESE ANSI and BALTIC.
! Normally you would use "cDEFAULT".
! qXX - quality XX. Valid quality names are: PROOF, DRAFT,
! ANTIALIASED, NONANTIALIASED, CLEARTYPE, DEFAULT.
! Normally you would use "qDEFAULT".
! Some quality values are not supported in legacy OSs.
!
! Use a ':' to separate the options.
! - A '_' can be used in the place of a space, so you don't need to
Patch 8.1.1223
Patch 8.1.1223
Problem:Middle mouse click test fails without a clipboard.
Solution: Check if the clipboard can be used. (Dominique Pelle, Christian
Brabandt) Also use WorkingClipboard() instead of checking for the
"clipboard" feature.
Files: src/testdir/test_termcodes.vim, src/testdir/test_quotestar.vim
*** ../vim-8.1.1222/src/testdir/test_termcodes.vim 2019-04-27
19:11:31.346034085 +0200
--- src/testdir/test_termcodes.vim 2019-04-28 12:58:35.216400676 +0200
***
*** 5,10
--- 5,12
finish
endif
+ source shared.vim
+
" Helper function to emit a terminal escape code.
func TerminalEscapeCode(code_xterm, code_sgr, row, col, m)
if ==# 'xterm2'
***
*** 77,82
--- 79,88
endfunc
func Test_xterm_mouse_middle_click()
+ if !WorkingClipboard()
+ throw 'Skipped: No working clipboard'
+ endif
+
new
let save_mouse =
let save_term =
*** ../vim-8.1.1222/src/testdir/test_quotestar.vim 2019-04-20
23:47:42.518391308 +0200
--- src/testdir/test_quotestar.vim 2019-04-28 12:57:47.148658968 +0200
***
*** 1,6
" *-register (quotestar) tests
! if !has('clipboard')
finish
endif
--- 1,7
" *-register (quotestar) tests
! source shared.vim
! if !WorkingClipboard()
finish
endif
*** ../vim-8.1.1222/src/version.c 2019-04-27 22:44:57.226305660 +0200
--- src/version.c 2019-04-28 12:58:55.272292884 +0200
***
*** 769,770
--- 769,772
{ /* Add new patch number below this line */
+ /**/
+ 1223,
/**/
--
There are 2 kinds of people in my world: those who know Unix, Perl, Vim, GNU,
Linux, etc, and those who know COBOL. It gets very difficult for me at
parties, not knowing which group to socialise with :-)
Sitaram Chamarty
/// Bram Moolenaar -- b...@moolenaar.net -- http://www.Moolenaar.net \\\
///sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org///
\\\help me help AIDS victims -- http://ICCF-Holland.org///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
Re: Found errors in Test_xterm_mouse_middle_click()
On So, 28 Apr 2019, Dominique Pellé wrote: > I suppose that Test_xterm_mouse_middle_click() should be skipped > if 'clipboard' feature is not available, since it uses register @*. > > Please check that the attached patch. Alternatively, you might simply source shared.vim and use the WorkingClipboard() function. Just a suggestion. Best, Christian -- Alles in der Welt ist merkwürdig und wunderbar für ein paar wohlgeöffnete Augen. -- José Ortega y Gasset -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
Re: Found errors in Test_xterm_mouse_middle_click()
* Dominique Pellé [2019-04-28 08:20 +0200]: > Elimar Riesebieter wrote: > > > From test_termcodes.vim: > > Found errors in Test_xterm_mouse_middle_click(): > > Caught exception in Test_xterm_mouse_middle_click(): Vim(let):E354: Invalid > > register name: '*' @ function > > RunTheTest[40]..Test_xterm_mouse_middle_click, line 6 > > TEST FAILURE > > > > Elimar > > Can you send the output of command ":version" ? It will show "+clipboard" as that machine has a running X and the gtk3 gui version installed. Anyway the build was initialised within a remote tmux session, though. > I suppose that Test_xterm_mouse_middle_click() should be skipped > if 'clipboard' feature is not available, since it uses register @*. > > Please check that the attached patch. That patch seems to fix the issue. Thanks for cooperation Elimar -- Never make anything simple and efficient when a way can be found to make it complex and wonderful ;-) -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
Re: Found errors in Test_xterm_mouse_middle_click()
Elimar Riesebieter wrote:
> From test_termcodes.vim:
> Found errors in Test_xterm_mouse_middle_click():
> Caught exception in Test_xterm_mouse_middle_click(): Vim(let):E354: Invalid
> register name: '*' @ function RunTheTest[40]..Test_xterm_mouse_middle_click,
> line 6
> TEST FAILURE
>
> Elimar
Can you send the output of command ":version" ?
I suppose that Test_xterm_mouse_middle_click() should be skipped
if 'clipboard' feature is not available, since it uses register @*.
Please check that the attached patch.
Regards
Dominique
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
diff --git a/src/testdir/test_termcodes.vim b/src/testdir/test_termcodes.vim
index af10e1d5c..489c35e1c 100644
--- a/src/testdir/test_termcodes.vim
+++ b/src/testdir/test_termcodes.vim
@@ -77,6 +77,9 @@ func Test_xterm_mouse_left_click()
endfunc
func Test_xterm_mouse_middle_click()
+ if !has('clipboard')
+return
+ endif
new
let save_mouse =
let save_term =
