diff lisp/vc/smerge-mode.el @ 109785:de5d6a3f1493

* lisp/progmodes/etags.el (tags-file-name): Mark safe if stringp (Bug#6733).
author Chong Yidong <cyd@stupidchicken.com>
date Sat, 14 Aug 2010 19:01:42 -0400
parents d928a6a7c3f2
children c77749185234 68616bb3ae25 80d61d4081a0
line wrap: on
line diff