Mercurial > emacs
comparison lisp/ediff-init.el @ 35411:be20c22dc16d
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.
author | Michael Kifer <kifer@cs.stonybrook.edu> |
---|---|
date | Fri, 19 Jan 2001 07:13:03 +0000 |
parents | ee8a7170097b |
children | 5d6b76d28b83 |
comparison
equal
deleted
inserted
replaced
35410:94d2751dcb5c | 35411:be20c22dc16d |
---|---|
1665 (concat "..." substr)))) | 1665 (concat "..." substr)))) |
1666 | 1666 |
1667 (defsubst ediff-nonempty-string-p (string) | 1667 (defsubst ediff-nonempty-string-p (string) |
1668 (and (stringp string) (not (string= string "")))) | 1668 (and (stringp string) (not (string= string "")))) |
1669 | 1669 |
1670 (unless (fboundp 'subst-char-in-string) | |
1671 (defun subst-char-in-string (fromchar tochar string &optional inplace) | |
1672 "Replace FROMCHAR with TOCHAR in STRING each time it occurs. | |
1673 Unless optional argument INPLACE is non-nil, return a new string." | |
1674 (let ((i (length string)) | |
1675 (newstr (if inplace string (copy-sequence string)))) | |
1676 (while (> i 0) | |
1677 (setq i (1- i)) | |
1678 (if (eq (aref newstr i) fromchar) | |
1679 (aset newstr i tochar))) | |
1680 newstr))) | |
1681 | |
1670 (defun ediff-abbrev-jobname (jobname) | 1682 (defun ediff-abbrev-jobname (jobname) |
1671 (cond ((eq jobname 'ediff-directories) | 1683 (cond ((eq jobname 'ediff-directories) |
1672 "Compare two directories") | 1684 "Compare two directories") |
1673 ((eq jobname 'ediff-files) | 1685 ((eq jobname 'ediff-files) |
1674 "Compare two files") | 1686 "Compare two files") |