From: Juanma Barranquero <lekktu@gmail.com>
Date: Thu, 16 Jun 2005 14:34:12 +0000 (+0000)
Subject: (smerge-ensure-match): Don't use `format' on `error' arguments.
X-Git-Tag: emacs-pretest-22.0.90~8894
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=376166e6e670031b0d2d98436cc5f1e8626e02ea;p=emacs.git

(smerge-ensure-match): Don't use `format' on `error' arguments.
---

diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index cf93ad12cd9..55000391777 100644
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -247,7 +247,7 @@ Can be nil if the style is undecided, or else:
 
 (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