Mercurial > emacs
comparison lisp/ediff-util.el @ 90201:fbb2bea03df9
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-69
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 474-484)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 88-91)
- Merge from emacs--cvs-trunk--0
- Update FSF's address in GPL notices
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 14 Jul 2005 08:02:00 +0000 |
parents | f9a65d7ebd29 a4c59075cac8 |
children | 2d92f5c9d6ae |
comparison
equal
deleted
inserted
replaced
90200:f9a65d7ebd29 | 90201:fbb2bea03df9 |
---|---|
115 Commands: | 115 Commands: |
116 \\{ediff-mode-map}" | 116 \\{ediff-mode-map}" |
117 (kill-all-local-variables) | 117 (kill-all-local-variables) |
118 (setq major-mode 'ediff-mode) | 118 (setq major-mode 'ediff-mode) |
119 (setq mode-name "Ediff") | 119 (setq mode-name "Ediff") |
120 (run-mode-hooks 'ediff-mode-hook)) | 120 ;; We use run-hooks instead of run-mode-hooks for two reasons. |
121 ;; The ediff control buffer is read-only and it is not supposed to be | |
122 ;; modified by minor modes and such. So, run-mode-hooks doesn't do anything | |
123 ;; useful here on top of what run-hooks does. | |
124 ;; Second, changing run-hooks to run-mode-hooks would require an | |
125 ;; if-statement, since XEmacs doesn't have this. | |
126 (run-hooks 'ediff-mode-hook)) | |
121 | 127 |
122 | 128 |
123 | 129 |
124 ;;; Build keymaps | 130 ;;; Build keymaps |
125 | 131 |
3786 (if (ediff-has-face-support-p) | 3792 (if (ediff-has-face-support-p) |
3787 (let ((overlay (ediff-get-symbol-from-alist | 3793 (let ((overlay (ediff-get-symbol-from-alist |
3788 type ediff-current-diff-overlay-alist)) | 3794 type ediff-current-diff-overlay-alist)) |
3789 (buffer (ediff-get-buffer type)) | 3795 (buffer (ediff-get-buffer type)) |
3790 (face (face-name | 3796 (face (face-name |
3791 (symbol-value | 3797 (ediff-get-symbol-from-alist |
3792 (ediff-get-symbol-from-alist | 3798 type ediff-current-diff-face-alist)))) |
3793 type ediff-current-diff-face-alist))))) | |
3794 (set overlay | 3799 (set overlay |
3795 (ediff-make-bullet-proof-overlay (point-max) (point-max) buffer)) | 3800 (ediff-make-bullet-proof-overlay (point-max) (point-max) buffer)) |
3796 (ediff-set-overlay-face (symbol-value overlay) face) | 3801 (ediff-set-overlay-face (symbol-value overlay) face) |
3797 (ediff-overlay-put (symbol-value overlay) 'ediff ediff-control-buffer)) | 3802 (ediff-overlay-put (symbol-value overlay) 'ediff ediff-control-buffer)) |
3798 )) | 3803 )) |