From 51ea541710e251b7147ace80a227dcbfbe865fb5 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Wed, 12 Aug 2020 18:26:20 +0200 Subject: [PATCH] Remove some compat code from ediff-init.el * lisp/vc/ediff-init.el (subst-char-in-string, format-message): Remove aliases to functions that always exist. --- lisp/vc/ediff-init.el | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el index da6509b7cbe..f5177bca112 100644 --- a/lisp/vc/ediff-init.el +++ b/lisp/vc/ediff-init.el @@ -1513,21 +1513,6 @@ This default should work without changes." (defsubst ediff-nonempty-string-p (string) (and (stringp string) (not (string= string "")))) -(unless (fboundp 'subst-char-in-string) - (defun subst-char-in-string (fromchar tochar string &optional inplace) - "Replace FROMCHAR with TOCHAR in STRING each time it occurs. -Unless optional argument INPLACE is non-nil, return a new string." - (let ((i (length string)) - (newstr (if inplace string (copy-sequence string)))) - (while (> i 0) - (setq i (1- i)) - (if (eq (aref newstr i) fromchar) - (aset newstr i tochar))) - newstr))) - -(unless (fboundp 'format-message) - (defalias 'format-message 'format)) - (defun ediff-abbrev-jobname (jobname) (cond ((eq jobname 'ediff-directories) "Compare two directories") -- 2.39.5