diff options
| author | Juanma Barranquero | 2005-06-16 14:34:12 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2005-06-16 14:34:12 +0000 |
| commit | 376166e6e670031b0d2d98436cc5f1e8626e02ea (patch) | |
| tree | b3d56503aa3adbe3d880c6a3313cc7263b64ed93 | |
| parent | 8ac28be569d2f904c913ac2230eaa6f85e0b8d84 (diff) | |
| download | emacs-376166e6e670031b0d2d98436cc5f1e8626e02ea.tar.gz emacs-376166e6e670031b0d2d98436cc5f1e8626e02ea.zip | |
(smerge-ensure-match): Don't use `format' on `error' arguments.
| -rw-r--r-- | lisp/smerge-mode.el | 2 |
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: | |||
| 247 | 247 | ||
| 248 | (defun smerge-ensure-match (n) | 248 | (defun smerge-ensure-match (n) |
| 249 | (unless (match-end n) | 249 | (unless (match-end n) |
| 250 | (error (format "No `%s'" (aref smerge-match-names n))))) | 250 | (error "No `%s'" (aref smerge-match-names n)))) |
| 251 | 251 | ||
| 252 | (defun smerge-auto-leave () | 252 | (defun smerge-auto-leave () |
| 253 | (when (and smerge-auto-leave | 253 | (when (and smerge-auto-leave |