diff options
| author | Richard M. Stallman <rms@gnu.org> | 2005-08-09 11:26:13 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 2005-08-09 11:26:13 +0000 |
| commit | a335c7d56451f7d273f0d9498f0054db0eb8e516 (patch) | |
| tree | 3c03b258370ae5825e34e2495cc0ab8aa860c4ff /lisp/ediff-init.el | |
| parent | 949eb6b06e00fd6750cf00bd2acba9e3cf94444d (diff) | |
| download | emacs-a335c7d56451f7d273f0d9498f0054db0eb8e516.tar.gz | |
Use (featurep 'xemacs).
Diffstat (limited to 'lisp/ediff-init.el')
| -rw-r--r-- | lisp/ediff-init.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el index ae4c7c59c09..5bffea1ec4b 100644 --- a/lisp/ediff-init.el +++ b/lisp/ediff-init.el @@ -559,24 +559,24 @@ See the documentation string of `ediff-focus-on-regexp-matches' for details.") ;; Highlighting -(defcustom ediff-before-flag-bol (if ediff-xemacs-p (make-glyph "->>") "->>") +(defcustom ediff-before-flag-bol (if (featurep 'xemacs) (make-glyph "->>") "->>") "*Flag placed before a highlighted block of differences, if block starts at beginning of a line." :type 'string :tag "Region before-flag at beginning of line" :group 'ediff) -(defcustom ediff-after-flag-eol (if ediff-xemacs-p (make-glyph "<<-") "<<-") +(defcustom ediff-after-flag-eol (if (featurep 'xemacs) (make-glyph "<<-") "<<-") "*Flag placed after a highlighted block of differences, if block ends at end of a line." :type 'string :tag "Region after-flag at end of line" :group 'ediff) -(defcustom ediff-before-flag-mol (if ediff-xemacs-p (make-glyph "->>") "->>") +(defcustom ediff-before-flag-mol (if (featurep 'xemacs) (make-glyph "->>") "->>") "*Flag placed before a highlighted block of differences, if block starts in mid-line." :type 'string :tag "Region before-flag in the middle of line" :group 'ediff) -(defcustom ediff-after-flag-mol (if ediff-xemacs-p (make-glyph "<<-") "<<-") +(defcustom ediff-after-flag-mol (if (featurep 'xemacs) (make-glyph "<<-") "<<-") "*Flag placed after a highlighted block of differences, if block ends in mid-line." :type 'string :tag "Region after-flag in the middle of line" @@ -1464,7 +1464,7 @@ This default should work without changes." :group 'ediff) ;; needed to simulate frame-char-width in XEmacs. -(defvar ediff-H-glyph (if ediff-xemacs-p (make-glyph "H"))) +(defvar ediff-H-glyph (if (featurep 'xemacs) (make-glyph "H"))) ;; Temporary file used for refining difference regions in buffer A. |