To: vim-dev@vim.org Subject: Patch 5.8.002 Fcc: outbox From: Bram Moolenaar ------------ Patch 5.8.002 Problem: The dtd.vim syntax file contained a few items that require Vim 6.0. Solution: Made the syntax file portable. (Johannes Zellner) Files: runtime/syntax/dtd.vim *** ../vim-5.8.001/runtime/syntax/dtd.vim Mon Jun 4 22:16:06 2001 --- runtime/syntax/dtd.vim Wed Jun 6 18:35:20 2001 *************** *** 3,23 **** " Maintainer: Johannes Zellner " Author and previous maintainer: " Daniel Amyot ! " Last Change: Mon, 21 May 2001 13:13:43 +0200 " Filenames: *.dtd " URL: http://www.zellner.org/vim/syntax/dtd.vim - " $Id: dtd.vim,v 1.7 2001/05/21 11:16:39 joze Exp $ - " - " - " CREDITS: - " - original note of Daniel Amyot : - " This file is an adaptation of pascal.vim by Mario Eusebio - " I'm not sure I understand all of the syntax highlight language, - " but this file seems to do the job for simple DTD in XML. - " This would have to be extended to cover the whole of SGML DTDs though. - " Unfortunately, I don't know enough about the somewhat complex SGML - " to do it myself. Volunteers are most welcomed! - " " " REFERENCES: " http://www.w3.org/TR/html40/ --- 3,11 ---- " Maintainer: Johannes Zellner " Author and previous maintainer: " Daniel Amyot ! " Last Change: Wed, 06 Jun 2001 14:07:20 +0200 " Filenames: *.dtd " URL: http://www.zellner.org/vim/syntax/dtd.vim " " REFERENCES: " http://www.w3.org/TR/html40/ *************** *** 26,39 **** " TODO: " - improve synchronizing. ! " Quit when a syntax file was already loaded ! if exists("b:current_syntax") ! finish endif - let s:dtd_cpo_save = &cpo - set cpo&vim - if !exists("dtd_ignore_case") " I prefer having the case takes into consideration. syn case match --- 14,31 ---- " TODO: " - improve synchronizing. ! if version < 600 ! syntax clear ! let __dtd_cpo_save__ = &cpo ! set cpo& ! else ! if exists("b:current_syntax") ! finish ! endif ! let s:dtd_cpo_save = &cpo ! set cpo&vim endif if !exists("dtd_ignore_case") " I prefer having the case takes into consideration. syn case match *************** *** 134,165 **** syn sync lines=250 ! " The default highlighting. ! hi def link dtdFunction Function ! hi def link dtdTag Normal ! hi def link dtdType Type ! hi def link dtdAttrType dtdType ! hi def link dtdAttrDef dtdType ! hi def link dtdConstant Constant ! hi def link dtdString dtdConstant ! hi def link dtdEnum dtdConstant ! hi def link dtdCard dtdFunction ! ! hi def link dtdEntity Statement ! hi def link dtdEntityPunct dtdType ! hi def link dtdParamEntityInst dtdConstant ! hi def link dtdParamEntityPunct dtdType ! hi def link dtdParamEntityDecl dtdType ! hi def link dtdParamEntityDPunct dtdComment ! ! hi def link dtdComment Comment ! hi def link dtdTagName Statement ! hi def link dtdError Error ! hi def link dtdTodo Todo ! let b:current_syntax = "dtd" ! let &cpo = s:dtd_cpo_save ! unlet s:dtd_cpo_save " vim: ts=8 --- 126,176 ---- syn sync lines=250 ! " Define the default highlighting. ! " For version 5.7 and earlier: only when not done already ! " For version 5.8 and later: only when an item doesn't have highlighting yet ! if version >= 508 || !exists("did_dtd_syn_inits") ! if version < 508 ! let did_dtd_syn_inits = 1 ! command -nargs=+ HiLink hi link ! else ! command -nargs=+ HiLink hi def link ! endif ! ! " The default highlighting. ! HiLink dtdFunction Function ! HiLink dtdTag Normal ! HiLink dtdType Type ! HiLink dtdAttrType dtdType ! HiLink dtdAttrDef dtdType ! HiLink dtdConstant Constant ! HiLink dtdString dtdConstant ! HiLink dtdEnum dtdConstant ! HiLink dtdCard dtdFunction ! ! HiLink dtdEntity Statement ! HiLink dtdEntityPunct dtdType ! HiLink dtdParamEntityInst dtdConstant ! HiLink dtdParamEntityPunct dtdType ! HiLink dtdParamEntityDecl dtdType ! HiLink dtdParamEntityDPunct dtdComment ! ! HiLink dtdComment Comment ! HiLink dtdTagName Statement ! HiLink dtdError Error ! HiLink dtdTodo Todo ! delcommand HiLink ! endif ! if version < 600 ! let &cpo = __dtd_cpo_save__ ! unlet __dtd_cpo_save__ ! else ! let &cpo = s:dtd_cpo_save ! unlet s:dtd_cpo_save ! endif ! ! let b:current_syntax = "dtd" " vim: ts=8 *** ../vim-5.8.001/src/version.c Wed Jun 6 19:11:47 2001 --- src/version.c Wed Jun 6 19:10:56 2001 *************** *** 439,440 **** --- 439,442 ---- { /* Add new patch number below this line */ + /**/ + 2, /**/ -- hundred-and-one symptoms of being an internet addict: 145. You e-mail your boss, informing him you'll be late. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org ///