Mercurial > vim
comparison src/Makefile @ 17536:e00d12c085a5 v8.1.1766
patch 8.1.1766: code for writing session file is spread out
commit https://github.com/vim/vim/commit/845380791196aec7f991987ebf7b22de3779d106
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jul 28 14:15:42 2019 +0200
patch 8.1.1766: code for writing session file is spread out
Problem: Code for writing session file is spread out.
Solution: Put it in one file. (Yegappan Lakshmanan, closes https://github.com/vim/vim/issues/4728)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sun, 28 Jul 2019 14:30:07 +0200 |
parents | cfdef48743ed |
children | c1629b49142c |
comparison
equal
deleted
inserted
replaced
17535:3015901aaaa6 | 17536:e00d12c085a5 |
---|---|
403 # First one is for static linking, second one for dynamic loading. | 403 # First one is for static linking, second one for dynamic loading. |
404 # Use --with-luajit if you want to use LuaJIT instead of Lua. | 404 # Use --with-luajit if you want to use LuaJIT instead of Lua. |
405 # Set PATH environment variable to find lua or luajit executable. | 405 # Set PATH environment variable to find lua or luajit executable. |
406 # This requires at least "normal" features, "tiny" and "small" don't work. | 406 # This requires at least "normal" features, "tiny" and "small" don't work. |
407 #CONF_OPT_LUA = --enable-luainterp | 407 #CONF_OPT_LUA = --enable-luainterp |
408 #CONF_OPT_LUA = --enable-luainterp=dynamic | 408 CONF_OPT_LUA = --enable-luainterp=dynamic |
409 #CONF_OPT_LUA = --enable-luainterp --with-luajit | 409 #CONF_OPT_LUA = --enable-luainterp --with-luajit |
410 #CONF_OPT_LUA = --enable-luainterp=dynamic --with-luajit | 410 #CONF_OPT_LUA = --enable-luainterp=dynamic --with-luajit |
411 # Lua installation dir (when not set uses $LUA_PREFIX or defaults to /usr) | 411 # Lua installation dir (when not set uses $LUA_PREFIX or defaults to /usr) |
412 #CONF_OPT_LUA_PREFIX = --with-lua-prefix=/usr/local | 412 #CONF_OPT_LUA_PREFIX = --with-lua-prefix=/usr/local |
413 | 413 |
429 # auto/config.mk where they come from. If it's PERL_CFLAGS, try commenting | 429 # auto/config.mk where they come from. If it's PERL_CFLAGS, try commenting |
430 # the next line. | 430 # the next line. |
431 # When you get an error for a missing "perl.exp" file, try creating an empty | 431 # When you get an error for a missing "perl.exp" file, try creating an empty |
432 # one: "touch perl.exp". | 432 # one: "touch perl.exp". |
433 # This requires at least "normal" features, "tiny" and "small" don't work. | 433 # This requires at least "normal" features, "tiny" and "small" don't work. |
434 #CONF_OPT_PERL = --enable-perlinterp | 434 CONF_OPT_PERL = --enable-perlinterp |
435 #CONF_OPT_PERL = --enable-perlinterp=dynamic | 435 #CONF_OPT_PERL = --enable-perlinterp=dynamic |
436 | 436 |
437 # PYTHON | 437 # PYTHON |
438 # Uncomment lines here when you want to include the Python interface. | 438 # Uncomment lines here when you want to include the Python interface. |
439 # This requires at least "normal" features, "tiny" and "small" don't work. | 439 # This requires at least "normal" features, "tiny" and "small" don't work. |
443 # ln -s python3 python3.1 | 443 # ln -s python3 python3.1 |
444 # If both python2.x and python3.x are enabled then the linking will be via | 444 # If both python2.x and python3.x are enabled then the linking will be via |
445 # dlopen(), dlsym(), dlclose(), i.e. pythonX.Y.so must be available | 445 # dlopen(), dlsym(), dlclose(), i.e. pythonX.Y.so must be available |
446 # However, this may still cause problems, such as "import termios" failing. | 446 # However, this may still cause problems, such as "import termios" failing. |
447 # Build two separate versions of Vim in that case. | 447 # Build two separate versions of Vim in that case. |
448 #CONF_OPT_PYTHON = --enable-pythoninterp | 448 CONF_OPT_PYTHON = --enable-pythoninterp |
449 #CONF_OPT_PYTHON = --enable-pythoninterp --with-python-command=python2.7 | 449 #CONF_OPT_PYTHON = --enable-pythoninterp --with-python-command=python2.7 |
450 #CONF_OPT_PYTHON = --enable-pythoninterp=dynamic | 450 #CONF_OPT_PYTHON = --enable-pythoninterp=dynamic |
451 #CONF_OPT_PYTHON3 = --enable-python3interp | 451 CONF_OPT_PYTHON3 = --enable-python3interp |
452 #CONF_OPT_PYTHON3 = --enable-python3interp --with-python3-command=python3.6 | 452 #CONF_OPT_PYTHON3 = --enable-python3interp --with-python3-command=python3.6 |
453 #CONF_OPT_PYTHON3 = --enable-python3interp=dynamic | 453 #CONF_OPT_PYTHON3 = --enable-python3interp=dynamic |
454 | 454 |
455 # RUBY | 455 # RUBY |
456 # Uncomment this when you want to include the Ruby interface. | 456 # Uncomment this when you want to include the Ruby interface. |
457 # First one for static linking, second one for loading when used. | 457 # First one for static linking, second one for loading when used. |
458 # Note: you need the development package (e.g., ruby1.9.1-dev on Ubuntu). | 458 # Note: you need the development package (e.g., ruby1.9.1-dev on Ubuntu). |
459 # This requires at least "normal" features, "tiny" and "small" don't work. | 459 # This requires at least "normal" features, "tiny" and "small" don't work. |
460 #CONF_OPT_RUBY = --enable-rubyinterp | 460 #CONF_OPT_RUBY = --enable-rubyinterp |
461 #CONF_OPT_RUBY = --enable-rubyinterp=dynamic | 461 CONF_OPT_RUBY = --enable-rubyinterp=dynamic |
462 #CONF_OPT_RUBY = --enable-rubyinterp --with-ruby-command=ruby1.9.1 | 462 #CONF_OPT_RUBY = --enable-rubyinterp --with-ruby-command=ruby1.9.1 |
463 | 463 |
464 # TCL | 464 # TCL |
465 # Uncomment this when you want to include the Tcl interface. | 465 # Uncomment this when you want to include the Tcl interface. |
466 # First one is for static linking, second one for dynamic loading. | 466 # First one is for static linking, second one for dynamic loading. |
467 #CONF_OPT_TCL = --enable-tclinterp | 467 #CONF_OPT_TCL = --enable-tclinterp |
468 #CONF_OPT_TCL = --enable-tclinterp=dynamic | 468 CONF_OPT_TCL = --enable-tclinterp=dynamic |
469 #CONF_OPT_TCL = --enable-tclinterp --with-tclsh=tclsh8.4 | 469 #CONF_OPT_TCL = --enable-tclinterp --with-tclsh=tclsh8.4 |
470 | 470 |
471 # CSCOPE | 471 # CSCOPE |
472 # Uncomment this when you want to include the Cscope interface. | 472 # Uncomment this when you want to include the Cscope interface. |
473 #CONF_OPT_CSCOPE = --enable-cscope | 473 #CONF_OPT_CSCOPE = --enable-cscope |
539 # The default is "huge" for most systems. | 539 # The default is "huge" for most systems. |
540 #CONF_OPT_FEAT = --with-features=tiny | 540 #CONF_OPT_FEAT = --with-features=tiny |
541 #CONF_OPT_FEAT = --with-features=small | 541 #CONF_OPT_FEAT = --with-features=small |
542 #CONF_OPT_FEAT = --with-features=normal | 542 #CONF_OPT_FEAT = --with-features=normal |
543 #CONF_OPT_FEAT = --with-features=big | 543 #CONF_OPT_FEAT = --with-features=big |
544 #CONF_OPT_FEAT = --with-features=huge | 544 CONF_OPT_FEAT = --with-features=huge |
545 | 545 |
546 # COMPILED BY - For including a specific e-mail address for ":version". | 546 # COMPILED BY - For including a specific e-mail address for ":version". |
547 #CONF_OPT_COMPBY = "--with-compiledby=John Doe <JohnDoe@yahoo.com>" | 547 #CONF_OPT_COMPBY = "--with-compiledby=John Doe <JohnDoe@yahoo.com>" |
548 | 548 |
549 # X WINDOWS DISABLE - For creating a plain Vim without any X11 related fancies | 549 # X WINDOWS DISABLE - For creating a plain Vim without any X11 related fancies |
613 #CFLAGS = -g -O2 '-DSTARTUPTIME="vimstartup"' -fno-strength-reduce -Wall -Wmissing-prototypes | 613 #CFLAGS = -g -O2 '-DSTARTUPTIME="vimstartup"' -fno-strength-reduce -Wall -Wmissing-prototypes |
614 | 614 |
615 # Use this with GCC to check for mistakes, unused arguments, etc. | 615 # Use this with GCC to check for mistakes, unused arguments, etc. |
616 # Note: If you use -Wextra and get warnings in GTK code about function | 616 # Note: If you use -Wextra and get warnings in GTK code about function |
617 # parameters, you can add -Wno-cast-function-type | 617 # parameters, you can add -Wno-cast-function-type |
618 #CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wunreachable-code -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 | 618 CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wunreachable-code -Wno-cast-function-type -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 |
619 # Add -Wpedantic to find // comments and other C99 constructs. | 619 # Add -Wpedantic to find // comments and other C99 constructs. |
620 # Better disable Perl and Python to avoid a lot of warnings. | 620 # Better disable Perl and Python to avoid a lot of warnings. |
621 #CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wpedantic -Wunreachable-code -Wunused-result -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 | 621 #CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wpedantic -Wunreachable-code -Wunused-result -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 |
622 #CFLAGS = -g -O2 -Wall -Wextra -Wshadow -Wmissing-prototypes -Wpedantic -Wunreachable-code -Wunused-result -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 | 622 #CFLAGS = -g -O2 -Wall -Wextra -Wshadow -Wmissing-prototypes -Wpedantic -Wunreachable-code -Wunused-result -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 |
623 #PYTHON_CFLAGS_EXTRA = -Wno-missing-field-initializers | 623 #PYTHON_CFLAGS_EXTRA = -Wno-missing-field-initializers |
702 # MEMORY LEAK DETECTION | 702 # MEMORY LEAK DETECTION |
703 # Requires installing the ccmalloc library. | 703 # Requires installing the ccmalloc library. |
704 # Configuration is in the .ccmalloc or ~/.ccmalloc file. | 704 # Configuration is in the .ccmalloc or ~/.ccmalloc file. |
705 # Doesn't work very well, since memory linked to from global variables | 705 # Doesn't work very well, since memory linked to from global variables |
706 # (in libraries) is also marked as leaked memory. | 706 # (in libraries) is also marked as leaked memory. |
707 #LEAK_CFLAGS = -DEXITFREE | 707 LEAK_CFLAGS = -DEXITFREE |
708 #LEAK_LIBS = -lccmalloc | 708 #LEAK_LIBS = -lccmalloc |
709 | 709 |
710 # Uncomment this line to have Vim call abort() when an internal error is | 710 # Uncomment this line to have Vim call abort() when an internal error is |
711 # detected. Useful when using a tool to find errors. | 711 # detected. Useful when using a tool to find errors. |
712 #ABORT_CFLAGS = -DABORT_ON_INTERNAL_ERROR | 712 #ABORT_CFLAGS = -DABORT_ON_INTERNAL_ERROR |
1632 pty.c \ | 1632 pty.c \ |
1633 quickfix.c \ | 1633 quickfix.c \ |
1634 regexp.c \ | 1634 regexp.c \ |
1635 screen.c \ | 1635 screen.c \ |
1636 search.c \ | 1636 search.c \ |
1637 session.c \ | |
1637 sha256.c \ | 1638 sha256.c \ |
1638 sign.c \ | 1639 sign.c \ |
1639 sound.c \ | 1640 sound.c \ |
1640 spell.c \ | 1641 spell.c \ |
1641 spellfile.c \ | 1642 spellfile.c \ |
1752 objects/pty.o \ | 1753 objects/pty.o \ |
1753 objects/quickfix.o \ | 1754 objects/quickfix.o \ |
1754 objects/regexp.o \ | 1755 objects/regexp.o \ |
1755 objects/screen.o \ | 1756 objects/screen.o \ |
1756 objects/search.o \ | 1757 objects/search.o \ |
1758 objects/session.o \ | |
1757 objects/sha256.o \ | 1759 objects/sha256.o \ |
1758 objects/sign.o \ | 1760 objects/sign.o \ |
1759 objects/sound.o \ | 1761 objects/sound.o \ |
1760 objects/spell.o \ | 1762 objects/spell.o \ |
1761 objects/spellfile.o \ | 1763 objects/spellfile.o \ |
1897 pty.pro \ | 1899 pty.pro \ |
1898 quickfix.pro \ | 1900 quickfix.pro \ |
1899 regexp.pro \ | 1901 regexp.pro \ |
1900 screen.pro \ | 1902 screen.pro \ |
1901 search.pro \ | 1903 search.pro \ |
1904 session.pro \ | |
1902 sha256.pro \ | 1905 sha256.pro \ |
1903 sign.pro \ | 1906 sign.pro \ |
1904 sound.pro \ | 1907 sound.pro \ |
1905 spell.pro \ | 1908 spell.pro \ |
1906 spellfile.pro \ | 1909 spellfile.pro \ |
3254 $(CCC) -o $@ screen.c | 3257 $(CCC) -o $@ screen.c |
3255 | 3258 |
3256 objects/search.o: search.c | 3259 objects/search.o: search.c |
3257 $(CCC) -o $@ search.c | 3260 $(CCC) -o $@ search.c |
3258 | 3261 |
3262 objects/session.o: session.c | |
3263 $(CCC) -o $@ session.c | |
3264 | |
3259 objects/sha256.o: sha256.c | 3265 objects/sha256.o: sha256.c |
3260 $(CCC) -o $@ sha256.c | 3266 $(CCC) -o $@ sha256.c |
3261 | 3267 |
3262 objects/sign.o: sign.c | 3268 objects/sign.o: sign.c |
3263 $(CCC) -o $@ sign.c | 3269 $(CCC) -o $@ sign.c |
3682 auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ | 3688 auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ |
3683 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ | 3689 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ |
3684 proto.h globals.h | 3690 proto.h globals.h |
3685 objects/search.o: search.c vim.h protodef.h auto/config.h feature.h os_unix.h \ | 3691 objects/search.o: search.c vim.h protodef.h auto/config.h feature.h os_unix.h \ |
3686 auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ | 3692 auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ |
3693 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ | |
3694 proto.h globals.h | |
3695 objects/session.o: session.c vim.h protodef.h auto/config.h feature.h \ | |
3696 os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ | |
3687 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ | 3697 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ |
3688 proto.h globals.h | 3698 proto.h globals.h |
3689 objects/sha256.o: sha256.c vim.h protodef.h auto/config.h feature.h os_unix.h \ | 3699 objects/sha256.o: sha256.c vim.h protodef.h auto/config.h feature.h os_unix.h \ |
3690 auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ | 3700 auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ |
3691 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ | 3701 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ |