Mercurial > emacs
comparison lisp/ediff-mult.el @ 64008:3c518762672f
(ediff-mult): Finish `defgroup' description with period.
(ediff-replace-session-activity-marker-in-meta-buffer,
ediff-replace-session-status-in-meta-buffer): "?\ " -> "?\s".
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Mon, 04 Jul 2005 02:01:39 +0000 |
| parents | ea81833c3487 |
| children | 6fb026ad601f |
comparison
equal
deleted
inserted
replaced
| 64007:35df749b5a09 | 64008:3c518762672f |
|---|---|
| 104 ;;; Code: | 104 ;;; Code: |
| 105 | 105 |
| 106 (provide 'ediff-mult) | 106 (provide 'ediff-mult) |
| 107 | 107 |
| 108 (defgroup ediff-mult nil | 108 (defgroup ediff-mult nil |
| 109 "Multi-file and multi-buffer processing in Ediff" | 109 "Multi-file and multi-buffer processing in Ediff." |
| 110 :prefix "ediff-" | 110 :prefix "ediff-" |
| 111 :group 'ediff) | 111 :group 'ediff) |
| 112 | 112 |
| 113 | 113 |
| 114 ;; compiler pacifier | 114 ;; compiler pacifier |
| 855 (defun ediff-replace-session-activity-marker-in-meta-buffer (point new-marker) | 855 (defun ediff-replace-session-activity-marker-in-meta-buffer (point new-marker) |
| 856 (let* ((overl (ediff-get-meta-overlay-at-pos point)) | 856 (let* ((overl (ediff-get-meta-overlay-at-pos point)) |
| 857 (session-info (ediff-overlay-get overl 'ediff-meta-info)) | 857 (session-info (ediff-overlay-get overl 'ediff-meta-info)) |
| 858 (activity-marker (ediff-get-session-activity-marker session-info)) | 858 (activity-marker (ediff-get-session-activity-marker session-info)) |
| 859 buffer-read-only) | 859 buffer-read-only) |
| 860 (or new-marker activity-marker (setq new-marker ?\ )) | 860 (or new-marker activity-marker (setq new-marker ?\s)) |
| 861 (goto-char (ediff-overlay-start overl)) | 861 (goto-char (ediff-overlay-start overl)) |
| 862 (if (eq (char-after (point)) new-marker) | 862 (if (eq (char-after (point)) new-marker) |
| 863 () ; if marker shown in buffer is the same as new-marker, do nothing | 863 () ; if marker shown in buffer is the same as new-marker, do nothing |
| 864 (insert new-marker) | 864 (insert new-marker) |
| 865 (delete-char 1) | 865 (delete-char 1) |
| 870 (defun ediff-replace-session-status-in-meta-buffer (point new-status) | 870 (defun ediff-replace-session-status-in-meta-buffer (point new-status) |
| 871 (let* ((overl (ediff-get-meta-overlay-at-pos point)) | 871 (let* ((overl (ediff-get-meta-overlay-at-pos point)) |
| 872 (session-info (ediff-overlay-get overl 'ediff-meta-info)) | 872 (session-info (ediff-overlay-get overl 'ediff-meta-info)) |
| 873 (status (ediff-get-session-status session-info)) | 873 (status (ediff-get-session-status session-info)) |
| 874 buffer-read-only) | 874 buffer-read-only) |
| 875 (setq new-status (or new-status status ?\ )) | 875 (setq new-status (or new-status status ?\s)) |
| 876 (goto-char (ediff-overlay-start overl)) | 876 (goto-char (ediff-overlay-start overl)) |
| 877 (forward-char 1) ; status is the second char in session record | 877 (forward-char 1) ; status is the second char in session record |
| 878 (if (eq (char-after (point)) new-status) | 878 (if (eq (char-after (point)) new-status) |
| 879 () ; if marker shown in buffer is the same as new-marker, do nothing | 879 () ; if marker shown in buffer is the same as new-marker, do nothing |
| 880 (insert new-status) | 880 (insert new-status) |