summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff-init.el
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2020-08-12 18:26:20 +0200
committerLars Ingebrigtsen <larsi@gnus.org>2020-08-12 18:26:20 +0200
commit51ea541710e251b7147ace80a227dcbfbe865fb5 (patch)
treee3c9f701f942536d0f1db40d9689a772652e9d08 /lisp/vc/ediff-init.el
parent6cddb736e404f7f4bf15f6644a003aadd56685c2 (diff)
downloademacs-51ea541710e251b7147ace80a227dcbfbe865fb5.tar.gz
emacs-51ea541710e251b7147ace80a227dcbfbe865fb5.tar.bz2
emacs-51ea541710e251b7147ace80a227dcbfbe865fb5.zip
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.
Diffstat (limited to 'lisp/vc/ediff-init.el')
-rw-r--r--lisp/vc/ediff-init.el15
1 files changed, 0 insertions, 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")