Mercurial > emacs
view lisp/term/vt125.el @ 66687:26faad662ac6
2005-11-04 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff-merge.el (ediff-merge-region-is-non-clash): return t, if not
merging.
* ediff-util.el (ediff-previous-difference): don't skip regions that
have merge clashes.
author | Michael Kifer <kifer@cs.stonybrook.edu> |
---|---|
date | Fri, 04 Nov 2005 05:40:03 +0000 |
parents | af1c58687bdd |
children | 532e0a9335a9 890cc78a5a24 |
line wrap: on
line source
;; -*- no-byte-compile: t -*- (defun terminal-init-vt125 () "Terminal initialization function for vt125." (load "term/vt100" nil t)) ;;; arch-tag: 1d92d70f-dd55-4a1d-9088-e215a4883801 ;;; vt125.el ends here