;;; ediff-hook.el --- setup for Ediff's menus and autoloads
-;; Copyright (C) 1995, 96, 97, 98, 99, 2000, 01, 02 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+;; 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
;; 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,
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
;; 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
))
(defvar ediff-misc-menu
'("Ediff Miscellanea"
- ["Ediff Manual..." ediff-documentation t]
- ["Customize Ediff..." ediff-customize t]
- ["List Ediff Sessions..." ediff-show-registry t]
- ["Use separate frame for Ediff control buffer..."
+ ["Ediff Manual" ediff-documentation t]
+ ["Customize Ediff" ediff-customize t]
+ ["List Ediff Sessions" ediff-show-registry t]
+ ["Use separate frame for Ediff control buffer"
ediff-toggle-multiframe
:style toggle
:selected (if (and (featurep 'ediff-util)
;; define ediff miscellanea
(define-key menu-bar-ediff-misc-menu [emultiframe]
- '("Toggle use of separate control buffer frame..."
+ '("Toggle use of separate control buffer frame"
. ediff-toggle-multiframe))
(define-key menu-bar-ediff-misc-menu [eregistry]
- '("List Ediff Sessions..." . ediff-show-registry))
+ '("List Ediff Sessions" . ediff-show-registry))
(define-key menu-bar-ediff-misc-menu [ediff-cust]
- '("Customize Ediff..." . ediff-customize))
+ '("Customize Ediff" . ediff-customize))
(define-key menu-bar-ediff-misc-menu [ediff-doc]
- '("Ediff Manual..." . ediff-documentation))
+ '("Ediff Manual" . ediff-documentation))
)
) ; emacs case
() ; 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
(provide 'ediff-hook)
+
+;;; arch-tag: 512f8656-8a4b-4789-af5d-5c6144498df3
;;; ediff-hook.el ends here