From 52a6e0d09d97cbd52cfc6c5e0f7efbaa2692e618 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Fri, 14 Mar 2008 17:42:18 +0000 Subject: * faces.el (xw-defined-colors): * simple.el (widget-convert, shell-mode): Declare as functions instead of autoloading. * abbrev.el: * button.el: * cus-face.el: * ediff-hook.el: * emacs-lisp/backquote.el: * emacs-lisp/timer.el: * facemenu.el: * faces.el: * menu-bar.el: * simple.el: * subr.el: * textmodes/fill.el: * textmodes/paragraphs.el: Remove autoloads, redundant when the files are preloaded. --- lisp/ediff-hook.el | 123 +---------------------------------------------------- 1 file changed, 1 insertion(+), 122 deletions(-) (limited to 'lisp/ediff-hook.el') diff --git a/lisp/ediff-hook.el b/lisp/ediff-hook.el index 12d9936c1a9..c891407bee4 100644 --- a/lisp/ediff-hook.el +++ b/lisp/ediff-hook.el @@ -51,7 +51,7 @@ ;; emacs, but it is needed in XEmacs ;;;###autoload (if (featurep 'xemacs) - ;; xemacs form + (progn (defun ediff-xemacs-init-menus () (when (featurep 'menubar) (add-submenu @@ -65,13 +65,6 @@ (add-menu-button '("Tools") "-------" "OO-Browser...") ))) - - -;; This autoload is useless in Emacs because ediff-hook.el is dumped with -;; emacs, but it is needed in XEmacs -;;;###autoload -(if (featurep 'xemacs) - (progn (defvar ediff-menu '("Compare" ["Two Files..." ediff-files t] @@ -233,121 +226,7 @@ (define-key menu-bar-ediff-misc-menu [ediff-doc] '("Ediff Manual" . ediff-documentation))) -;; arrange for autoloads -(if purify-flag - () ; 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 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 - "ediff" "Compare two windows word-by-word." t) - (autoload 'ediff-regions-wordwise - "ediff" "Compare two regions word-by-word." t) - (autoload 'ediff-windows-linewise - "ediff" "Compare two windows line-by-line." t) - (autoload 'ediff-regions-linewise - "ediff" "Compare two regions line-by-line." t) - - ;; patch - (autoload 'ediff-patch-file "ediff" "Patch a file." t) - (autoload 'epatch "ediff" "Patch a file." t) - (autoload 'ediff-patch-buffer "ediff" "Patch a buffer.") - (autoload 'epatch-buffer "ediff" "Patch a buffer." t) - - ;; merge - (autoload 'ediff-merge "ediff" "Merge two files." t) - (autoload 'ediff-merge-files "ediff" "Merge two files." t) - (autoload 'ediff-merge-files-with-ancestor - "ediff" "Merge two files using a third file as an ancestor." t) - (autoload 'ediff-merge-buffers "ediff" "Merge two buffers." t) - (autoload 'ediff-merge-buffers-with-ancestor - "ediff" "Merge two buffers using a third buffer as an ancestor." t) - - (autoload 'ediff-merge-revisions "ediff" "Merge two versions of a file." t) - (autoload 'ediff-merge-revisions-with-ancestor - "ediff" "Merge two versions of a file." t) - - ;; compare directories - (autoload 'edirs "ediff" "Compare files in two directories." t) - (autoload 'ediff-directories "ediff" "Compare files in two directories." t) - (autoload 'edirs3 "ediff" "Compare files in three directories." t) - (autoload - 'ediff-directories3 "ediff" "Compare files in three directories." t) - - (autoload 'edir-revisions - "ediff" "Compare two versions of a file." t) - (autoload 'ediff-directory-revisions - "ediff" "Compare two versions of a file." t) - - ;; merge directories - (autoload 'edirs-merge "ediff" "Merge files in two directories." t) - (autoload 'ediff-merge-directories - "ediff" "Merge files in two directories." t) - (autoload 'edirs-merge-with-ancestor - "ediff" - "Merge files in two directories using files in a third dir as ancestors." - t) - (autoload 'ediff-merge-directories-with-ancestor - "ediff" - "Merge files in two directories using files in a third dir as ancestors." - t) - - (autoload 'edir-merge-revisions - "ediff" "Merge versions of files in a directory." t) - (autoload 'ediff-merge-directory-revisions - "ediff" "Merge versions of files in a directory." t) - (autoload 'ediff-merge-directory-revisions-with-ancestor - "ediff" - "Merge versions of files in a directory using other versions as ancestors." - t) - (autoload 'edir-merge-revisions-with-ancestor - "ediff" - "Merge versions of files in a directory using other versions as ancestors." - t) - - ;; misc - (autoload 'ediff-show-registry - "ediff-mult" - "Display the registry of active Ediff sessions." - t) - (autoload 'eregistry - "ediff-mult" - "Display the registry of active Ediff sessions." - t) - (autoload 'ediff-documentation - "ediff" - "Display Ediff's manual." - t) - (autoload 'ediff-version - "ediff" - "Show Ediff's version and last modification date." - t) - (autoload 'ediff-toggle-multiframe - "ediff-util" - "Toggle the use of separate frame for Ediff control buffer." - t) - (autoload 'ediff-toggle-use-toolbar - "ediff-util" - "Toggle the use of Ediff toolbar." - t) - - ) ; if purify-flag - - (provide 'ediff-hook) - ;;; arch-tag: 512f8656-8a4b-4789-af5d-5c6144498df3 ;;; ediff-hook.el ends here -- cgit v1.2.1