To: vim-dev@vim.org Subject: Patch 6.1.164 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.1.164 Problem: If 'modifiable' is off, converting to xxd fails and 'filetype' is changed to "xxd" anyway. Solution: Don't change 'filetype' when conversion failed. Files: runtime/menu.vim *** ../vim61.163/runtime/menu.vim Mon Aug 12 20:57:48 2002 --- runtime/menu.vim Fri Aug 23 21:39:58 2002 *************** *** 2,8 **** " You can also use this as a start for your own set of menus. " " Maintainer: Bram Moolenaar ! " Last Change: 2002 Aug 12 " Note that ":an" (short for ":anoremenu") is often used to make a menu work " in all modes and avoid side effects from mappings defined by the user. --- 2,8 ---- " You can also use this as a start for your own set of menus. " " Maintainer: Bram Moolenaar ! " Last Change: 2002 Aug 23 " Note that ":an" (short for ":anoremenu") is often used to make a menu work " in all modes and avoid side effects from mappings defined by the user. *************** *** 448,454 **** call s:XxdFind() exe '%!"' . g:xxdprogram . '"' endif ! set ft=xxd let &mod = mod endfun --- 448,456 ---- call s:XxdFind() exe '%!"' . g:xxdprogram . '"' endif ! if getline(1) =~ "^0000000:" " only if it worked ! set ft=xxd ! endif let &mod = mod endfun *** ../vim61.163/src/version.c Thu Aug 22 21:41:19 2002 --- src/version.c Sat Aug 24 23:18:31 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 164, /**/ -- He was not in the least bit scared to be mashed into a pulp Or to have his eyes gouged out and his elbows broken; To have his kneecaps split and his body burned away And his limbs all hacked and mangled, brave Sir Robin. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ /// Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim \\\ \\\ Project leader for A-A-P -- http://www.a-a-p.org /// \\\ Lord Of The Rings helps Uganda - http://iccf-holland.org/lotr.html ///