Index: emacs/lisp/ediff-init.el
diff -c emacs/lisp/ediff-init.el:1.72 emacs/lisp/ediff-init.el:1.73
*** emacs/lisp/ediff-init.el:1.72 Sat Aug 6 22:13:42 2005
--- emacs/lisp/ediff-init.el Tue Aug 9 11:26:13 2005
***************
*** 559,582 ****
;; Highlighting
! (defcustom ediff-before-flag-bol (if ediff-xemacs-p (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 "<<-") "<<-")
"*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 "->>") "->>")
"*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 "<<-") "<<-")
"*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"
--- 559,582 ----
;; Highlighting
! (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 (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 (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 (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,1470 ****
:group 'ediff)
;; needed to simulate frame-char-width in XEmacs.
! (defvar ediff-H-glyph (if ediff-xemacs-p (make-glyph "H")))
;; Temporary file used for refining difference regions in buffer A.
--- 1464,1470 ----
:group 'ediff)
;; needed to simulate frame-char-width in XEmacs.
! (defvar ediff-H-glyph (if (featurep 'xemacs) (make-glyph "H")))
;; Temporary file used for refining difference regions in buffer A.
_______________________________________________
Emacs-diffs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/emacs-diffs
