Jari> Here is new version that should now compile cleanly. Jari Jari> ;;; cvs-conflict.el --- Minor mode for editing cvs conflicts FYI: There's a problem with viper-mode and this mode. I have not yet resolved it; the keymap is not installed properly (so the menu never appears as well). This occurs with GNU emacsen. Jari, you may want to put your name on there as well. -Jim

Jari, Your installation comment is incorrect - at least for xemacs. The re-search-forward command in my-cvs-conflict fails if the RE cannot be found. Use the following instead: ;; (defun my-cvs-conflict () ;; "Activate CVS conflict as needed." ;; (if (re-search-forward "^\\(<<<<<<< \\|<<<<<<< \\|=======$\\)" nil t) ;; (turn-on-cvs-conflict-mode))) Adding the optional third argument causes it fail silently. -- Jake Colman Principia Partners LLC Phone: (201) 946-0300 Harborside Financial Center Fax: (201) 946-0320 902 Plaza II Beeper: (800) 928-4640 Jersey City, NJ 07311 E-mail: colman(a)ppllc.com E-mail: jcolman(a)jnc.com web: http://www.ppllc.com