summaryrefslogtreecommitdiff
path: root/lisp/ediff-init.el
diff options
context:
space:
mode:
authorMichael Kifer <kifer@cs.stonybrook.edu>2001-01-19 07:13:03 +0000
committerMichael Kifer <kifer@cs.stonybrook.edu>2001-01-19 07:13:03 +0000
commit88d26a9d4b164503b8a29ccd25a32557d12fb320 (patch)
treec987a4a92aea7604b9ec804bc2a939c77b131bd1 /lisp/ediff-init.el
parente706b1b3b001f971daef6d6d5008831dd44b25bd (diff)
downloademacs-88d26a9d4b164503b8a29ccd25a32557d12fb320.tar.gz
2001-01-19 Michael Kifer <kifer@cs.sunysb.edu>
* viper.el: call initial-major-mode on startup. * ediff.el (ediff-patch-file): use better defaults. * ediff-vers.el: fix for 8+3 DOS file systems 2001-01-19 Colin Walters <walters@cis.ohio-state.edu> * ediff-util.el (ediff-compare-custom-diffs-maybe): put diff in diff mode, if available. 2001-01-19 Vin Shelton <acs@xemacs.org> * ediff-hook.el (ediff-xemacs-init-menus): fixed add-menu-button 2001-01-19 Steve Youngs <youngs@xemacs.org> * ediff-init.el (subst-char-in-string): Define and use it, unless it's already defined.
Diffstat (limited to 'lisp/ediff-init.el')
-rw-r--r--lisp/ediff-init.el12
1 files changed, 12 insertions, 0 deletions
diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el
index 475d59c061b..bfa77a71fba 100644
--- a/lisp/ediff-init.el
+++ b/lisp/ediff-init.el
@@ -1667,6 +1667,18 @@ Checks if overlay's buffer exists."
(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)))
+
(defun ediff-abbrev-jobname (jobname)
(cond ((eq jobname 'ediff-directories)
"Compare two directories")