# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1118932452 0
# Node ID 31f53cf9430399fffd1a8d9c878a4c9ca5fb6f8b
# Parent  eb15f8c9bc85d1c25144f65299b5ff9da8b468f2
(smerge-ensure-match): Don't use `format' on `error' arguments.

diff -r eb15f8c9bc85 -r 31f53cf94303 lisp/smerge-mode.el
--- a/lisp/smerge-mode.el	Thu Jun 16 14:31:44 2005 +0000
+++ b/lisp/smerge-mode.el	Thu Jun 16 14:34:12 2005 +0000
@@ -247,7 +247,7 @@
 
 (defun smerge-ensure-match (n)
   (unless (match-end n)
-    (error (format "No `%s'" (aref smerge-match-names n)))))
+    (error "No `%s'" (aref smerge-match-names n))))
 
 (defun smerge-auto-leave ()
   (when (and smerge-auto-leave