/[emacs]/emacs/lisp/ediff-init.el
ViewVC logotype

Diff of /emacs/lisp/ediff-init.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.70 by lute, Mon Jul 4 23:08:53 2005 UTC revision 1.71 by kifer, Sun Jul 10 18:46:24 2005 UTC
# Line 854  to temp files when Ediff needs to find f Line 854  to temp files when Ediff needs to find f
854    
855  ;; A-list of current-diff-face-* symbols associated with buf types  ;; A-list of current-diff-face-* symbols associated with buf types
856  (defconst ediff-current-diff-face-alist  (defconst ediff-current-diff-face-alist
857    '((A . ediff-current-diff-face-A)    '((A . ediff-current-diff-A)
858      (B . ediff-current-diff-face-B)      (B . ediff-current-diff-B)
859      (C . ediff-current-diff-face-C)      (C . ediff-current-diff-C)
860      (Ancestor . ediff-current-diff-face-Ancestor)))      (Ancestor . ediff-current-diff-Ancestor)))
861    
862    
863  (defun ediff-set-overlay-face (extent face)  (defun ediff-set-overlay-face (extent face)
# Line 915  to temp files when Ediff needs to find f Line 915  to temp files when Ediff needs to find f
915        (t                     (:inverse-video t))))        (t                     (:inverse-video t))))
916    "Face for highlighting the selected difference in buffer A."    "Face for highlighting the selected difference in buffer A."
917    :group 'ediff-highlighting)    :group 'ediff-highlighting)
 ;; backward-compatibility alias  
 (put 'ediff-current-diff-face-A 'face-alias 'ediff-current-diff-A)  
918  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
919  ;; this variable is set to nil, then again to the appropriate face.  ;; this variable is set to nil, then again to the appropriate face.
920  (defvar ediff-current-diff-face-A 'ediff-current-diff-A  (defvar ediff-current-diff-face-A 'ediff-current-diff-A
# Line 924  to temp files when Ediff needs to find f Line 922  to temp files when Ediff needs to find f
922  DO NOT CHANGE this variable.  Instead, use the customization  DO NOT CHANGE this variable.  Instead, use the customization
923  widget to customize the actual face object `ediff-current-diff-A'  widget to customize the actual face object `ediff-current-diff-A'
924  this variable represents.")  this variable represents.")
925  (ediff-hide-face 'ediff-current-diff-A)  (ediff-hide-face ediff-current-diff-face-A)
926  ;; Until custom.el for XEmacs starts supporting :inverse-video we do this.  ;; Until custom.el for XEmacs starts supporting :inverse-video we do this.
927  ;; This means that some user customization may be trashed.  ;; This means that some user customization may be trashed.
928  (if (and ediff-xemacs-p  (if (and ediff-xemacs-p
929           (ediff-has-face-support-p)           (ediff-has-face-support-p)
930           (not (ediff-color-display-p)))           (not (ediff-color-display-p)))
931      (copy-face 'modeline 'ediff-current-diff-A))      (copy-face 'modeline ediff-current-diff-face-A))
932    
933    
934    
# Line 948  this variable represents.") Line 946  this variable represents.")
946        (t                     (:inverse-video t))))        (t                     (:inverse-video t))))
947    "Face for highlighting the selected difference in buffer B."    "Face for highlighting the selected difference in buffer B."
948    :group 'ediff-highlighting)    :group 'ediff-highlighting)
 ;; backward-compatibility alias  
 (put 'ediff-current-diff-face-B 'face-alias 'ediff-current-diff-B)  
949  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
950  ;; this variable is set to nil, then again to the appropriate face.  ;; this variable is set to nil, then again to the appropriate face.
951  (defvar ediff-current-diff-face-B 'ediff-current-diff-B  (defvar ediff-current-diff-face-B 'ediff-current-diff-B
# Line 957  this variable represents.") Line 953  this variable represents.")
953   this variable.  Instead, use the customization   this variable.  Instead, use the customization
954  widget to customize the actual face `ediff-current-diff-B'  widget to customize the actual face `ediff-current-diff-B'
955  this variable represents.")  this variable represents.")
956  (ediff-hide-face 'ediff-current-diff-B)  (ediff-hide-face ediff-current-diff-face-B)
957  ;; Until custom.el for XEmacs starts supporting :inverse-video we do this.  ;; Until custom.el for XEmacs starts supporting :inverse-video we do this.
958  ;; This means that some user customization may be trashed.  ;; This means that some user customization may be trashed.
959  (if (and ediff-xemacs-p  (if (and ediff-xemacs-p
960           (ediff-has-face-support-p)           (ediff-has-face-support-p)
961           (not (ediff-color-display-p)))           (not (ediff-color-display-p)))
962      (copy-face 'modeline 'ediff-current-diff-B))      (copy-face 'modeline ediff-current-diff-face-B))
963    
964    
965  (defface ediff-current-diff-C  (defface ediff-current-diff-C
# Line 978  this variable represents.") Line 974  this variable represents.")
974        (t                     (:inverse-video t))))        (t                     (:inverse-video t))))
975    "Face for highlighting the selected difference in buffer C."    "Face for highlighting the selected difference in buffer C."
976    :group 'ediff-highlighting)    :group 'ediff-highlighting)
 ;; backward-compatibility alias  
 (put 'ediff-current-diff-face-C 'face-alias 'ediff-current-diff-C)  
977  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
978  ;; this variable is set to nil, then again to the appropriate face.  ;; this variable is set to nil, then again to the appropriate face.
979  (defvar ediff-current-diff-face-C 'ediff-current-diff-C  (defvar ediff-current-diff-face-C 'ediff-current-diff-C
# Line 987  this variable represents.") Line 981  this variable represents.")
981  DO NOT CHANGE this variable.  Instead, use the customization  DO NOT CHANGE this variable.  Instead, use the customization
982  widget to customize the actual face object `ediff-current-diff-C'  widget to customize the actual face object `ediff-current-diff-C'
983  this variable represents.")  this variable represents.")
984  (ediff-hide-face 'ediff-current-diff-C)  (ediff-hide-face ediff-current-diff-face-C)
985  ;; Until custom.el for XEmacs starts supporting :inverse-video we do this.  ;; Until custom.el for XEmacs starts supporting :inverse-video we do this.
986  ;; This means that some user customization may be trashed.  ;; This means that some user customization may be trashed.
987  (if (and ediff-xemacs-p  (if (and ediff-xemacs-p
988           (ediff-has-face-support-p)           (ediff-has-face-support-p)
989           (not (ediff-color-display-p)))           (not (ediff-color-display-p)))
990      (copy-face 'modeline 'ediff-current-diff-C))      (copy-face 'modeline ediff-current-diff-face-C))
991    
992    
993  (defface ediff-current-diff-Ancestor  (defface ediff-current-diff-Ancestor
# Line 1008  this variable represents.") Line 1002  this variable represents.")
1002        (t (:inverse-video t))))        (t (:inverse-video t))))
1003    "Face for highlighting the selected difference in buffer Ancestor."    "Face for highlighting the selected difference in buffer Ancestor."
1004    :group 'ediff-highlighting)    :group 'ediff-highlighting)
 ;; backward-compatibility alias  
 (put 'ediff-current-diff-face-Ancestor 'face-alias 'ediff-current-diff-Ancestor)  
1005  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
1006  ;; this variable is set to nil, then again to the appropriate face.  ;; this variable is set to nil, then again to the appropriate face.
1007  (defvar ediff-current-diff-face-Ancestor 'ediff-current-diff-Ancestor  (defvar ediff-current-diff-face-Ancestor 'ediff-current-diff-Ancestor
# Line 1017  this variable represents.") Line 1009  this variable represents.")
1009  DO NOT CHANGE this variable.  Instead, use the customization  DO NOT CHANGE this variable.  Instead, use the customization
1010  widget to customize the actual face object `ediff-current-diff-Ancestor'  widget to customize the actual face object `ediff-current-diff-Ancestor'
1011  this variable represents.")  this variable represents.")
1012  (ediff-hide-face 'ediff-current-diff-Ancestor)  (ediff-hide-face ediff-current-diff-face-Ancestor)
1013  ;; Until custom.el for XEmacs starts supporting :inverse-video we do this.  ;; Until custom.el for XEmacs starts supporting :inverse-video we do this.
1014  ;; This means that some user customization may be trashed.  ;; This means that some user customization may be trashed.
1015  (if (and ediff-xemacs-p  (if (and ediff-xemacs-p
1016           (ediff-has-face-support-p)           (ediff-has-face-support-p)
1017           (not (ediff-color-display-p)))           (not (ediff-color-display-p)))
1018      (copy-face 'modeline 'ediff-current-diff-Ancestor))      (copy-face 'modeline ediff-current-diff-face-Ancestor))
1019    
1020    
1021  (defface ediff-fine-diff-A  (defface ediff-fine-diff-A
# Line 1038  this variable represents.") Line 1030  this variable represents.")
1030        (t (:underline t :stipple "gray3"))))        (t (:underline t :stipple "gray3"))))
1031    "Face for highlighting the refinement of the selected diff in buffer A."    "Face for highlighting the refinement of the selected diff in buffer A."
1032    :group 'ediff-highlighting)    :group 'ediff-highlighting)
 ;; backward-compatibility alias  
 (put 'ediff-fine-diff-face-A 'face-alias 'ediff-fine-diff-A)  
1033  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
1034  ;; this variable is set to nil, then again to the appropriate face.  ;; this variable is set to nil, then again to the appropriate face.
1035  (defvar ediff-fine-diff-face-A 'ediff-fine-diff-A  (defvar ediff-fine-diff-face-A 'ediff-fine-diff-A
# Line 1047  this variable represents.") Line 1037  this variable represents.")
1037  DO NOT CHANGE this variable.  Instead, use the customization  DO NOT CHANGE this variable.  Instead, use the customization
1038  widget to customize the actual face object `ediff-fine-diff-A'  widget to customize the actual face object `ediff-fine-diff-A'
1039  this variable represents.")  this variable represents.")
1040  (ediff-hide-face 'ediff-fine-diff-A)  (ediff-hide-face ediff-fine-diff-face-A)
1041    
1042  (defface ediff-fine-diff-B  (defface ediff-fine-diff-B
1043    (if ediff-emacs-p    (if ediff-emacs-p
# Line 1061  this variable represents.") Line 1051  this variable represents.")
1051        (t                     (:underline t :stipple "gray3"))))        (t                     (:underline t :stipple "gray3"))))
1052    "Face for highlighting the refinement of the selected diff in buffer B."    "Face for highlighting the refinement of the selected diff in buffer B."
1053    :group 'ediff-highlighting)    :group 'ediff-highlighting)
 ;; backward-compatibility alias  
 (put 'ediff-fine-diff-face-B 'face-alias 'ediff-fine-diff-B)  
1054  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
1055  ;; this variable is set to nil, then again to the appropriate face.  ;; this variable is set to nil, then again to the appropriate face.
1056  (defvar ediff-fine-diff-face-B 'ediff-fine-diff-B  (defvar ediff-fine-diff-face-B 'ediff-fine-diff-B
# Line 1070  this variable represents.") Line 1058  this variable represents.")
1058  DO NOT CHANGE this variable.  Instead, use the customization  DO NOT CHANGE this variable.  Instead, use the customization
1059  widget to customize the actual face object `ediff-fine-diff-B'  widget to customize the actual face object `ediff-fine-diff-B'
1060  this variable represents.")  this variable represents.")
1061  (ediff-hide-face 'ediff-fine-diff-B)  (ediff-hide-face ediff-fine-diff-face-B)
1062    
1063  (defface ediff-fine-diff-C  (defface ediff-fine-diff-C
1064    (if ediff-emacs-p    (if ediff-emacs-p
# Line 1089  this variable represents.") Line 1077  this variable represents.")
1077        (t (:underline t :stipple "gray3"))))        (t (:underline t :stipple "gray3"))))
1078    "Face for highlighting the refinement of the selected diff in buffer C."    "Face for highlighting the refinement of the selected diff in buffer C."
1079    :group 'ediff-highlighting)    :group 'ediff-highlighting)
 ;; backward-compatibility alias  
 (put 'ediff-fine-diff-face-C 'face-alias 'ediff-fine-diff-C)  
1080  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
1081  ;; this variable is set to nil, then again to the appropriate face.  ;; this variable is set to nil, then again to the appropriate face.
1082  (defvar ediff-fine-diff-face-C 'ediff-fine-diff-C  (defvar ediff-fine-diff-face-C 'ediff-fine-diff-C
# Line 1098  this variable represents.") Line 1084  this variable represents.")
1084  DO NOT CHANGE this variable.  Instead, use the customization  DO NOT CHANGE this variable.  Instead, use the customization
1085  widget to customize the actual face object `ediff-fine-diff-C'  widget to customize the actual face object `ediff-fine-diff-C'
1086  this variable represents.")  this variable represents.")
1087  (ediff-hide-face 'ediff-fine-diff-C)  (ediff-hide-face ediff-fine-diff-face-C)
1088    
1089  (defface ediff-fine-diff-Ancestor  (defface ediff-fine-diff-Ancestor
1090    (if ediff-emacs-p    (if ediff-emacs-p
# Line 1114  this variable represents.") Line 1100  this variable represents.")
1100  At present, this face is not used and no fine differences are computed for the  At present, this face is not used and no fine differences are computed for the
1101  ancestor buffer."  ancestor buffer."
1102    :group 'ediff-highlighting)    :group 'ediff-highlighting)
 ;; backward-compatibility alias  
 (put 'ediff-fine-diff-face-Ancestor 'face-alias 'ediff-fine-diff-Ancestor)  
1103  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
1104  ;; this variable is set to nil, then again to the appropriate face.  ;; this variable is set to nil, then again to the appropriate face.
1105  (defvar ediff-fine-diff-face-Ancestor 'ediff-fine-diff-Ancestor  (defvar ediff-fine-diff-face-Ancestor 'ediff-fine-diff-Ancestor
# Line 1123  ancestor buffer." Line 1107  ancestor buffer."
1107  DO NOT CHANGE this variable.  Instead, use the customization  DO NOT CHANGE this variable.  Instead, use the customization
1108  widget to customize the actual face object `ediff-fine-diff-Ancestor'  widget to customize the actual face object `ediff-fine-diff-Ancestor'
1109  this variable represents.")  this variable represents.")
1110  (ediff-hide-face 'ediff-fine-diff-Ancestor)  (ediff-hide-face ediff-fine-diff-face-Ancestor)
1111    
1112  ;; Some installs don't have stipple or Stipple. So, try them in turn.  ;; Some installs don't have stipple or Stipple. So, try them in turn.
1113  (defvar stipple-pixmap  (defvar stipple-pixmap
# Line 1151  this variable represents.") Line 1135  this variable represents.")
1135        (t                     (:italic t :stipple ,stipple-pixmap))))        (t                     (:italic t :stipple ,stipple-pixmap))))
1136    "Face for highlighting even-numbered non-current differences in buffer A."    "Face for highlighting even-numbered non-current differences in buffer A."
1137    :group 'ediff-highlighting)    :group 'ediff-highlighting)
 ;; backward-compatibility alias  
 (put 'ediff-even-diff-face-A 'face-alias 'ediff-even-diff-A)  
1138  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
1139  ;; this variable is set to nil, then again to the appropriate face.  ;; this variable is set to nil, then again to the appropriate face.
1140  (defvar ediff-even-diff-face-A 'ediff-even-diff-A  (defvar ediff-even-diff-face-A 'ediff-even-diff-A
# Line 1160  this variable represents.") Line 1142  this variable represents.")
1142  DO NOT CHANGE this variable.  Instead, use the customization  DO NOT CHANGE this variable.  Instead, use the customization
1143  widget to customize the actual face object `ediff-even-diff-A'  widget to customize the actual face object `ediff-even-diff-A'
1144  this variable represents.")  this variable represents.")
1145  (ediff-hide-face 'ediff-even-diff-A)  (ediff-hide-face ediff-even-diff-face-A)
1146    
1147  (defface ediff-even-diff-B  (defface ediff-even-diff-B
1148    (if ediff-emacs-p    (if ediff-emacs-p
# Line 1174  this variable represents.") Line 1156  this variable represents.")
1156        (t                     (:italic t :stipple ,stipple-pixmap))))        (t                     (:italic t :stipple ,stipple-pixmap))))
1157    "Face for highlighting even-numbered non-current differences in buffer B."    "Face for highlighting even-numbered non-current differences in buffer B."
1158    :group 'ediff-highlighting)    :group 'ediff-highlighting)
 ;; backward-compatibility alias  
 (put 'ediff-even-diff-face-B 'face-alias 'ediff-even-diff-B)  
1159  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
1160  ;; this variable is set to nil, then again to the appropriate face.  ;; this variable is set to nil, then again to the appropriate face.
1161  (defvar ediff-even-diff-face-B 'ediff-even-diff-B  (defvar ediff-even-diff-face-B 'ediff-even-diff-B
# Line 1183  this variable represents.") Line 1163  this variable represents.")
1163  DO NOT CHANGE this variable.  Instead, use the customization  DO NOT CHANGE this variable.  Instead, use the customization
1164  widget to customize the actual face object `ediff-even-diff-B'  widget to customize the actual face object `ediff-even-diff-B'
1165  this variable represents.")  this variable represents.")
1166  (ediff-hide-face 'ediff-even-diff-B)  (ediff-hide-face ediff-even-diff-face-B)
1167    
1168  (defface ediff-even-diff-C  (defface ediff-even-diff-C
1169    (if ediff-emacs-p    (if ediff-emacs-p
# Line 1202  this variable represents.") Line 1182  this variable represents.")
1182        (t                     (:italic t :stipple ,stipple-pixmap))))        (t                     (:italic t :stipple ,stipple-pixmap))))
1183    "Face for highlighting even-numbered non-current differences in buffer C."    "Face for highlighting even-numbered non-current differences in buffer C."
1184    :group 'ediff-highlighting)    :group 'ediff-highlighting)
 ;; backward-compatibility alias  
 (put 'ediff-even-diff-face-C 'face-alias 'ediff-even-diff-C)  
1185  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
1186  ;; this variable is set to nil, then again to the appropriate face.  ;; this variable is set to nil, then again to the appropriate face.
1187  (defvar ediff-even-diff-face-C 'ediff-even-diff-C  (defvar ediff-even-diff-face-C 'ediff-even-diff-C
# Line 1211  this variable represents.") Line 1189  this variable represents.")
1189  DO NOT CHANGE this variable.  Instead, use the customization  DO NOT CHANGE this variable.  Instead, use the customization
1190  widget to customize the actual face object `ediff-even-diff-C'  widget to customize the actual face object `ediff-even-diff-C'
1191  this variable represents.")  this variable represents.")
1192  (ediff-hide-face 'ediff-even-diff-C)  (ediff-hide-face ediff-even-diff-face-C)
1193    
1194  (defface ediff-even-diff-Ancestor  (defface ediff-even-diff-Ancestor
1195    (if ediff-emacs-p    (if ediff-emacs-p
# Line 1230  this variable represents.") Line 1208  this variable represents.")
1208        (t (:italic t :stipple ,stipple-pixmap))))        (t (:italic t :stipple ,stipple-pixmap))))
1209    "Face for highlighting even-numbered non-current differences in the ancestor buffer."    "Face for highlighting even-numbered non-current differences in the ancestor buffer."
1210    :group 'ediff-highlighting)    :group 'ediff-highlighting)
 ;; backward-compatibility alias  
 (put 'ediff-even-diff-face-Ancestor 'face-alias 'ediff-even-diff-Ancestor)  
1211  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
1212  ;; this variable is set to nil, then again to the appropriate face.  ;; this variable is set to nil, then again to the appropriate face.
1213  (defvar ediff-even-diff-face-Ancestor 'ediff-even-diff-Ancestor  (defvar ediff-even-diff-face-Ancestor 'ediff-even-diff-Ancestor
# Line 1239  this variable represents.") Line 1215  this variable represents.")
1215  DO NOT CHANGE this variable.  Instead, use the customization  DO NOT CHANGE this variable.  Instead, use the customization
1216  widget to customize the actual face object `ediff-even-diff-Ancestor'  widget to customize the actual face object `ediff-even-diff-Ancestor'
1217  this variable represents.")  this variable represents.")
1218  (ediff-hide-face 'ediff-even-diff-Ancestor)  (ediff-hide-face ediff-even-diff-face-Ancestor)
1219    
1220  ;; Association between buffer types and even-diff-face symbols  ;; Association between buffer types and even-diff-face symbols
1221  (defconst ediff-even-diff-face-alist  (defconst ediff-even-diff-face-alist
# Line 1263  this variable represents.") Line 1239  this variable represents.")
1239        (t                     (:italic t :stipple "gray1"))))        (t                     (:italic t :stipple "gray1"))))
1240    "Face for highlighting odd-numbered non-current differences in buffer A."    "Face for highlighting odd-numbered non-current differences in buffer A."
1241    :group 'ediff-highlighting)    :group 'ediff-highlighting)
 ;; backward-compatibility alias  
 (put 'ediff-odd-diff-face-A 'face-alias 'ediff-odd-diff-A)  
1242  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
1243  ;; this variable is set to nil, then again to the appropriate face.  ;; this variable is set to nil, then again to the appropriate face.
1244  (defvar ediff-odd-diff-face-A 'ediff-odd-diff-A  (defvar ediff-odd-diff-face-A 'ediff-odd-diff-A
# Line 1272  this variable represents.") Line 1246  this variable represents.")
1246  DO NOT CHANGE this variable.  Instead, use the customization  DO NOT CHANGE this variable.  Instead, use the customization
1247  widget to customize the actual face object `ediff-odd-diff-A'  widget to customize the actual face object `ediff-odd-diff-A'
1248  this variable represents.")  this variable represents.")
1249  (ediff-hide-face 'ediff-odd-diff-A)  (ediff-hide-face ediff-odd-diff-face-A)
1250    
1251    
1252  (defface ediff-odd-diff-B  (defface ediff-odd-diff-B
# Line 1290  this variable represents.") Line 1264  this variable represents.")
1264        (t                     (:italic t :stipple "gray1"))))        (t                     (:italic t :stipple "gray1"))))
1265    "Face for highlighting odd-numbered non-current differences in buffer B."    "Face for highlighting odd-numbered non-current differences in buffer B."
1266    :group 'ediff-highlighting)    :group 'ediff-highlighting)
 ;; backward-compatibility alias  
 (put 'ediff-odd-diff-face-B 'face-alias 'ediff-odd-diff-B)  
1267  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
1268  ;; this variable is set to nil, then again to the appropriate face.  ;; this variable is set to nil, then again to the appropriate face.
1269  (defvar ediff-odd-diff-face-B 'ediff-odd-diff-B  (defvar ediff-odd-diff-face-B 'ediff-odd-diff-B
# Line 1299  this variable represents.") Line 1271  this variable represents.")
1271  DO NOT CHANGE this variable.  Instead, use the customization  DO NOT CHANGE this variable.  Instead, use the customization
1272  widget to customize the actual face object `ediff-odd-diff-B'  widget to customize the actual face object `ediff-odd-diff-B'
1273  this variable represents.")  this variable represents.")
1274  (ediff-hide-face 'ediff-odd-diff-B)  (ediff-hide-face ediff-odd-diff-face-B)
1275    
1276  (defface ediff-odd-diff-C  (defface ediff-odd-diff-C
1277    (if ediff-emacs-p    (if ediff-emacs-p
# Line 1316  this variable represents.") Line 1288  this variable represents.")
1288        (t                     (:italic t :stipple "gray1"))))        (t                     (:italic t :stipple "gray1"))))
1289    "Face for highlighting odd-numbered non-current differences in buffer C."    "Face for highlighting odd-numbered non-current differences in buffer C."
1290    :group 'ediff-highlighting)    :group 'ediff-highlighting)
 ;; backward-compatibility alias  
 (put 'ediff-odd-diff-face-C 'face-alias 'ediff-odd-diff-C)  
1291  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
1292  ;; this variable is set to nil, then again to the appropriate face.  ;; this variable is set to nil, then again to the appropriate face.
1293  (defvar ediff-odd-diff-face-C 'ediff-odd-diff-C  (defvar ediff-odd-diff-face-C 'ediff-odd-diff-C
# Line 1325  this variable represents.") Line 1295  this variable represents.")
1295  DO NOT CHANGE this variable.  Instead, use the customization  DO NOT CHANGE this variable.  Instead, use the customization
1296  widget to customize the actual face object `ediff-odd-diff-C'  widget to customize the actual face object `ediff-odd-diff-C'
1297  this variable represents.")  this variable represents.")
1298  (ediff-hide-face 'ediff-odd-diff-C)  (ediff-hide-face ediff-odd-diff-face-C)
1299    
1300  (defface ediff-odd-diff-Ancestor  (defface ediff-odd-diff-Ancestor
1301    (if ediff-emacs-p    (if ediff-emacs-p
# Line 1339  this variable represents.") Line 1309  this variable represents.")
1309        (t                     (:italic t :stipple "gray1"))))        (t                     (:italic t :stipple "gray1"))))
1310    "Face for highlighting odd-numbered non-current differences in the ancestor buffer."    "Face for highlighting odd-numbered non-current differences in the ancestor buffer."
1311    :group 'ediff-highlighting)    :group 'ediff-highlighting)
 ;; backward-compatibility alias  
 (put 'ediff-odd-diff-face-Ancestor 'face-alias 'ediff-odd-diff-Ancestor)  
1312  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
1313  ;; this variable is set to nil, then again to the appropriate face.  ;; this variable is set to nil, then again to the appropriate face.
1314  (defvar ediff-odd-diff-face-Ancestor 'ediff-odd-diff-Ancestor  (defvar ediff-odd-diff-face-Ancestor 'ediff-odd-diff-Ancestor
# Line 1348  this variable represents.") Line 1316  this variable represents.")
1316  DO NOT CHANGE this variable.  Instead, use the customization  DO NOT CHANGE this variable.  Instead, use the customization
1317  widget to customize the actual face object `ediff-odd-diff-Ancestor'  widget to customize the actual face object `ediff-odd-diff-Ancestor'
1318  this variable represents.")  this variable represents.")
1319  (ediff-hide-face 'ediff-odd-diff-Ancestor)  (ediff-hide-face ediff-odd-diff-face-Ancestor)
1320    
1321  ;; Association between buffer types and odd-diff-face symbols  ;; Association between buffer types and odd-diff-face symbols
1322  (defconst ediff-odd-diff-face-alist  (defconst ediff-odd-diff-face-alist
1323    '((A . ediff-odd-diff-face-A)    '((A . ediff-odd-diff-A)
1324      (B . ediff-odd-diff-face-B)      (B . ediff-odd-diff-B)
1325      (C . ediff-odd-diff-face-C)      (C . ediff-odd-diff-C)
1326      (Ancestor . ediff-odd-diff-face-Ancestor)))      (Ancestor . ediff-odd-diff-Ancestor)))
1327    
1328  ;; A-list of fine-diff face symbols associated with buffer types  ;; A-list of fine-diff face symbols associated with buffer types
1329  (defconst ediff-fine-diff-face-alist  (defconst ediff-fine-diff-face-alist
1330    '((A . ediff-fine-diff-face-A)    '((A . ediff-fine-diff-A)
1331      (B . ediff-fine-diff-face-B)      (B . ediff-fine-diff-B)
1332      (C . ediff-fine-diff-face-C)      (C . ediff-fine-diff-C)
1333      (Ancestor . ediff-fine-diff-face-Ancestor)))      (Ancestor . ediff-fine-diff-Ancestor)))
1334    
1335  ;; Help echo  ;; Help echo
1336  (put 'ediff-fine-diff-A 'ediff-help-echo  (put ediff-fine-diff-face-A 'ediff-help-echo
1337       "A `refinement' of the current difference region")       "A `refinement' of the current difference region")
1338  (put 'ediff-fine-diff-B 'ediff-help-echo  (put ediff-fine-diff-face-B 'ediff-help-echo
1339       "A `refinement' of the current difference region")       "A `refinement' of the current difference region")
1340  (put 'ediff-fine-diff-C 'ediff-help-echo  (put ediff-fine-diff-face-C 'ediff-help-echo
1341       "A `refinement' of the current difference region")       "A `refinement' of the current difference region")
1342  (put 'ediff-fine-diff-Ancestor 'ediff-help-echo  (put ediff-fine-diff-face-Ancestor 'ediff-help-echo
1343       "A `refinement' of the current difference region")       "A `refinement' of the current difference region")
1344    
1345  (add-hook 'ediff-quit-hook 'ediff-cleanup-mess)  (add-hook 'ediff-quit-hook 'ediff-cleanup-mess)
# Line 1899  Unless optional argument INPLACE is non- Line 1867  Unless optional argument INPLACE is non-
1867               (set-buffer ,old-buffer)               (set-buffer ,old-buffer)
1868               (set-syntax-table ,old-table)))))))               (set-syntax-table ,old-table)))))))
1869    
1870    (provide 'ediff-init)
1871    
1872    
1873    
1874  ;;; Local Variables:  ;;; Local Variables:
# Line 1907  Unless optional argument INPLACE is non- Line 1877  Unless optional argument INPLACE is non-
1877  ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))  ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
1878  ;;; End:  ;;; End:
1879    
 (provide 'ediff-init)  
   
1880  ;;; arch-tag: fa31d384-1e70-4d4b-82a7-3e96307c46f5  ;;; arch-tag: fa31d384-1e70-4d4b-82a7-3e96307c46f5
1881  ;;; ediff-init.el ends here  ;;; ediff-init.el ends here

Legend:
Removed from v.1.70  
changed lines
  Added in v.1.71

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26