Mercurial > emacs
comparison lisp/ediff-init.el @ 64820:3b8ee785ce35
Use (featurep 'xemacs).
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Tue, 09 Aug 2005 11:26:13 +0000 |
| parents | 41bb365f41c4 |
| children | 3bd95f4f2941 2d92f5c9d6ae |
comparison
equal
deleted
inserted
replaced
| 64819:fe9134f14297 | 64820:3b8ee785ce35 |
|---|---|
| 557 ;; have the same syntax table. Which is not too important. | 557 ;; have the same syntax table. Which is not too important. |
| 558 (ediff-defvar-local ediff-syntax-table nil "") | 558 (ediff-defvar-local ediff-syntax-table nil "") |
| 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" |
| 583 :group 'ediff) | 583 :group 'ediff) |
| 584 | 584 |
| 1462 This default should work without changes." | 1462 This default should work without changes." |
| 1463 :type 'string | 1463 :type 'string |
| 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. |
| 1471 (ediff-defvar-local ediff-temp-file-A nil "") | 1471 (ediff-defvar-local ediff-temp-file-A nil "") |
| 1472 ;; Temporary file used for refining difference regions in buffer B. | 1472 ;; Temporary file used for refining difference regions in buffer B. |