diff options
| author | Dave Love | 2000-07-19 16:00:04 +0000 |
|---|---|---|
| committer | Dave Love | 2000-07-19 16:00:04 +0000 |
| commit | 30729019bed29ab72a3252eb13c29ecba75ef4a5 (patch) | |
| tree | 0a5f324772b602a1b705348fccdfa407ce40458d /lisp | |
| parent | 50575ec215fab586efac2f675c34b7d5410122fc (diff) | |
| download | emacs-30729019bed29ab72a3252eb13c29ecba75ef4a5.tar.gz emacs-30729019bed29ab72a3252eb13c29ecba75ef4a5.zip | |
Fix last checkin.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ediff-init.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el index 852ba19207c..675e23f548e 100644 --- a/lisp/ediff-init.el +++ b/lisp/ediff-init.el | |||
| @@ -831,13 +831,13 @@ appropriate symbol: `rcs', `pcl-cvs', or `generic-sc' if you so desire." | |||
| 831 | 831 | ||
| 832 | (cond ((and is-current diff-num) ; current diff region | 832 | (cond ((and is-current diff-num) ; current diff region |
| 833 | (format "Difference region %S -- current" (1+ diff-num))) | 833 | (format "Difference region %S -- current" (1+ diff-num))) |
| 834 | ;; This doesn't DTRT because we may have got it from the wrong goverlay. | 834 | ;; This doesn't DTRT because we may have got it from the wrong |
| 835 | ;; Fixme. | 835 | ;; goverlay. Fixme. |
| 836 | ;;; (face-help) ; refinement of current diff region | 836 | ;;; (face-help) ; refinement of current diff region |
| 837 | (diff-num ; non-current | 837 | (diff-num ; non-current |
| 838 | (format "Difference region %S -- non-current" (1+ diff-num))) | 838 | (format "Difference region %S -- non-current" (1+ diff-num))) |
| 839 | (t "")) ; none | 839 | (t "")) ; none |
| 840 | ))) | 840 | )) |
| 841 | 841 | ||
| 842 | 842 | ||
| 843 | (defun ediff-set-face-pixmap (face pixmap) | 843 | (defun ediff-set-face-pixmap (face pixmap) |