diff options
-rw-r--r-- | Filelist | 25 | ||||
-rw-r--r-- | runtime/autoload/xmlcomplete.vim | 2 | ||||
-rw-r--r-- | runtime/doc/autocmd.txt | 3 | ||||
-rw-r--r-- | runtime/doc/eval.txt | 6 | ||||
-rw-r--r-- | runtime/doc/gui_x11.txt | 58 | ||||
-rw-r--r-- | runtime/doc/starting.txt | 9 | ||||
-rw-r--r-- | runtime/doc/tags | 18 | ||||
-rw-r--r-- | runtime/syntax/slice.vim | 6 | ||||
-rw-r--r-- | src/INSTALLmac.txt | 111 | ||||
-rw-r--r-- | src/Makefile | 99 | ||||
-rwxr-xr-x | src/auto/configure | 996 | ||||
-rw-r--r-- | src/configure.in | 331 | ||||
-rw-r--r-- | src/edit.c | 14 | ||||
-rw-r--r-- | src/ex_cmds2.c | 7 | ||||
-rw-r--r-- | src/ex_getln.c | 3 | ||||
-rw-r--r-- | src/feature.h | 23 | ||||
-rw-r--r-- | src/fileio.c | 5 | ||||
-rw-r--r-- | src/globals.h | 9 | ||||
-rw-r--r-- | src/gui.c | 32 | ||||
-rw-r--r-- | src/gui.h | 41 | ||||
-rw-r--r-- | src/mbyte.c | 27 | ||||
-rw-r--r-- | src/misc2.c | 2 | ||||
-rw-r--r-- | src/option.c | 10 | ||||
-rw-r--r-- | src/option.h | 6 | ||||
-rw-r--r-- | src/os_macosx.c | 6 | ||||
-rw-r--r-- | src/os_unix.c | 14 | ||||
-rw-r--r-- | src/screen.c | 18 | ||||
-rw-r--r-- | src/structs.h | 3 | ||||
-rw-r--r-- | src/version.c | 4 | ||||
-rw-r--r-- | src/version.h | 4 |
30 files changed, 127 insertions, 1765 deletions
@@ -2,7 +2,7 @@ # Used by Makefile and upload.aap. # source files for all source archives -SRC_ALL1 = \ +SRC_ALL = \ src/README.txt \ src/arabic.c \ src/arabic.h \ @@ -72,8 +72,6 @@ SRC_ALL1 = \ src/vim.h \ src/window.c \ src/xxd/xxd.c \ - -SRC_ALL2 = \ src/main.aap \ src/testdir/main.aap \ src/testdir/*.in \ @@ -138,7 +136,6 @@ SRC_UNIX = \ pixmaps/gen-inline-pixbufs.sh \ pixmaps/stock_icons.h \ src/INSTALL \ - src/INSTALLkde.txt \ src/Makefile \ src/auto/configure \ src/config.aap.in \ @@ -155,11 +152,6 @@ SRC_UNIX = \ src/gui_gtk_f.c \ src/gui_gtk_f.h \ src/gui_gtk_x11.c \ - src/gui_kde.cc \ - src/gui_kde_wid.cc \ - src/gui_kde_wid.h \ - src/gui_kde_x11.cc \ - src/kvim_iface.h \ src/gui_motif.c \ src/gui_xmdlg.c \ src/gui_xmebw.c \ @@ -185,8 +177,6 @@ SRC_UNIX = \ src/proto/gui_athena.pro \ src/proto/gui_gtk.pro \ src/proto/gui_gtk_x11.pro \ - src/proto/gui_kde.pro \ - src/proto/gui_kde_x11.pro \ src/proto/gui_motif.pro \ src/proto/gui_xmdlg.pro \ src/proto/gui_x11.pro \ @@ -219,6 +209,7 @@ SRC_DOS_UNIX = \ src/if_perlsfio.c \ src/if_python.c \ src/if_ruby.c \ + src/if_sniff.h \ src/if_tcl.c \ src/proto/if_cscope.pro \ src/proto/if_mzsch.pro \ @@ -364,21 +355,14 @@ SRC_AMI = \ # source files for the Mac (also in the extra archive) SRC_MAC = \ src/INSTALLmac.txt \ - src/Make_mpw.mak \ src/dehqx.py \ src/gui_mac.c \ src/gui_mac.icns \ - src/gui_mac.r \ - src/os_mac.build \ - src/os_mac.c \ src/os_mac.h \ src/os_mac.rsr.hqx \ - src/os_mac.sit.hqx \ src/os_mac_conv.c \ src/os_macosx.c \ - src/os_mac.pbproj/project.pbxproj \ src/proto/gui_mac.pro \ - src/proto/os_mac.pro \ src/proto/os_mac_conv.pro \ # source files for VMS (in the extra archive) @@ -429,7 +413,6 @@ SRC_EXTRA = \ src/gui_riscos.c \ src/gui_riscos.h \ src/if_sniff.c \ - src/if_sniff.h \ src/infplist.xml \ src/link.390 \ src/os_beos.c \ @@ -535,10 +518,6 @@ RT_UNIX = \ runtime/KVim.desktop \ runtime/hi16-action-make.png \ runtime/hi22-action-make.png \ - runtime/kde-tips \ - runtime/kvim32x32.png \ - runtime/kvim48x48.png \ - runtime/kvim64x64.png \ runtime/vim16x16.png \ runtime/vim16x16.xpm \ runtime/vim32x32.png \ diff --git a/runtime/autoload/xmlcomplete.vim b/runtime/autoload/xmlcomplete.vim index 3cd4c7164c..2d09eff096 100644 --- a/runtime/autoload/xmlcomplete.vim +++ b/runtime/autoload/xmlcomplete.vim @@ -310,7 +310,7 @@ function! xmlcomplete#GetLastOpenTag(unaryTagsStack) let tagpat='</\='.b:xml_namespace.':\(\k\|[.-]\)\+\|/>' endif else - let tagpat='</\=\(\k\|[.-:]\)\+\|/>' + let tagpat='</\=\(\k\|[.-]\)\+\|/>' endif while (linenum>0) let line=getline(linenum) diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt index 390afadd47..37a51ad99d 100644 --- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -555,6 +555,9 @@ QuickFixCmdPre *QuickFixCmdPre* QuickFixCmdPost *QuickFixCmdPost* like QuickFixCmdPre, but after a quickfix command is run. + *SessionLoadPost* +SessionLoadPost After loading the session file created using + the |:mksession| command. *MenuPopup* MenuPopup Just before showing the popup menu (under the right mouse button). Useful for adjusting the diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index adcf451872..eeb07a2597 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 7.0aa. Last change: 2005 Nov 20 +*eval.txt* For Vim version 7.0aa. Last change: 2005 Dec 06 VIM REFERENCE MANUAL by Bram Moolenaar @@ -3624,6 +3624,8 @@ remote_foreground({server}) *remote_foreground()* < Except that on Win32 systems the client does the work, to work around the problem that the OS doesn't always allow the server to bring itself to the foreground. + Note: This does not restore the window if it was minimized, + like foreground() does. This function is not available in the |sandbox|. {only in the Win32, Athena, Motif and GTK GUI versions and the Win32 console version} @@ -4194,7 +4196,7 @@ strlen({expr}) The result is a Number, which is the length of the String strpart({src}, {start}[, {len}]) *strpart()* The result is a String, which is part of {src}, starting from - byte {start}, with the length {len}. + byte {start}, with the byte length {len}. When non-existing bytes are included, this doesn't result in an error, the bytes are simply omitted. If {len} is missing, the copy continues from {start} till the diff --git a/runtime/doc/gui_x11.txt b/runtime/doc/gui_x11.txt index d717bfe44c..825ff3c6a3 100644 --- a/runtime/doc/gui_x11.txt +++ b/runtime/doc/gui_x11.txt @@ -1,4 +1,4 @@ -*gui_x11.txt* For Vim version 7.0aa. Last change: 2005 Mar 29 +*gui_x11.txt* For Vim version 7.0aa. Last change: 2005 Dec 06 VIM REFERENCE MANUAL by Bram Moolenaar @@ -437,59 +437,9 @@ command line argument). ============================================================================== 7. KDE version *gui-kde* *kde* *KDE* *KVim* -NOTE: The KDE version is still under development. It is not recommended for -daily work. - -The KDE version of Vim works with KDE 2.x and KDE 3.x. -KVim (name code for gui-kde) does not use traditional X settings for its -configuration. -Most important difference is the font handling, KVim uses QFont to display the -text. To set your font use the following syntax : -> - :set guifont=Fixed\ [Misc]/10/-1/5/50/0/0/0/1/0 -< -the '10' value is the font size, other settings concerns more specific Qt -options which you should not need to care with. -The suggested way to choose your font is through the font selection dialog -available with the command : - :set guifont=* - -Note: X Font names are not supported any more, so if you use GVim too, you'll -have to set something like this in your ~/.gvimrc : > - - if has("gui_kde") - :set guifont=Fixed\ [Misc]/10/-1/5/50/0/0/0/1/0 - else if has("gui_gtk") - :set guifont=-misc-fixed-medium-r-normal-*-*-100-*-*-c-*-iso10646-1 - endif -< - *antialias* -KVim uses antialias for its font, so that the text looks better, to disable -this you have to refer to Qt's documentation (export QT_XFT=0 for QT 2.x). - -KDE provides some other features, like being able to move the menubar and the -toolbar wherever you want around the text area. - - *kde-toolbar* -KVim can be used with a KDE-look toolbar instead of Vim's default toolbar. To -enable this feature you have to run the configure script with the ---enable-kde-toolbar switch. It may be moved to a runtime option in the -future. - - *DCOP* -Since Vim 6.0, the new ClientServer feature has been added, it works fine in -KVim too. KVim also provides its own communication scheme based on DCOP. This -is mainly used by the |vimpart| but can freely be used by other applications -or manually through KDE's DCOP tools. The DCOP servername is synchronized with -the X11 servername so that it's easier to identify the same KVim through the -two communication systems. - - *vimpart* *vim-kpart* -KVim developers are also working on a component to allow embedding of Vim into -KDE's applications. As of this writing, the component is working and can be -used in different KDE applications. New KDE applications should support it -soon. To get more information about this component, refer to -http://freehackers.org/kvim or to the KDE project. +There is no KDE version of Vim. There has been some work on a port using the +Qt toolkit, but it never worked properly and it has been abandoned. Work +continues on Yzis: www.yzis.org. ============================================================================== 8. Compiling *gui-x11-compiling* diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index dcd83b7872..55ca073517 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -1,4 +1,4 @@ -*starting.txt* For Vim version 7.0aa. Last change: 2005 Oct 02 +*starting.txt* For Vim version 7.0aa. Last change: 2005 Dec 04 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1201,6 +1201,13 @@ An example mapping: > :nmap <F2> :wa<Bar>exe "mksession! " . v:this_session<CR>:so ~/sessions/ This saves the current Session, and starts off the command to load another. +The |SessionLoadPost| autocmd event is triggered after a session file is +loaded/sourced. + *SessionLoad-variable* +While the session file is loading the SessionLoad global variable is set to 1. +Plugins can use this to postpone some work until the SessionLoadPost event is +triggered. + *:mkvie* *:mkview* :mkvie[w][!] [file] Write a Vim script that restores the contents of the current window. diff --git a/runtime/doc/tags b/runtime/doc/tags index 2fb97ba148..965719d275 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -1655,6 +1655,7 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME* :@ repeat.txt /*:@* :@: repeat.txt /*:@:* :@@ repeat.txt /*:@@* +:CompilerSet usr_41.txt /*:CompilerSet* :Explore pi_netrw.txt /*:Explore* :Hexplore pi_netrw.txt /*:Hexplore* :Man filetype.txt /*:Man* @@ -3974,6 +3975,8 @@ Select visual.txt /*Select* Select-mode visual.txt /*Select-mode* Select-mode-mapping visual.txt /*Select-mode-mapping* Session starting.txt /*Session* +SessionLoad-variable starting.txt /*SessionLoad-variable* +SessionLoadPost autocmd.txt /*SessionLoadPost* StdinReadPost autocmd.txt /*StdinReadPost* StdinReadPre autocmd.txt /*StdinReadPre* Syntax autocmd.txt /*Syntax* @@ -5132,6 +5135,7 @@ g:netrw_sort_by pi_netrw.txt /*g:netrw_sort_by* g:netrw_sort_direction pi_netrw.txt /*g:netrw_sort_direction* g:netrw_sort_sequence pi_netrw.txt /*g:netrw_sort_sequence* g:netrw_ssh_browse_reject pi_netrw.txt /*g:netrw_ssh_browse_reject* +g:netrw_ssh_cmd pi_netrw.txt /*g:netrw_ssh_cmd* g:netrw_timefmt pi_netrw.txt /*g:netrw_timefmt* g:netrw_uid pi_netrw.txt /*g:netrw_uid* g:netrw_use_nt_rcp pi_netrw.txt /*g:netrw_use_nt_rcp* @@ -6771,6 +6775,13 @@ tags-file-format tagsrch.txt /*tags-file-format* tags-option tagsrch.txt /*tags-option* tagsrch.txt tagsrch.txt /*tagsrch.txt* tagstack tagsrch.txt /*tagstack* +tar pi_tar.txt /*tar* +tar-contents pi_tar.txt /*tar-contents* +tar-copyright pi_tar.txt /*tar-copyright* +tar-history pi_tar.txt /*tar-history* +tar-manual pi_tar.txt /*tar-manual* +tar-usage pi_tar.txt /*tar-usage* +tar.txt pi_tar.txt /*tar.txt* tcl if_tcl.txt /*tcl* tcl-beep if_tcl.txt /*tcl-beep* tcl-buffer if_tcl.txt /*tcl-buffer* @@ -7356,6 +7367,13 @@ zf fold.txt /*zf* zg spell.txt /*zg* zh scroll.txt /*zh* zi fold.txt /*zi* +zip pi_zip.txt /*zip* +zip-contents pi_zip.txt /*zip-contents* +zip-copyright pi_zip.txt /*zip-copyright* +zip-history pi_zip.txt /*zip-history* +zip-manual pi_zip.txt /*zip-manual* +zip-usage pi_zip.txt /*zip-usage* +zip.txt pi_zip.txt /*zip.txt* zj fold.txt /*zj* zk fold.txt /*zk* zl scroll.txt /*zl* diff --git a/runtime/syntax/slice.vim b/runtime/syntax/slice.vim index e8f876c8ba..8a4d6751a7 100644 --- a/runtime/syntax/slice.vim +++ b/runtime/syntax/slice.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: Slice (ZeroC's Specification Language for Ice) -" Maintainer: Morel Bodin <bodin@tuxfamily.net> -" Last Change: 2003 Sep 24 +" Maintainer: Morel Bodin <slice06@nym.hush.com> +" Last Change: 2005 Dec 03 " For version 5.x: Clear all syntax items " For version 6.x: Quit when a syntax file was already loaded @@ -15,7 +15,7 @@ endif syn keyword sliceType bool byte double float int long short string void syn keyword sliceQualifier const extends idempotent implements local nonmutating out throws -syn keyword sliceConstruct class enum exception dictionnary interface module LocalObject Object sequence struct +syn keyword sliceConstruct class enum exception dictionary interface module LocalObject Object sequence struct syn keyword sliceQualifier const extends idempotent implements local nonmutating out throws syn keyword sliceBoolean false true diff --git a/src/INSTALLmac.txt b/src/INSTALLmac.txt index 8b944c3799..adb1ca1638 100644 --- a/src/INSTALLmac.txt +++ b/src/INSTALLmac.txt @@ -15,12 +15,7 @@ Summary 1.1. Carbon interface 1.2. X (Athena, GTK, Motif) or plain text. -2 MacOS Classic - 2.1. CodeWarrior - 2.2. MPW - -NOTE: The Carbon version can only be compiled properly under - MacOS X. +MacOS Classic is no longer supported. If you really want it use Vim 6.4. ---------------------------------------------------------------------------- 1 MacOS X @@ -57,108 +52,4 @@ NOTE: The Carbon version can only be compiled properly under NOTE: You need to first install XFree86 and XDarwin. Please visit http://www.XDarwin.org ----------------------------------------------------------------------------- -MacOS 9 ----------------------------------------------------------------------------- - -Both ':' and '/' supported as path separator. - -2.1: Compiling with CodeWarior - - 1. Expand the resource file: - open ../src/os_mac.rsr.hqx to produce ../src/gui_mac.rsrc: - % cd vim62/src - % open -a StuffIt\ Expander os_mac.rsr.hqx - - 2. Expand the project file: - - ../src/os_mac.sit.hqx (to produce ../src/vim.mcp) - - 3. Open vim.mcp with CodeWarior - - This is a CodeWarior 9 project file. When using a newer version, - you need to convert the file. you may also need to change some - access path. - - NOTE: the current project file is old, you need to add a few files: - (ex_cmds2.c, fold.c, mbyte.c, move.c) - - 4. Select the target PPC, 68k FAT (with/without debugger) - - 5. Compile - -2.2: Compiling with MPW. - - 0. You will need a recent version of the MPW and the Universal Interfaces. - You can get both at: - ftp://ftp.apple.com/developer/Tool_Chest/Interfaces-Libraries/ - ftp://ftp.apple.com/developer/Tool_Chest/Core_Mac_OS_Tools/ - For a Carbon version you will need a recent Carbon SDK as well. - (When you have an older version already installed you not be able to - compile a carbon version. Update "CreateMake" which is available at - Apple. - - 1. Expand the resource file: - open ../src/os_mac.rsr.hqx to produce ../src/gui_mac.rsrc: - % cd vim62/src - % open -a StuffIt\ Expander os_mac.rsr.hqx - - 3. Double click on os_make.make, the MPW will now open in the correct - folder and load the CreateVimMake script. Change to the Worksheet - window. Type "os_mac.build" and hit Enter (not Return). A dialog box - will appear. Select the target you want. (Vim-68k, Vim-ppc, Vim-carbon) - - 4. Select "Build" from the menu (or type command-B). Type the program name - into the dialog box. - ------------------------------------------------------ - -OLD FILE: SOME INFO MAY STILL BE USEFUL - -NOTE: Users of more recent CodeWarrior version may have to reset the library - path, and change the mch_delay in os_mac.c so the finalTick is unsigned. - -Compilation instructions: - -1. Visit the Vim ftp site (see ftp://ftp.vim.org/pub/vim/MIRRORS) - and obtain the following five files: - - unix/vim-X.X-src1.tar.gz - unix/vim-X.X-src2.tar.gz - unix/vim-X.X-rt1.tar.gz - unix/vim-X.X-rt2.tar.gz - extra/vim-X.X-extra.tar.gz - - where X.X is the version number. - - NOTE: the language support is not yet supported - -2. Expand the archives. - -3. Apply patches if they exist. (Patch files are found in the ftp - site in the "patches" directory.) - -4. Edit vim-X.X/src/feature.h for your preference. (You can skip - this, then you will get the default behavior as is documented, - which should be fine for most people.) - - For example, if you want to add the FEAT_MBYTE feature, turn on - #define FEAT_MBYTE - -5. Expand the resource file: - - - vim-X.X/src/os_mac.rsr.hqx (to produce vim-X.X/src/gui_mac.rsrc) - -6. If using CodeWarrior, expand the project file: - - - vim-X.X/src/os_mac.sit.hqx (to produce vim-X.X/src/vim.mcp) - - The latter file is the CodeWarrior project file to be used. - -7. Launch CodeWarrior by double clicking vim.mcp. - -8. Check additional files if you include non-standard features. - - For example, if you added the MULTI_BYTE feature, check - Extras/mbyte.c in the project window. - -9. Compile and you will obtain binaries: vimPPC, Vim 68k, and/or vimFAT. diff --git a/src/Makefile b/src/Makefile index 56ab707a3a..8dd1be3e6e 100644 --- a/src/Makefile +++ b/src/Makefile @@ -34,7 +34,7 @@ # X11 Session Management Protocol (XSMP) library (libSM) but do not # want to use it. # This can speedup Vim startup but Vim loses the ability to catch the -# user logging out from session-managers like GNOME & KDE and work +# user logging out from session-managers like GNOME and work # could be lost. # - Uncomment one or more of these lines to include an interface; # each makes Vim quite a bit bigger: @@ -338,8 +338,6 @@ CClink = $(CC) # automatically be used if it is found. If you have GNOME, but do not want to # use it (e.g., want a GTK-only version), then use --enable-gui=gtk. # -# KDE doesn't fully work, unfortunately. See the todo list. -# # If the selected GUI isn't found, the GUI is disabled automatically #CONF_OPT_GUI = --enable-gui=gtk #CONF_OPT_GUI = --enable-gui=gtk --disable-gtktest @@ -348,7 +346,6 @@ CClink = $(CC) #CONF_OPT_GUI = --enable-gui=gnome #CONF_OPT_GUI = --enable-gui=gnome2 #CONF_OPT_GUI = --enable-gui=gnome2 --disable-gtktest -#CONF_OPT_GUI = --enable-gui=kde #CONF_OPT_GUI = --enable-gui=motif #CONF_OPT_GUI = --enable-gui=motif --with-motif-lib="-static -lXm -shared" #CONF_OPT_GUI = --enable-gui=athena @@ -1087,23 +1084,6 @@ LINKIT = @echo >/dev/null # Without a GUI install the normal way. NONE_INSTALL = install_normal -### KDE GUI interface. -KDE_SRC = gui.c pty.c gui_kde.cc gui_kde_x11.cc gui_kde_wid.cc gui_kde_wid_moc.cc kvim_iface_skel.cc -KDE_OBJ = objects/gui.o objects/pty.o objects/gui_kde.o objects/gui_kde_x11.o \ - objects/gui_kde_wid.o objects/gui_kde_wid_moc.o \ - objects/kvim_iface_skel.o -KDE_DEFS = -DFEAT_GUI_KDE $(NARROW_PROTO) -KDE_IPATH = $(GUI_INC_LOC) -KDE_LIBS_DIR = $(GUI_LIB_LOC) # Includes the libraries themselves -KDE_DIR = $(KDE_PREFIX) -KDE_LIBS1 = -KDE_LIBS2 = -KDE_INSTALL = install_normal -KDE_TARGETS = installglinks installkdeicons -KDE_MAN_TARGETS = yes -KDE_TESTTARGET = gui -KDE_BUNDLE = - ### GTK GUI GTK_SRC = gui.c gui_gtk.c gui_gtk_x11.c pty.c gui_gtk_f.c \ gui_beval.c @@ -1230,7 +1210,7 @@ APPDIR = $(VIMNAME).app CARBONGUI_TESTARG = VIMPROG=../$(APPDIR)/Contents/MacOS/$(VIMTARGET) # All GUI files -ALL_GUI_SRC = gui.c gui_gtk.c gui_gtk_f.c gui_motif.c gui_xmdlg.c gui_xmebw.c gui_athena.c gui_gtk_x11.c gui_x11.c gui_at_sb.c gui_at_fs.c pty.c gui_kde.cc gui_kde_wid.cc gui_kde_x11.cc gui_kde_wid_moc.cc +ALL_GUI_SRC = gui.c gui_gtk.c gui_gtk_f.c gui_motif.c gui_xmdlg.c gui_xmebw.c gui_athena.c gui_gtk_x11.c gui_x11.c gui_at_sb.c gui_at_fs.c pty.c ALL_GUI_PRO = gui.pro gui_gtk.pro gui_motif.pro gui_xmdlg.pro gui_athena.pro gui_gtk_x11.pro gui_x11.pro gui_w16.pro gui_w32.pro gui_photon.pro # }}} @@ -1277,7 +1257,7 @@ PROTO_FLAGS = -m -M__ARGS -d -E"$(CPP)" $(NO_ATTR) SHELL = /bin/sh .SUFFIXES: -.SUFFIXES: .cc .c .o .pro +.SUFFIXES: .c .o .pro PRE_DEFS = -Iproto $(DEFS) $(GUI_DEFS) $(GUI_IPATH) $(CPPFLAGS) $(EXTRA_IPATHS) POST_DEFS = $(X_CFLAGS) $(MZSCHEME_CFLAGS) $(PERL_CFLAGS) $(PYTHON_CFLAGS) $(TCL_CFLAGS) $(RUBY_CFLAGS) $(EXTRA_DEFS) @@ -1395,7 +1375,7 @@ SRC = $(BASIC_SRC) $(GUI_SRC) $(HANGULIN_SRC) $(MZSCHEME_SRC) \ $(PERL_SRC) $(PYTHON_SRC) $(TCL_SRC) $(RUBY_SRC) \ $(SNIFF_SRC) $(WORKSHOP_SRC) $(WSDEBUG_SRC) -TAGS_SRC = *.c *.cpp *.cc if_perl.xs +TAGS_SRC = *.c *.cpp if_perl.xs EXTRA_SRC = hangulin.c if_mzsch.c auto/if_perl.c if_perlsfio.c \ if_python.c if_tcl.c if_ruby.c if_sniff.c gui_beval.c \ @@ -1947,23 +1927,6 @@ install-languages: languages $(DEST_LANG) $(DEST_KMAP) chmod $(FILEMOD) $(DEST_KMAP)/README.txt $(DEST_KMAP)/*.vim; \ fi -# Install the icons for the KDE GUI. This differs from the KDE icons for -# other GUIs. -installkdeicons: - mkdir -p $(DESTDIR)$(KDE_DIR)/share/applnk/Editors/ - mkdir -p $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/32x32/apps/ - mkdir -p $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/48x48/apps/ - mkdir -p $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/22x22/actions/ - mkdir -p $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/16x16/actions/ - mkdir -p $(DESTDIR)$(KDE_DIR)/share/apps/kvim - - cp ../runtime/KVim.desktop $(DESTDIR)$(KDE_DIR)/share/applnk/Editors/ && chmod 644 $(DESTDIR)$(KDE_DIR)/share/applnk/Editors/KVim.desktop - cp ../runtime/kvim32x32.png $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/32x32/apps/kvim.png && chmod 644 $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/32x32/apps/kvim.png - cp ../runtime/kvim48x48.png $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/48x48/apps/kvim.png && chmod 644 $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/48x48/apps/kvim.png - cp ../runtime/hi16-action-make.png $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/16x16/actions/hi16-action-make.png - cp ../runtime/hi22-action-make.png $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/22x22/actions/hi22-action-make.png - cp ../runtime/kde-tips $(DESTDIR)$(KDE_DIR)/share/apps/kvim/tips && chmod 644 $(DESTDIR)$(KDE_DIR)/share/apps/kvim/tips - # install the icons for KDE, if the directory exists and the icon doesn't. ICON48PATH = $(DESTDIR)$(DATADIR)/icons/hicolor/48x48/apps ICON32PATH = $(DESTDIR)$(DATADIR)/icons/locolor/32x32/apps @@ -2145,7 +2108,6 @@ clean celan: testclean -rm -f $(TOOLS) auto/osdef.h auto/pathdef.c auto/if_perl.c -rm -f conftest* *~ auto/link.sed -rm -rf $(APPDIR) - -rm -f gui_kde_wid_moc.cc kvim_iface_skel.cc *.kidl if test -d $(PODIR); then \ cd $(PODIR); $(MAKE) prefix=$(DESTDIR)$(prefix) clean; \ fi @@ -2239,9 +2201,6 @@ lintinstall: .c.o: $(CCC) $< -.cc.o: - $(CCC) $< - auto/if_perl.c: if_perl.xs $(PERL) -e 'unless ( $$] >= 5.005 ) { for (qw(na defgv errgv)) { print "#define PL_$$_ $$_\n" }}' > $@ $(PERL) $(PERLLIB)/ExtUtils/xsubpp -prototypes -typemap \ @@ -2512,26 +2471,6 @@ objects/workshop.o: workshop.c objects/wsdebug.o: wsdebug.c $(CCC) -o $@ wsdebug.c -objects/gui_kde.o: gui_kde.cc - $(CCC) -o $@ gui_kde.cc - -objects/gui_kde_x11.o: gui_kde_x11.cc - $(CCC) -o $@ gui_kde_x11.cc - -objects/gui_kde_wid.o: gui_kde_wid.cc - $(MOC) -o gui_kde_wid_moc.cc gui_kde_wid.h - $(KDE_DIR)/bin/dcopidl kvim_iface.h > kvim_iface.kidl || ( rm -f kvim_iface.kidl ; /bin/false ) - $(KDE_DIR)/bin/dcopidl2cpp --c++-suffix cc --no-stub kvim_iface.kidl - $(CCC) -o $@ gui_kde_wid.cc - -gui_kde_wid_moc.cc: objects/gui_kde_wid.o -objects/gui_kde_wid_moc.o: gui_kde_wid_moc.cc - $(CCC) -o $@ gui_kde_wid_moc.cc - -kvim_iface_skel.cc: objects/gui_kde_wid.o -objects/kvim_iface_skel.o: kvim_iface_skel.cc - $(CCC) -o $@ kvim_iface_skel.cc - objects/netbeans.o: netbeans.c $(CCC) -o $@ netbeans.c @@ -2897,36 +2836,6 @@ objects/pty.o: pty.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h ascii. keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \ proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \ arabic.h if_sniff.h -objects/gui_kde.o: gui_kde.cc gui_kde_wid.h kvim_iface.h vim.h auto/config.h \ - feature.h os_unix.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ - gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \ - globals.h farsi.h arabic.h if_sniff.h ../pixmaps/tb_new.xpm \ - ../pixmaps/tb_open.xpm ../pixmaps/tb_close.xpm ../pixmaps/tb_save.xpm \ - ../pixmaps/tb_print.xpm ../pixmaps/tb_cut.xpm ../pixmaps/tb_copy.xpm \ - ../pixmaps/tb_paste.xpm ../pixmaps/tb_find.xpm \ - ../pixmaps/tb_find_next.xpm ../pixmaps/tb_find_prev.xpm \ - ../pixmaps/tb_find_help.xpm ../pixmaps/tb_exit.xpm \ - ../pixmaps/tb_undo.xpm ../pixmaps/tb_redo.xpm ../pixmaps/tb_help.xpm \ - ../pixmaps/tb_macro.xpm ../pixmaps/tb_make.xpm \ - ../pixmaps/tb_save_all.xpm ../pixmaps/tb_jump.xpm \ - ../pixmaps/tb_ctags.xpm ../pixmaps/tb_load_session.xpm \ - ../pixmaps/tb_save_session.xpm ../pixmaps/tb_new_session.xpm \ - ../pixmaps/tb_blank.xpm ../pixmaps/tb_maximize.xpm \ - ../pixmaps/tb_split.xpm ../pixmaps/tb_minimize.xpm \ - ../pixmaps/tb_shell.xpm ../pixmaps/tb_replace.xpm \ - ../pixmaps/tb_vsplit.xpm ../pixmaps/tb_maxwidth.xpm \ - ../pixmaps/tb_minwidth.xpm -objects/gui_kde_wid.o: gui_kde_wid.cc gui_kde_wid.h kvim_iface.h vim.h \ - auto/config.h feature.h os_unix.h ascii.h keymap.h term.h macros.h \ - structs.h regexp.h gui.h gui_beval.h proto/gui_beval.pro option.h \ - ex_cmds.h proto.h globals.h farsi.h arabic.h if_sniff.h version.h \ - proto/../../pixmaps/alert.xpm proto/../../pixmaps/error.xpm \ - proto/../../pixmaps/generic.xpm proto/../../pixmaps/info.xpm \ - proto/../../pixmaps/quest.xpm -objects/gui_kde_x11.o: gui_kde_x11.cc gui_kde_wid.h kvim_iface.h vim.h \ - auto/config.h feature.h os_unix.h ascii.h keymap.h term.h macros.h \ - structs.h regexp.h gui.h gui_beval.h proto/gui_beval.pro option.h \ - ex_cmds.h proto.h globals.h farsi.h arabic.h if_sniff.h version.h objects/hangulin.o: hangulin.c vim.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \ gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h \ diff --git a/src/auto/configure b/src/auto/configure index c109822693..794fd8f427 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -309,7 +309,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP AWK STRIP CPP_MM OS_EXTRA_SRC OS_EXTRA_OBJ VIMNAME EXNAME VIEWNAME line_break dovimdiff dogvimdiff compiledby vi_cv_path_mzscheme MZSCHEME_SRC MZSCHEME_OBJ MZSCHEME_PRO MZSCHEME_LIBS MZSCHEME_CFLAGS vi_cv_path_perl vi_cv_perllib shrpenv PERL_SRC PERL_OBJ PERL_PRO PERL_CFLAGS PERL_LIBS vi_cv_path_python PYTHON_CONFDIR PYTHON_LIBS PYTHON_GETPATH_CFLAGS PYTHON_CFLAGS PYTHON_SRC PYTHON_OBJ vi_cv_path_tcl TCL_SRC TCL_OBJ TCL_PRO TCL_CFLAGS TCL_LIBS vi_cv_path_ruby RUBY_SRC RUBY_OBJ RUBY_PRO RUBY_CFLAGS RUBY_LIBS WORKSHOP_SRC WORKSHOP_OBJ NETBEANS_SRC NETBEANS_OBJ SNIFF_SRC SNIFF_OBJ xmkmfpath X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS X_LIB MOC KDE_CONFIG KDE_LIBS KDE_INCLUDES KDE_PREFIX CXX CXXFLAGS ac_ct_CXX QT_LIBS QT_INCLUDES ROOTQT GTK_CONFIG GTK12_CONFIG PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_LIBNAME GNOME_LIBS GNOME_LIBDIR GNOME_INCLUDEDIR GNOME_CONFIG MOTIF_LIBNAME NARROW_PROTO GUI_INC_LOC GUI_LIB_LOC GUITYPE GUI_X_LIBS HANGULIN_SRC HANGULIN_OBJ TAGPRG INSTALL_LANGS INSTALL_TOOL_LANGS MSGFMT MAKEMO DEPEND_CFLAGS_FILTER LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP AWK STRIP CPP_MM OS_EXTRA_SRC OS_EXTRA_OBJ VIMNAME EXNAME VIEWNAME line_break dovimdiff dogvimdiff compiledby vi_cv_path_mzscheme MZSCHEME_SRC MZSCHEME_OBJ MZSCHEME_PRO MZSCHEME_LIBS MZSCHEME_CFLAGS vi_cv_path_perl vi_cv_perllib shrpenv PERL_SRC PERL_OBJ PERL_PRO PERL_CFLAGS PERL_LIBS vi_cv_path_python PYTHON_CONFDIR PYTHON_LIBS PYTHON_GETPATH_CFLAGS PYTHON_CFLAGS PYTHON_SRC PYTHON_OBJ vi_cv_path_tcl TCL_SRC TCL_OBJ TCL_PRO TCL_CFLAGS TCL_LIBS vi_cv_path_ruby RUBY_SRC RUBY_OBJ RUBY_PRO RUBY_CFLAGS RUBY_LIBS WORKSHOP_SRC WORKSHOP_OBJ NETBEANS_SRC NETBEANS_OBJ SNIFF_SRC SNIFF_OBJ xmkmfpath X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS X_LIB GTK_CONFIG GTK12_CONFIG PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_LIBNAME GNOME_LIBS GNOME_LIBDIR GNOME_INCLUDEDIR GNOME_CONFIG MOTIF_LIBNAME NARROW_PROTO GUI_INC_LOC GUI_LIB_LOC GUITYPE GUI_X_LIBS HANGULIN_SRC HANGULIN_OBJ TAGPRG INSTALL_LANGS INSTALL_TOOL_LANGS MSGFMT MAKEMO DEPEND_CFLAGS_FILTER LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -770,14 +770,6 @@ ac_env_CPP_set=${CPP+set} ac_env_CPP_value=$CPP ac_cv_env_CPP_set=${CPP+set} ac_cv_env_CPP_value=$CPP -ac_env_CXX_set=${CXX+set} -ac_env_CXX_value=$CXX -ac_cv_env_CXX_set=${CXX+set} -ac_cv_env_CXX_value=$CXX -ac_env_CXXFLAGS_set=${CXXFLAGS+set} -ac_env_CXXFLAGS_value=$CXXFLAGS -ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set} -ac_cv_env_CXXFLAGS_value=$CXXFLAGS # # Report the --help message. @@ -868,8 +860,7 @@ Optional Features: --enable-hangulinput Include Hangul input support. --enable-xim Include XIM input support. --enable-fontset Include X fontset output support. - --enable-gui=OPTS X11 GUI default=auto OPTS=auto/no/gtk/gtk2/gnome/gnome2/kde/motif/athena/neXtaw/photon/carbon - --enable-kde-check If auto-select GUI, check for KDE default=no + --enable-gui=OPTS X11 GUI default=auto OPTS=auto/no/gtk/gtk2/gnome/gnome2/motif/athena/neXtaw/photon/carbon --enable-gtk-check If auto-select GUI, check for GTK default=yes --enable-gtk2-check If GTK GUI, check for GTK+ 2 default=yes --enable-gnome-check If GTK GUI, check for GNOME default=no @@ -877,9 +868,6 @@ Optional Features: --enable-athena-check If auto-select GUI, check for Athena default=yes --enable-nextaw-check If auto-select GUI, check for neXtaw default=yes --enable-carbon-check If auto-select GUI, check for Carbon default=yes - --enable-kde-toolbar if KDE GUI is selected, enable a KDE-look toolbar default=no - --disable-rpath Disable rpath. - --disable-kdetest Do not try to compile and run a test KDE program --disable-gtktest Do not try to compile and run a test GTK program --disable-acl Don't check for ACL support. --disable-gpm Don't use gpm (Linux mouse daemon). @@ -899,12 +887,6 @@ Optional Packages: --with-python-config-dir=PATH Python's config directory --with-tclsh=PATH which tclsh to use (default: tclsh8.0) --with-x use the X Window System - --with-qt-dir=DIR Specify prefix of QT files - --with-qt-includes=DIR Specify location of Qt headers - --with-qt-libs=DIR Specify location of Qt libraries - --with-kde-prefix=PFX Prefix where KDE is installed (optional) - --with-kde-includes=DIR Specify location of KDE headers - --with-kde-libs=DIR Specify location of KDE libraries --with-gtk-prefix=PFX Prefix where GTK is installed (optional) --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional) --with-gnome-includes=DIR Specify location of GNOME headers @@ -921,8 +903,6 @@ Some influential environment variables: CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have headers in a nonstandard directory <include dir> CPP C preprocessor - CXX C++ compiler command - CXXFLAGS C++ compiler flags Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -4516,7 +4496,7 @@ echo $ECHO_N "checking for location of tclConfig.sh script... $ECHO_C" >&6 echo "${ECHO_T}$try/tclConfig.sh" >&6 . $try/tclConfig.sh TCL_LIBS=`eval echo "$TCL_LIB_SPEC $TCL_LIBS"` - TCL_DEFS=`echo $TCL_DEFS | sed -e 's/\\ /\\X/' | tr ' ' '\012' | sed -e '/^-[^D]/d' -e '/-D[^_]/d' -e 's/-D_/ -D_/' | tr -d '\012'` + TCL_DEFS=`echo $TCL_DEFS | sed -e 's/\\\\ /\\\\X/g' | tr ' ' '\012' | sed -e '/^-[^D]/d' -e '/-D[^_]/d' -e 's/-D_/ -D_/' | tr '\012' ' ' | sed -e 's/\\\\X/\\\\ /g'` break fi done @@ -6916,7 +6896,6 @@ enable_gui_canon=`echo "_$enable_gui" | \ |