diff options
128 files changed, 11773 insertions, 2923 deletions
@@ -361,8 +361,7 @@ SRC_MAC = \ src/INSTALLmac.txt \ src/dehqx.py \ src/gui_mac.c \ - src/gui_mac.icns \ - src/doc-txt.icns \ + src/os_mac_rsrc/*.icns \ src/os_mac.h \ src/os_mac.rsr.hqx \ src/os_mac_conv.c \ @@ -522,7 +521,6 @@ RT_SCRIPTS = \ # Unix runtime RT_UNIX = \ README_unix.txt \ - runtime/KVim.desktop \ runtime/hi16-action-make.png \ runtime/hi22-action-make.png \ runtime/vim16x16.png \ diff --git a/runtime/KVim.desktop b/runtime/KVim.desktop deleted file mode 100644 index 25ef20a56f..0000000000 --- a/runtime/KVim.desktop +++ /dev/null @@ -1,44 +0,0 @@ -# KDE Config File -[Desktop Entry] -Type=Application -Exec=kvim -f %F -Icon=kvim -MiniIcon=kvim -DocPath=kvim/index.html -Comment= -Comment[xx]=xx -Terminal=0 -Name=KVim -Name[eo]=VIM-fasado -Name[sv]=Kvim -Name[xx]=xx -Comment=Text Editor -Comment[ar]=محرر نصوص -Comment[bg]=Текст Редактор -Comment[de]=Texteditor -Comment[el]=Διορθωτής Κειμένου -Comment[eo]=Tekstredaktilo -Comment[et]=Tekstiredaktor -Comment[eu]=Testu Editorea -Comment[fi]=Tekstieditori -Comment[he]=עורך טקסט -Comment[is]=Textaritill -Comment[ja]=テキストエディタ -Comment[lt]=Teksto redaktorius -Comment[mt]=Editur tat-test -Comment[pt_BR]=Editor de Texto -Comment[ro]=Editor de text -Comment[ru]=редактор -Comment[sk]=Textový editor -Comment[sl]=Urejevalnik besedil -Comment[ta]=¯¨Ã ¦¾¡ÌôÀ¡Ç÷ -Comment[tr]=Metin Düzenleyici -Comment[uk]=Редактор текстів -Comment[vi]=Trình soạn văn bản -Comment[xx]=xx -Comment[zh_CN]=文本编辑器 -Comment[zh_TW]=文字編輯器 -MimeType=application/mathml+xml;application/xhtml+xml;application/x-perl;application/x-python;application/x-shellscript;audio/x-mpegurl;audio/x-scpls;image/svg+xml;message/news;message/rfc822;text/calendar;text/css;text/english;text/html;text/mrml;text/plain;text/rdf;text/rss;text/rtf;text/sgml;text/vnd.wap.wml;text/x-adasrc;text/x-bibtex;text/x-chdr;text/x-c++hdr;text/x-csrc;text/x-c++src;text/x-csv;text/x-diff;text/x-java;text/x-katefilelist;text/x-latex;text/x-log;text/x-lyx;text/x-makefile;text/xmcd;text/xml;text/x-moc;text/x-mswinurl;text/x-objcsrc;text/x-pascal;text/x-perl;text/x-python;text/x-tcl;text/x-tex;text/x-vcalendar;text/x-vcard;text/x-xslfo;text/x-xslt -X-KDE-StartupNotify=true -X-KDE-AuthorizeAction=shell access - diff --git a/runtime/autoload/gzip.vim b/runtime/autoload/gzip.vim index a6467b8f6d..f6f7bc41d4 100644 --- a/runtime/autoload/gzip.vim +++ b/runtime/autoload/gzip.vim @@ -1,6 +1,6 @@ " Vim autoload file for editing compressed files. " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2005 Jul 26 +" Last Change: 2006 Mar 31 " These functions are used by the gzip plugin. @@ -84,9 +84,14 @@ fun gzip#read(cmd) '[,']d _ endif " read in the uncompressed lines "'[-1r tmp" + " Use ++edit if the buffer was empty, keep the 'ff' and 'fenc' options. setlocal nobin if exists(":lockmarks") - execute "silent lockmarks " . l . "r " . tmp + if empty + execute "silent lockmarks " . l . "r ++edit " . tmp + else + execute "silent lockmarks " . l . "r " . tmp + endif else execute "silent " . l . "r " . tmp endif diff --git a/runtime/autoload/netrw.vim b/runtime/autoload/netrw.vim index 399f671e0d..00a3f3e873 100644 --- a/runtime/autoload/netrw.vim +++ b/runtime/autoload/netrw.vim @@ -1,7 +1,7 @@ " netrw.vim: Handles file transfer and remote directory listing across a network " AUTOLOAD PORTION -" Date: Mar 22, 2006 -" Version: 83 +" Date: Mar 31, 2006 +" Version: 84 " Maintainer: Charles E Campbell, Jr <drchipNOSPAM at campbellfamily dot biz> " GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim " Copyright: Copyright (C) 1999-2005 Charles E. Campbell, Jr. {{{1 @@ -23,7 +23,7 @@ if &cp || exists("g:loaded_netrw") finish endif -let g:loaded_netrw = "v83" +let g:loaded_netrw = "v84" if v:version < 700 echohl WarningMsg | echo "***netrw*** you need vim version 7.0 or later for version ".g:loaded_netrw." of netrw" | echohl None finish @@ -404,8 +404,9 @@ fun! netrw#NetRead(mode,...) call s:NetMethod(choice) " Check if NetBrowse() should be handling this request -" call Decho("checking if netlist: choice<".choice."> netrw_list_cmd<".g:netrw_list_cmd.">") +" call Decho("checking if NetBrowse() should handle choice<".choice."> with netrw_list_cmd<".g:netrw_list_cmd.">") if choice =~ "^.*[\/]$" +" call Decho("yes, choice matches '^.*[\/]$'") keepjumps call s:NetBrowse(choice) " call Dret("NetRead") return @@ -457,6 +458,7 @@ fun! netrw#NetRead(mode,...) elseif b:netrw_method == 2 " read with ftp + <.netrc> " call Decho("read via ftp+.netrc (method #2)") let netrw_fname= escape(b:netrw_fname,g:netrw_fname_escape) +" call Decho("netrw_fname<".netrw_fname.">") new setlocal ff=unix exe "put ='".g:netrw_ftpmode."'" @@ -780,7 +782,7 @@ fun! s:NetGetFile(readcmd, tfile, method) " call Decho("calling NetReadFixup(method<".a:method."> line1=".line1." line2=".line2.")") call NetReadFixup(a:method, line1, line2) " else " Decho -" call Decho("NetReadFixup() not called, doesn't exist") +" call Decho("NetReadFixup() not called, doesn't exist (line1=".line1." line2=".line2.")") endif " update the Buffers menu @@ -1239,7 +1241,6 @@ fun! s:NetBrowse(dirname) |