Merge from emacs--rel--22

[gnu-emacs] / lisp / ediff-hook.el

diff --git a/lisp/ediff-hook.el b/lisp/ediff-hook.el
index 17df800acc8075419c30129f47de6b38f7493f76..306b2ed670c193ed9cb014ef7e81c2a94722b287 100644 (file)
--- a/lisp/ediff-hook.el
+++ b/lisp/ediff-hook.el
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -53,10 +53,10 @@
 ;; compiler at hand (emacs or xemacs).
 ;; The autoload, below, is useless in Emacs because ediff-hook.el
 ;; is dumped with emacs, but it is needed in XEmacs
-;;;###autoload (defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form) (if (string-match "XEmacs" emacs-version) xemacs-form emacs-form))
+;;;###autoload (defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form) (if (featurep 'xemacs) xemacs-form emacs-form))
 
 (defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form)
-  (if (string-match "XEmacs" emacs-version)
+  (if (featurep 'xemacs)
       xemacs-form emacs-form))
 
 ;; This autoload is useless in Emacs because ediff-hook.el is dumped with
@@ -261,17 +261,17 @@
     () ; if dumping, autoloads are set up in loaddefs.el
   ;; if the user decides to load this file, set up autoloads
   ;; compare files and buffers
-  (autoload 'ediff "ediff" "Compare two files" t)
-  (autoload 'ediff-files "ediff" "Compare two files" t)
-  (autoload 'ediff-buffers "ediff" "Compare two bufers" t)
-  (autoload 'ebuffers "ediff" "Compare two bufers" t)
-  (autoload 'ediff3  "ediff"  "Compare three files" t)
-  (autoload 'ediff-files3 "ediff" "Compare three files" t)
-  (autoload 'ediff-buffers3 "ediff" "Compare three bufers" t)
-  (autoload 'ebuffers3 "ediff" "Compare three bufers" t)
-
-  (autoload 'erevision "ediff" "Compare versions of a file" t)
-  (autoload 'ediff-revision "ediff" "Compare versions of a file" t)
+  (autoload 'ediff "ediff" "Compare two files." t)
+  (autoload 'ediff-files "ediff" "Compare two files." t)
+  (autoload 'ediff-buffers "ediff" "Compare two buffers." t)
+  (autoload 'ebuffers "ediff" "Compare two buffers." t)
+  (autoload 'ediff3  "ediff"  "Compare three files." t)
+  (autoload 'ediff-files3 "ediff" "Compare three files." t)
+  (autoload 'ediff-buffers3 "ediff" "Compare three buffers." t)
+  (autoload 'ebuffers3 "ediff" "Compare three buffers." t)
+
+  (autoload 'erevision "ediff" "Compare versions of a file." t)
+  (autoload 'ediff-revision "ediff" "Compare versions of a file." t)
 
   ;; compare regions and windows
   (autoload 'ediff-windows-wordwise