diff options
| author | Miles Bader <miles@gnu.org> | 2007-11-11 00:56:44 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-11-11 00:56:44 +0000 |
| commit | f23d76bdefbd4c06e14d69e99e50d35ce91c8226 (patch) | |
| tree | ded28d1da6df2d0135514bac83074f4ca1c9099a /lisp/ediff-help.el | |
| parent | e2d092da5980a7d05a5428074f8eb4925fa801e8 (diff) | |
| parent | a457417ee5ba797ab1c91d35ee957bb7a7f8d4b6 (diff) | |
| download | emacs-f23d76bdefbd4c06e14d69e99e50d35ce91c8226.tar.gz emacs-f23d76bdefbd4c06e14d69e99e50d35ce91c8226.tar.bz2 emacs-f23d76bdefbd4c06e14d69e99e50d35ce91c8226.zip | |
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-283
Diffstat (limited to 'lisp/ediff-help.el')
| -rw-r--r-- | lisp/ediff-help.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/ediff-help.el b/lisp/ediff-help.el index 1c7a72870fe..0c37be31372 100644 --- a/lisp/ediff-help.el +++ b/lisp/ediff-help.el @@ -165,7 +165,7 @@ the value of this variable and the variables `ediff-help-message-*' in (define-key ediff-help-region-map - (if ediff-emacs-p [mouse-2] [button2]) + (if (featurep 'emacs) [mouse-2] [button2]) 'ediff-help-for-quick-help) ;; runs in the control buffer @@ -177,7 +177,7 @@ the value of this variable and the variables `ediff-help-message-*' in end (match-end 0) cmd (buffer-substring (match-beginning 1) (match-end 1))) (setq overl (ediff-make-overlay beg end)) - (if ediff-emacs-p + (if (featurep 'emacs) (ediff-overlay-put overl 'mouse-face 'highlight) (ediff-overlay-put overl 'highlight t)) (ediff-overlay-put overl 'ediff-help-info cmd)))) |