Mercurial > emacs
comparison lisp/ediff-util.el @ 14040:187735b53d52
Comment fixes.
author | Karl Heuer <kwzh@gnu.org> |
---|---|
date | Fri, 05 Jan 1996 22:21:28 +0000 |
parents | 41b7a38d7d8c |
children | 83f275dcd93a |
comparison
equal
deleted
inserted
replaced
14039:831c5fda97f4 | 14040:187735b53d52 |
---|---|
731 '(ediff-recenter | 731 '(ediff-recenter |
732 ediff-dir-action ediff-registry-action | 732 ediff-dir-action ediff-registry-action |
733 ediff-patch-action | 733 ediff-patch-action |
734 ediff-toggle-wide-display ediff-toggle-multiframe)) | 734 ediff-toggle-wide-display ediff-toggle-multiframe)) |
735 ;; Or one of the movement cmds and prev cmd was an Ediff cmd | 735 ;; Or one of the movement cmds and prev cmd was an Ediff cmd |
736 ;; This avoids rasing frames unnecessarily. | 736 ;; This avoids raising frames unnecessarily. |
737 (and (memq this-command | 737 (and (memq this-command |
738 '(ediff-next-difference | 738 '(ediff-next-difference |
739 ediff-previous-difference | 739 ediff-previous-difference |
740 ediff-jump-to-difference | 740 ediff-jump-to-difference |
741 ediff-jump-to-difference-at-point)) | 741 ediff-jump-to-difference-at-point)) |
1418 (prev-point 0)) | 1418 (prev-point 0)) |
1419 (while ( and (> end (progn | 1419 (while ( and (> end (progn |
1420 (move-to-window-line lines) | 1420 (move-to-window-line lines) |
1421 (point))) | 1421 (point))) |
1422 ;; `end' may be beyond the window bottom, so check | 1422 ;; `end' may be beyond the window bottom, so check |
1423 ;; that we are making progres | 1423 ;; that we are making progress |
1424 (< prev-point (point))) | 1424 (< prev-point (point))) |
1425 (setq prev-point (point)) | 1425 (setq prev-point (point)) |
1426 (setq lines (1+ lines))) | 1426 (setq lines (1+ lines))) |
1427 ;; And position the beginning on the right line | 1427 ;; And position the beginning on the right line |
1428 (goto-char beg) | 1428 (goto-char beg) |
2960 diff-vector))) | 2960 diff-vector))) |
2961 | 2961 |
2962 | 2962 |
2963 ;;; Misc | 2963 ;;; Misc |
2964 | 2964 |
2965 ;; These two functions are here to neutralize XEmacs unwillingless to | 2965 ;; These two functions are here to neutralize XEmacs's unwillingness to |
2966 ;; handle overlays whose buffers were deleted. | 2966 ;; handle overlays whose buffers were deleted. |
2967 (defun ediff-move-overlay (overlay beg end &optional buffer) | 2967 (defun ediff-move-overlay (overlay beg end &optional buffer) |
2968 "Calls `move-overlay' in Emacs and `set-extent-endpoints' in Lemacs. | 2968 "Calls `move-overlay' in Emacs and `set-extent-endpoints' in Lemacs. |
2969 Checks if overlay's buffer exists before actually doing the move." | 2969 Checks if overlay's buffer exists before actually doing the move." |
2970 (let ((buf (and overlay (ediff-overlay-buffer overlay)))) | 2970 (let ((buf (and overlay (ediff-overlay-buffer overlay)))) |