diff options
| author | Richard M. Stallman | 2005-08-09 11:26:13 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2005-08-09 11:26:13 +0000 |
| commit | a335c7d56451f7d273f0d9498f0054db0eb8e516 (patch) | |
| tree | 3c03b258370ae5825e34e2495cc0ab8aa860c4ff | |
| parent | 949eb6b06e00fd6750cf00bd2acba9e3cf94444d (diff) | |
| download | emacs-a335c7d56451f7d273f0d9498f0054db0eb8e516.tar.gz emacs-a335c7d56451f7d273f0d9498f0054db0eb8e516.zip | |
Use (featurep 'xemacs).
| -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.") | |||
| 559 | 559 | ||
| 560 | 560 | ||
| 561 | ;; Highlighting | 561 | ;; Highlighting |
| 562 | (defcustom ediff-before-flag-bol (if ediff-xemacs-p (make-glyph "->>") "->>") | 562 | (defcustom ediff-before-flag-bol (if (featurep 'xemacs) (make-glyph "->>") "->>") |
| 563 | "*Flag placed before a highlighted block of differences, if block starts at beginning of a line." | 563 | "*Flag placed before a highlighted block of differences, if block starts at beginning of a line." |
| 564 | :type 'string | 564 | :type 'string |
| 565 | :tag "Region before-flag at beginning of line" | 565 | :tag "Region before-flag at beginning of line" |
| 566 | :group 'ediff) | 566 | :group 'ediff) |
| 567 | 567 | ||
| 568 | (defcustom ediff-after-flag-eol (if ediff-xemacs-p (make-glyph "<<-") "<<-") | 568 | (defcustom ediff-after-flag-eol (if (featurep 'xemacs) (make-glyph "<<-") "<<-") |
| 569 | "*Flag placed after a highlighted block of differences, if block ends at end of a line." | 569 | "*Flag placed after a highlighted block of differences, if block ends at end of a line." |
| 570 | :type 'string | 570 | :type 'string |
| 571 | :tag "Region after-flag at end of line" | 571 | :tag "Region after-flag at end of line" |
| 572 | :group 'ediff) | 572 | :group 'ediff) |
| 573 | 573 | ||
| 574 | (defcustom ediff-before-flag-mol (if ediff-xemacs-p (make-glyph "->>") "->>") | 574 | (defcustom ediff-before-flag-mol (if (featurep 'xemacs) (make-glyph "->>") "->>") |
| 575 | "*Flag placed before a highlighted block of differences, if block starts in mid-line." | 575 | "*Flag placed before a highlighted block of differences, if block starts in mid-line." |
| 576 | :type 'string | 576 | :type 'string |
| 577 | :tag "Region before-flag in the middle of line" | 577 | :tag "Region before-flag in the middle of line" |
| 578 | :group 'ediff) | 578 | :group 'ediff) |
| 579 | (defcustom ediff-after-flag-mol (if ediff-xemacs-p (make-glyph "<<-") "<<-") | 579 | (defcustom ediff-after-flag-mol (if (featurep 'xemacs) (make-glyph "<<-") "<<-") |
| 580 | "*Flag placed after a highlighted block of differences, if block ends in mid-line." | 580 | "*Flag placed after a highlighted block of differences, if block ends in mid-line." |
| 581 | :type 'string | 581 | :type 'string |
| 582 | :tag "Region after-flag in the middle of line" | 582 | :tag "Region after-flag in the middle of line" |
| @@ -1464,7 +1464,7 @@ This default should work without changes." | |||
| 1464 | :group 'ediff) | 1464 | :group 'ediff) |
| 1465 | 1465 | ||
| 1466 | ;; needed to simulate frame-char-width in XEmacs. | 1466 | ;; needed to simulate frame-char-width in XEmacs. |
| 1467 | (defvar ediff-H-glyph (if ediff-xemacs-p (make-glyph "H"))) | 1467 | (defvar ediff-H-glyph (if (featurep 'xemacs) (make-glyph "H"))) |
| 1468 | 1468 | ||
| 1469 | 1469 | ||
| 1470 | ;; Temporary file used for refining difference regions in buffer A. | 1470 | ;; Temporary file used for refining difference regions in buffer A. |