[Emacs-diffs] Changes to emacs/lisp/ediff-init.el

[Michael Kifer]

Index: emacs/lisp/ediff-init.el
diff -c emacs/lisp/ediff-init.el:1.70 emacs/lisp/ediff-init.el:1.71
*** emacs/lisp/ediff-init.el:1.70       Mon Jul  4 23:08:53 2005
--- emacs/lisp/ediff-init.el    Sun Jul 10 18:46:24 2005
***************
*** 854,863 ****
  
  ;; A-list of current-diff-face-* symbols associated with buf types
  (defconst ediff-current-diff-face-alist
!   '((A . ediff-current-diff-face-A)
!     (B . ediff-current-diff-face-B)
!     (C . ediff-current-diff-face-C)
!     (Ancestor . ediff-current-diff-face-Ancestor)))
  
  
  (defun ediff-set-overlay-face (extent face)
--- 854,863 ----
  
  ;; A-list of current-diff-face-* symbols associated with buf types
  (defconst ediff-current-diff-face-alist
!   '((A . ediff-current-diff-A)
!     (B . ediff-current-diff-B)
!     (C . ediff-current-diff-C)
!     (Ancestor . ediff-current-diff-Ancestor)))
  
  
  (defun ediff-set-overlay-face (extent face)
***************
*** 915,922 ****
        (t                   (:inverse-video t))))
    "Face for highlighting the selected difference in buffer A."
    :group 'ediff-highlighting)
- ;; backward-compatibility alias
- (put 'ediff-current-diff-face-A 'face-alias 'ediff-current-diff-A)
  ;; An internal variable.  Ediff takes the face from here.  When 
unhighlighting,
  ;; this variable is set to nil, then again to the appropriate face.
  (defvar ediff-current-diff-face-A 'ediff-current-diff-A
--- 915,920 ----
***************
*** 924,936 ****
  DO NOT CHANGE this variable.  Instead, use the customization
  widget to customize the actual face object `ediff-current-diff-A'
  this variable represents.")
! (ediff-hide-face 'ediff-current-diff-A)
  ;; Until custom.el for XEmacs starts supporting :inverse-video we do this.
  ;; This means that some user customization may be trashed.
  (if (and ediff-xemacs-p
         (ediff-has-face-support-p)
         (not (ediff-color-display-p)))
!     (copy-face 'modeline 'ediff-current-diff-A))
  
  
  
--- 922,934 ----
  DO NOT CHANGE this variable.  Instead, use the customization
  widget to customize the actual face object `ediff-current-diff-A'
  this variable represents.")
! (ediff-hide-face ediff-current-diff-face-A)
  ;; Until custom.el for XEmacs starts supporting :inverse-video we do this.
  ;; This means that some user customization may be trashed.
  (if (and ediff-xemacs-p
         (ediff-has-face-support-p)
         (not (ediff-color-display-p)))
!     (copy-face 'modeline ediff-current-diff-face-A))
  
  
  
***************
*** 948,955 ****
        (t                   (:inverse-video t))))
    "Face for highlighting the selected difference in buffer B."
    :group 'ediff-highlighting)
- ;; backward-compatibility alias
- (put 'ediff-current-diff-face-B 'face-alias 'ediff-current-diff-B)
  ;; An internal variable.  Ediff takes the face from here.  When 
unhighlighting,
  ;; this variable is set to nil, then again to the appropriate face.
  (defvar ediff-current-diff-face-B 'ediff-current-diff-B
--- 946,951 ----
***************
*** 957,969 ****
   this variable.  Instead, use the customization
  widget to customize the actual face `ediff-current-diff-B'
  this variable represents.")
! (ediff-hide-face 'ediff-current-diff-B)
  ;; Until custom.el for XEmacs starts supporting :inverse-video we do this.
  ;; This means that some user customization may be trashed.
  (if (and ediff-xemacs-p
         (ediff-has-face-support-p)
         (not (ediff-color-display-p)))
!     (copy-face 'modeline 'ediff-current-diff-B))
  
  
  (defface ediff-current-diff-C
--- 953,965 ----
   this variable.  Instead, use the customization
  widget to customize the actual face `ediff-current-diff-B'
  this variable represents.")
! (ediff-hide-face ediff-current-diff-face-B)
  ;; Until custom.el for XEmacs starts supporting :inverse-video we do this.
  ;; This means that some user customization may be trashed.
  (if (and ediff-xemacs-p
         (ediff-has-face-support-p)
         (not (ediff-color-display-p)))
!     (copy-face 'modeline ediff-current-diff-face-B))
  
  
  (defface ediff-current-diff-C
***************
*** 978,985 ****
        (t                   (:inverse-video t))))
    "Face for highlighting the selected difference in buffer C."
    :group 'ediff-highlighting)
- ;; backward-compatibility alias
- (put 'ediff-current-diff-face-C 'face-alias 'ediff-current-diff-C)
  ;; An internal variable.  Ediff takes the face from here.  When 
unhighlighting,
  ;; this variable is set to nil, then again to the appropriate face.
  (defvar ediff-current-diff-face-C 'ediff-current-diff-C
--- 974,979 ----
***************
*** 987,999 ****
  DO NOT CHANGE this variable.  Instead, use the customization
  widget to customize the actual face object `ediff-current-diff-C'
  this variable represents.")
! (ediff-hide-face 'ediff-current-diff-C)
  ;; Until custom.el for XEmacs starts supporting :inverse-video we do this.
  ;; This means that some user customization may be trashed.
  (if (and ediff-xemacs-p
         (ediff-has-face-support-p)
         (not (ediff-color-display-p)))
!     (copy-face 'modeline 'ediff-current-diff-C))
  
  
  (defface ediff-current-diff-Ancestor
--- 981,993 ----
  DO NOT CHANGE this variable.  Instead, use the customization
  widget to customize the actual face object `ediff-current-diff-C'
  this variable represents.")
! (ediff-hide-face ediff-current-diff-face-C)
  ;; Until custom.el for XEmacs starts supporting :inverse-video we do this.
  ;; This means that some user customization may be trashed.
  (if (and ediff-xemacs-p
         (ediff-has-face-support-p)
         (not (ediff-color-display-p)))
!     (copy-face 'modeline ediff-current-diff-face-C))
  
  
  (defface ediff-current-diff-Ancestor
***************
*** 1008,1015 ****
        (t (:inverse-video t))))
    "Face for highlighting the selected difference in buffer Ancestor."
    :group 'ediff-highlighting)
- ;; backward-compatibility alias
- (put 'ediff-current-diff-face-Ancestor 'face-alias 
'ediff-current-diff-Ancestor)
  ;; An internal variable.  Ediff takes the face from here.  When 
unhighlighting,
  ;; this variable is set to nil, then again to the appropriate face.
  (defvar ediff-current-diff-face-Ancestor 'ediff-current-diff-Ancestor
--- 1002,1007 ----
***************
*** 1017,1029 ****
  DO NOT CHANGE this variable.  Instead, use the customization
  widget to customize the actual face object `ediff-current-diff-Ancestor'
  this variable represents.")
! (ediff-hide-face 'ediff-current-diff-Ancestor)
  ;; Until custom.el for XEmacs starts supporting :inverse-video we do this.
  ;; This means that some user customization may be trashed.
  (if (and ediff-xemacs-p
         (ediff-has-face-support-p)
         (not (ediff-color-display-p)))
!     (copy-face 'modeline 'ediff-current-diff-Ancestor))
  
  
  (defface ediff-fine-diff-A
--- 1009,1021 ----
  DO NOT CHANGE this variable.  Instead, use the customization
  widget to customize the actual face object `ediff-current-diff-Ancestor'
  this variable represents.")
! (ediff-hide-face ediff-current-diff-face-Ancestor)
  ;; Until custom.el for XEmacs starts supporting :inverse-video we do this.
  ;; This means that some user customization may be trashed.
  (if (and ediff-xemacs-p
         (ediff-has-face-support-p)
         (not (ediff-color-display-p)))
!     (copy-face 'modeline ediff-current-diff-face-Ancestor))
  
  
  (defface ediff-fine-diff-A
***************
*** 1038,1045 ****
        (t (:underline t :stipple "gray3"))))
    "Face for highlighting the refinement of the selected diff in buffer A."
    :group 'ediff-highlighting)
- ;; backward-compatibility alias
- (put 'ediff-fine-diff-face-A 'face-alias 'ediff-fine-diff-A)
  ;; An internal variable.  Ediff takes the face from here.  When 
unhighlighting,
  ;; this variable is set to nil, then again to the appropriate face.
  (defvar ediff-fine-diff-face-A 'ediff-fine-diff-A
--- 1030,1035 ----
***************
*** 1047,1053 ****
  DO NOT CHANGE this variable.  Instead, use the customization
  widget to customize the actual face object `ediff-fine-diff-A'
  this variable represents.")
! (ediff-hide-face 'ediff-fine-diff-A)
  
  (defface ediff-fine-diff-B
    (if ediff-emacs-p
--- 1037,1043 ----
  DO NOT CHANGE this variable.  Instead, use the customization
  widget to customize the actual face object `ediff-fine-diff-A'
  this variable represents.")
! (ediff-hide-face ediff-fine-diff-face-A)
  
  (defface ediff-fine-diff-B
    (if ediff-emacs-p
***************
*** 1061,1068 ****
        (t                   (:underline t :stipple "gray3"))))
    "Face for highlighting the refinement of the selected diff in buffer B."
    :group 'ediff-highlighting)
- ;; backward-compatibility alias
- (put 'ediff-fine-diff-face-B 'face-alias 'ediff-fine-diff-B)
  ;; An internal variable.  Ediff takes the face from here.  When 
unhighlighting,
  ;; this variable is set to nil, then again to the appropriate face.
  (defvar ediff-fine-diff-face-B 'ediff-fine-diff-B
--- 1051,1056 ----
***************
*** 1070,1076 ****
  DO NOT CHANGE this variable.  Instead, use the customization
  widget to customize the actual face object `ediff-fine-diff-B'
  this variable represents.")
! (ediff-hide-face 'ediff-fine-diff-B)
  
  (defface ediff-fine-diff-C
    (if ediff-emacs-p
--- 1058,1064 ----
  DO NOT CHANGE this variable.  Instead, use the customization
  widget to customize the actual face object `ediff-fine-diff-B'
  this variable represents.")
! (ediff-hide-face ediff-fine-diff-face-B)
  
  (defface ediff-fine-diff-C
    (if ediff-emacs-p
***************
*** 1089,1096 ****
        (t (:underline t :stipple "gray3"))))
    "Face for highlighting the refinement of the selected diff in buffer C."
    :group 'ediff-highlighting)
- ;; backward-compatibility alias
- (put 'ediff-fine-diff-face-C 'face-alias 'ediff-fine-diff-C)
  ;; An internal variable.  Ediff takes the face from here.  When 
unhighlighting,
  ;; this variable is set to nil, then again to the appropriate face.
  (defvar ediff-fine-diff-face-C 'ediff-fine-diff-C
--- 1077,1082 ----
***************
*** 1098,1104 ****
  DO NOT CHANGE this variable.  Instead, use the customization
  widget to customize the actual face object `ediff-fine-diff-C'
  this variable represents.")
! (ediff-hide-face 'ediff-fine-diff-C)
  
  (defface ediff-fine-diff-Ancestor
    (if ediff-emacs-p
--- 1084,1090 ----
  DO NOT CHANGE this variable.  Instead, use the customization
  widget to customize the actual face object `ediff-fine-diff-C'
  this variable represents.")
! (ediff-hide-face ediff-fine-diff-face-C)
  
  (defface ediff-fine-diff-Ancestor
    (if ediff-emacs-p
***************
*** 1114,1121 ****
  At present, this face is not used and no fine differences are computed for the
  ancestor buffer."
    :group 'ediff-highlighting)
- ;; backward-compatibility alias
- (put 'ediff-fine-diff-face-Ancestor 'face-alias 'ediff-fine-diff-Ancestor)
  ;; An internal variable.  Ediff takes the face from here.  When 
unhighlighting,
  ;; this variable is set to nil, then again to the appropriate face.
  (defvar ediff-fine-diff-face-Ancestor 'ediff-fine-diff-Ancestor
--- 1100,1105 ----
***************
*** 1123,1129 ****
  DO NOT CHANGE this variable.  Instead, use the customization
  widget to customize the actual face object `ediff-fine-diff-Ancestor'
  this variable represents.")
! (ediff-hide-face 'ediff-fine-diff-Ancestor)
  
  ;; Some installs don't have stipple or Stipple. So, try them in turn.
  (defvar stipple-pixmap
--- 1107,1113 ----
  DO NOT CHANGE this variable.  Instead, use the customization
  widget to customize the actual face object `ediff-fine-diff-Ancestor'
  this variable represents.")
! (ediff-hide-face ediff-fine-diff-face-Ancestor)
  
  ;; Some installs don't have stipple or Stipple. So, try them in turn.
  (defvar stipple-pixmap
***************
*** 1151,1158 ****
        (t                   (:italic t :stipple ,stipple-pixmap))))
    "Face for highlighting even-numbered non-current differences in buffer A."
    :group 'ediff-highlighting)
- ;; backward-compatibility alias
- (put 'ediff-even-diff-face-A 'face-alias 'ediff-even-diff-A)
  ;; An internal variable.  Ediff takes the face from here.  When 
unhighlighting,
  ;; this variable is set to nil, then again to the appropriate face.
  (defvar ediff-even-diff-face-A 'ediff-even-diff-A
--- 1135,1140 ----
***************
*** 1160,1166 ****
  DO NOT CHANGE this variable.  Instead, use the customization
  widget to customize the actual face object `ediff-even-diff-A'
  this variable represents.")
! (ediff-hide-face 'ediff-even-diff-A)
  
  (defface ediff-even-diff-B
    (if ediff-emacs-p
--- 1142,1148 ----
  DO NOT CHANGE this variable.  Instead, use the customization
  widget to customize the actual face object `ediff-even-diff-A'
  this variable represents.")
! (ediff-hide-face ediff-even-diff-face-A)
  
  (defface ediff-even-diff-B
    (if ediff-emacs-p
***************
*** 1174,1181 ****
        (t                   (:italic t :stipple ,stipple-pixmap))))
    "Face for highlighting even-numbered non-current differences in buffer B."
    :group 'ediff-highlighting)
- ;; backward-compatibility alias
- (put 'ediff-even-diff-face-B 'face-alias 'ediff-even-diff-B)
  ;; An internal variable.  Ediff takes the face from here.  When 
unhighlighting,
  ;; this variable is set to nil, then again to the appropriate face.
  (defvar ediff-even-diff-face-B 'ediff-even-diff-B
--- 1156,1161 ----
***************
*** 1183,1189 ****
  DO NOT CHANGE this variable.  Instead, use the customization
  widget to customize the actual face object `ediff-even-diff-B'
  this variable represents.")
! (ediff-hide-face 'ediff-even-diff-B)
  
  (defface ediff-even-diff-C
    (if ediff-emacs-p
--- 1163,1169 ----
  DO NOT CHANGE this variable.  Instead, use the customization
  widget to customize the actual face object `ediff-even-diff-B'
  this variable represents.")
! (ediff-hide-face ediff-even-diff-face-B)
  
  (defface ediff-even-diff-C
    (if ediff-emacs-p
***************
*** 1202,1209 ****
        (t                   (:italic t :stipple ,stipple-pixmap))))
    "Face for highlighting even-numbered non-current differences in buffer C."
    :group 'ediff-highlighting)
- ;; backward-compatibility alias
- (put 'ediff-even-diff-face-C 'face-alias 'ediff-even-diff-C)
  ;; An internal variable.  Ediff takes the face from here.  When 
unhighlighting,
  ;; this variable is set to nil, then again to the appropriate face.
  (defvar ediff-even-diff-face-C 'ediff-even-diff-C
--- 1182,1187 ----
***************
*** 1211,1217 ****
  DO NOT CHANGE this variable.  Instead, use the customization
  widget to customize the actual face object `ediff-even-diff-C'
  this variable represents.")
! (ediff-hide-face 'ediff-even-diff-C)
  
  (defface ediff-even-diff-Ancestor
    (if ediff-emacs-p
--- 1189,1195 ----
  DO NOT CHANGE this variable.  Instead, use the customization
  widget to customize the actual face object `ediff-even-diff-C'
  this variable represents.")
! (ediff-hide-face ediff-even-diff-face-C)
  
  (defface ediff-even-diff-Ancestor
    (if ediff-emacs-p
***************
*** 1230,1237 ****
        (t (:italic t :stipple ,stipple-pixmap))))
    "Face for highlighting even-numbered non-current differences in the 
ancestor buffer."
    :group 'ediff-highlighting)
- ;; backward-compatibility alias
- (put 'ediff-even-diff-face-Ancestor 'face-alias 'ediff-even-diff-Ancestor)
  ;; An internal variable.  Ediff takes the face from here.  When 
unhighlighting,
  ;; this variable is set to nil, then again to the appropriate face.
  (defvar ediff-even-diff-face-Ancestor 'ediff-even-diff-Ancestor
--- 1208,1213 ----
***************
*** 1239,1245 ****
  DO NOT CHANGE this variable.  Instead, use the customization
  widget to customize the actual face object `ediff-even-diff-Ancestor'
  this variable represents.")
! (ediff-hide-face 'ediff-even-diff-Ancestor)
  
  ;; Association between buffer types and even-diff-face symbols
  (defconst ediff-even-diff-face-alist
--- 1215,1221 ----
  DO NOT CHANGE this variable.  Instead, use the customization
  widget to customize the actual face object `ediff-even-diff-Ancestor'
  this variable represents.")
! (ediff-hide-face ediff-even-diff-face-Ancestor)
  
  ;; Association between buffer types and even-diff-face symbols
  (defconst ediff-even-diff-face-alist
***************
*** 1263,1270 ****
        (t                   (:italic t :stipple "gray1"))))
    "Face for highlighting odd-numbered non-current differences in buffer A."
    :group 'ediff-highlighting)
- ;; backward-compatibility alias
- (put 'ediff-odd-diff-face-A 'face-alias 'ediff-odd-diff-A)
  ;; An internal variable.  Ediff takes the face from here.  When 
unhighlighting,
  ;; this variable is set to nil, then again to the appropriate face.
  (defvar ediff-odd-diff-face-A 'ediff-odd-diff-A
--- 1239,1244 ----
***************
*** 1272,1278 ****
  DO NOT CHANGE this variable.  Instead, use the customization
  widget to customize the actual face object `ediff-odd-diff-A'
  this variable represents.")
! (ediff-hide-face 'ediff-odd-diff-A)
  
  
  (defface ediff-odd-diff-B
--- 1246,1252 ----
  DO NOT CHANGE this variable.  Instead, use the customization
  widget to customize the actual face object `ediff-odd-diff-A'
  this variable represents.")
! (ediff-hide-face ediff-odd-diff-face-A)
  
  
  (defface ediff-odd-diff-B
***************
*** 1290,1297 ****
        (t                   (:italic t :stipple "gray1"))))
    "Face for highlighting odd-numbered non-current differences in buffer B."
    :group 'ediff-highlighting)
- ;; backward-compatibility alias
- (put 'ediff-odd-diff-face-B 'face-alias 'ediff-odd-diff-B)
  ;; An internal variable.  Ediff takes the face from here.  When 
unhighlighting,
  ;; this variable is set to nil, then again to the appropriate face.
  (defvar ediff-odd-diff-face-B 'ediff-odd-diff-B
--- 1264,1269 ----
***************
*** 1299,1305 ****
  DO NOT CHANGE this variable.  Instead, use the customization
  widget to customize the actual face object `ediff-odd-diff-B'
  this variable represents.")
! (ediff-hide-face 'ediff-odd-diff-B)
  
  (defface ediff-odd-diff-C
    (if ediff-emacs-p
--- 1271,1277 ----
  DO NOT CHANGE this variable.  Instead, use the customization
  widget to customize the actual face object `ediff-odd-diff-B'
  this variable represents.")
! (ediff-hide-face ediff-odd-diff-face-B)
  
  (defface ediff-odd-diff-C
    (if ediff-emacs-p
***************
*** 1316,1323 ****
        (t                   (:italic t :stipple "gray1"))))
    "Face for highlighting odd-numbered non-current differences in buffer C."
    :group 'ediff-highlighting)
- ;; backward-compatibility alias
- (put 'ediff-odd-diff-face-C 'face-alias 'ediff-odd-diff-C)
  ;; An internal variable.  Ediff takes the face from here.  When 
unhighlighting,
  ;; this variable is set to nil, then again to the appropriate face.
  (defvar ediff-odd-diff-face-C 'ediff-odd-diff-C
--- 1288,1293 ----
***************
*** 1325,1331 ****
  DO NOT CHANGE this variable.  Instead, use the customization
  widget to customize the actual face object `ediff-odd-diff-C'
  this variable represents.")
! (ediff-hide-face 'ediff-odd-diff-C)
  
  (defface ediff-odd-diff-Ancestor
    (if ediff-emacs-p
--- 1295,1301 ----
  DO NOT CHANGE this variable.  Instead, use the customization
  widget to customize the actual face object `ediff-odd-diff-C'
  this variable represents.")
! (ediff-hide-face ediff-odd-diff-face-C)
  
  (defface ediff-odd-diff-Ancestor
    (if ediff-emacs-p
***************
*** 1339,1346 ****
        (t                   (:italic t :stipple "gray1"))))
    "Face for highlighting odd-numbered non-current differences in the ancestor 
buffer."
    :group 'ediff-highlighting)
- ;; backward-compatibility alias
- (put 'ediff-odd-diff-face-Ancestor 'face-alias 'ediff-odd-diff-Ancestor)
  ;; An internal variable.  Ediff takes the face from here.  When 
unhighlighting,
  ;; this variable is set to nil, then again to the appropriate face.
  (defvar ediff-odd-diff-face-Ancestor 'ediff-odd-diff-Ancestor
--- 1309,1314 ----
***************
*** 1348,1377 ****
  DO NOT CHANGE this variable.  Instead, use the customization
  widget to customize the actual face object `ediff-odd-diff-Ancestor'
  this variable represents.")
! (ediff-hide-face 'ediff-odd-diff-Ancestor)
  
  ;; Association between buffer types and odd-diff-face symbols
  (defconst ediff-odd-diff-face-alist
!   '((A . ediff-odd-diff-face-A)
!     (B . ediff-odd-diff-face-B)
!     (C . ediff-odd-diff-face-C)
!     (Ancestor . ediff-odd-diff-face-Ancestor)))
  
  ;; A-list of fine-diff face symbols associated with buffer types
  (defconst ediff-fine-diff-face-alist
!   '((A . ediff-fine-diff-face-A)
!     (B . ediff-fine-diff-face-B)
!     (C . ediff-fine-diff-face-C)
!     (Ancestor . ediff-fine-diff-face-Ancestor)))
  
  ;; Help echo
! (put 'ediff-fine-diff-A 'ediff-help-echo
       "A `refinement' of the current difference region")
! (put 'ediff-fine-diff-B 'ediff-help-echo
       "A `refinement' of the current difference region")
! (put 'ediff-fine-diff-C 'ediff-help-echo
       "A `refinement' of the current difference region")
! (put 'ediff-fine-diff-Ancestor 'ediff-help-echo
       "A `refinement' of the current difference region")
  
  (add-hook 'ediff-quit-hook 'ediff-cleanup-mess)
--- 1316,1345 ----
  DO NOT CHANGE this variable.  Instead, use the customization
  widget to customize the actual face object `ediff-odd-diff-Ancestor'
  this variable represents.")
! (ediff-hide-face ediff-odd-diff-face-Ancestor)
  
  ;; Association between buffer types and odd-diff-face symbols
  (defconst ediff-odd-diff-face-alist
!   '((A . ediff-odd-diff-A)
!     (B . ediff-odd-diff-B)
!     (C . ediff-odd-diff-C)
!     (Ancestor . ediff-odd-diff-Ancestor)))
  
  ;; A-list of fine-diff face symbols associated with buffer types
  (defconst ediff-fine-diff-face-alist
!   '((A . ediff-fine-diff-A)
!     (B . ediff-fine-diff-B)
!     (C . ediff-fine-diff-C)
!     (Ancestor . ediff-fine-diff-Ancestor)))
  
  ;; Help echo
! (put ediff-fine-diff-face-A 'ediff-help-echo
       "A `refinement' of the current difference region")
! (put ediff-fine-diff-face-B 'ediff-help-echo
       "A `refinement' of the current difference region")
! (put ediff-fine-diff-face-C 'ediff-help-echo
       "A `refinement' of the current difference region")
! (put ediff-fine-diff-face-Ancestor 'ediff-help-echo
       "A `refinement' of the current difference region")
  
  (add-hook 'ediff-quit-hook 'ediff-cleanup-mess)
***************
*** 1899,1904 ****
--- 1867,1874 ----
             (set-buffer ,old-buffer)
             (set-syntax-table ,old-table)))))))
  
+ (provide 'ediff-init)
+ 
  
  
  ;;; Local Variables:
***************
*** 1906,1913 ****
  ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
  ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
  ;;; End:
- 
- (provide 'ediff-init)
  
  ;;; arch-tag: fa31d384-1e70-4d4b-82a7-3e96307c46f5
  ;;; ediff-init.el ends here
--- 1876,1881 ----