diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2000-11-24 08:15:11 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2000-11-24 08:15:11 +0000 |
| commit | 49a28b60c8049df91d2984f139961f82b8934152 (patch) | |
| tree | 200f267a16982d0227bd04951841586a1eb78c57 /lisp/ediff-init.el | |
| parent | a6d84693976d78bb48a8a9fd50d00a49f4d6dd1a (diff) | |
| download | emacs-49a28b60c8049df91d2984f139961f82b8934152.tar.gz | |
* ediff-diff.el: Moved variables around to have it compile under NT.
* ediff-help.el (ediff-use-long-help-message): made it customizable.
* ediff-init.el (ediff-abbrev-jobname): use capitalize.
* ediff-wind.el (ediff-skip-unsuitable-frames): deleted the
redundant skip-small-frames test.
* viper-cmd.el (viper-change-state-to-vi): disable overwrite mode.
(viper-downgrade-to-insert): protect against errors in hooks.
* viper-init.el (viper-vi-state-hook,viper-insert-state-hook,
viper-replace-state-hook,viper-emacs-state-hook): do cursor handling.
(viper-restore-cursor-type,viper-set-insert-cursor-type): new
functions.
* viper-util.el (viper-memq-char): bug fixes
* viper.el (viper-mode): fix cursor handling.
Diffstat (limited to 'lisp/ediff-init.el')
| -rw-r--r-- | lisp/ediff-init.el | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el index de8bed967db..4c1fc9b48a3 100644 --- a/lisp/ediff-init.el +++ b/lisp/ediff-init.el @@ -1683,17 +1683,9 @@ Checks if overlay's buffer exists." ((eq jobname 'ediff-merge-directory-revisions-with-ancestor) "Merge dir versions via ancestors") (t - (let* ((str (substring (symbol-name jobname) 6)) - (len (length str)) - (pos 0)) - (while (< pos len) - (if (= pos 0) - (aset str pos (upcase (aref str pos)))) - (if (= (aref str pos) ?-) - (aset str pos ?\ )) - (setq pos (1+ pos))) - str)))) - + (capitalize + (subst-char-in-string ?- ?\ (substring (symbol-name jobname) 6)))) + )) (defsubst ediff-get-region-contents (n buf-type ctrl-buf &optional start end) |