summaryrefslogtreecommitdiff
path: root/lisp/smerge-mode.el
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2005-06-16 14:34:12 +0000
committerJuanma Barranquero <lekktu@gmail.com>2005-06-16 14:34:12 +0000
commit376166e6e670031b0d2d98436cc5f1e8626e02ea (patch)
treeb3d56503aa3adbe3d880c6a3313cc7263b64ed93 /lisp/smerge-mode.el
parent8ac28be569d2f904c913ac2230eaa6f85e0b8d84 (diff)
downloademacs-376166e6e670031b0d2d98436cc5f1e8626e02ea.tar.gz
(smerge-ensure-match): Don't use `format' on `error' arguments.
Diffstat (limited to 'lisp/smerge-mode.el')
-rw-r--r--lisp/smerge-mode.el2
1 files changed, 1 insertions, 1 deletions
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