comparison lisp/ediff-help.el @ 91085:880960b70474

Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-283
author Miles Bader <miles@gnu.org>
date Sun, 11 Nov 2007 00:56:44 +0000
parents 4bc33ffdda1a 51aa47312c4b
children 53108e6cea98
comparison
equal deleted inserted replaced
91084:a4347a111894 91085:880960b70474
163 ;; the keymap that defines clicks over the quick help regions 163 ;; the keymap that defines clicks over the quick help regions
164 (defvar ediff-help-region-map (make-sparse-keymap)) 164 (defvar ediff-help-region-map (make-sparse-keymap))
165 165
166 (define-key 166 (define-key
167 ediff-help-region-map 167 ediff-help-region-map
168 (if ediff-emacs-p [mouse-2] [button2]) 168 (if (featurep 'emacs) [mouse-2] [button2])
169 'ediff-help-for-quick-help) 169 'ediff-help-for-quick-help)
170 170
171 ;; runs in the control buffer 171 ;; runs in the control buffer
172 (defun ediff-set-help-overlays () 172 (defun ediff-set-help-overlays ()
173 (goto-char (point-min)) 173 (goto-char (point-min))
175 (while (re-search-forward " *\\([^ \t\n|]+\\||\\) +-[^|\n]+" nil 'noerror) 175 (while (re-search-forward " *\\([^ \t\n|]+\\||\\) +-[^|\n]+" nil 'noerror)
176 (setq beg (match-beginning 0) 176 (setq beg (match-beginning 0)
177 end (match-end 0) 177 end (match-end 0)
178 cmd (buffer-substring (match-beginning 1) (match-end 1))) 178 cmd (buffer-substring (match-beginning 1) (match-end 1)))
179 (setq overl (ediff-make-overlay beg end)) 179 (setq overl (ediff-make-overlay beg end))
180 (if ediff-emacs-p 180 (if (featurep 'emacs)
181 (ediff-overlay-put overl 'mouse-face 'highlight) 181 (ediff-overlay-put overl 'mouse-face 'highlight)
182 (ediff-overlay-put overl 'highlight t)) 182 (ediff-overlay-put overl 'highlight t))
183 (ediff-overlay-put overl 'ediff-help-info cmd)))) 183 (ediff-overlay-put overl 'ediff-help-info cmd))))
184 184
185 185