Mercurial > emacs
comparison lisp/ediff-util.el @ 64215:a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
(viper-normalize-minor-mode-map-alist): use viper--key-maps and
emulation-mode-map-alists.
(viper-envelop-ESC-key): use viper-subseq.
(viper-search-forward/backward/next): disable debug-on-error.
* viper-keym.el (viper-toggle-key,viper-quoted-insert-key,
viper-ESC-key): new defcustoms.
* viper-macs.el (ex-map-read-args): use viper-subseq.
* viper-util.el (viper-key-to-emacs-key): use viper-subseq.
(viper-subseq): copy of subseq from cl.el.
* viper.el (viper-go-away,viper-set-hooks): use
emulation-mode-map-alists, advise self-insert-command, add-minor-mode.
* viper-mous.el (viper-current-frame-saved): use defvar.
* viper-init.el: got rid of -face in face names.
* ediff-diff.el (ediff-extract-diffs,ediff-extract-diffs3):
Make it work with longlines mode
* ediff-mult.el (ediff-meta-mode-hook): new variable.
* ediff-ptch.el (ediff-file-name-sans-prefix): quote regexp.
* ediff-init: got rid of -face in face names.
author | Michael Kifer <kifer@cs.stonybrook.edu> |
---|---|
date | Sun, 10 Jul 2005 18:46:24 +0000 |
parents | 6fb026ad601f |
children | 41bb365f41c4 fbb2bea03df9 |
comparison
equal
deleted
inserted
replaced
64214:0441edbff1bf | 64215:a4c59075cac8 |
---|---|
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 )) |