Index: emacs/lisp/smerge-mode.el
diff -c emacs/lisp/smerge-mode.el:1.35 emacs/lisp/smerge-mode.el:1.36
*** emacs/lisp/smerge-mode.el:1.35 Fri Jun 10 08:48:07 2005
--- emacs/lisp/smerge-mode.el Thu Jun 16 14:34:12 2005
***************
*** 247,253 ****
(defun smerge-ensure-match (n)
(unless (match-end n)
! (error (format "No `%s'" (aref smerge-match-names n)))))
(defun smerge-auto-leave ()
(when (and smerge-auto-leave
--- 247,253 ----
(defun smerge-ensure-match (n)
(unless (match-end n)
! (error "No `%s'" (aref smerge-match-names n))))
(defun smerge-auto-leave ()
(when (and smerge-auto-leave
_______________________________________________
Emacs-diffs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/emacs-diffs
