Mercurial > emacs
comparison lisp/ediff-mult.el @ 90200:f9a65d7ebd29
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-68
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 459-473)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 86-87)
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 07 Jul 2005 12:43:14 +0000 |
parents | a1b34dec1104 6fb026ad601f |
children | fbb2bea03df9 |
comparison
equal
deleted
inserted
replaced
90199:bb71c6cf2009 | 90200:f9a65d7ebd29 |
---|---|
16 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 16 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
17 ;; GNU General Public License for more details. | 17 ;; GNU General Public License for more details. |
18 | 18 |
19 ;; You should have received a copy of the GNU General Public License | 19 ;; You should have received a copy of the GNU General Public License |
20 ;; along with GNU Emacs; see the file COPYING. If not, write to the | 20 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
21 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 21 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
22 ;; Boston, MA 02111-1307, USA. | 22 ;; Boston, MA 02110-1301, USA. |
23 | 23 |
24 ;;; Commentary: | 24 ;;; Commentary: |
25 | 25 |
26 ;; Users are encouraged to add functionality to this file. | 26 ;; Users are encouraged to add functionality to this file. |
27 ;; The present file contains all the infrastructure needed for that. | 27 ;; The present file contains all the infrastructure needed for that. |
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) |