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

[Richard M. Stallman]

Index: emacs/lisp/loaddefs.el
diff -c emacs/lisp/loaddefs.el:2.73 emacs/lisp/loaddefs.el:2.74
*** emacs/lisp/loaddefs.el:2.73 Mon Apr 29 08:45:41 2002
--- emacs/lisp/loaddefs.el      Tue Apr 30 13:48:09 2002
***************
*** 6105,6124 ****
  
  ;;;***
  
- ;;;### (autoloads (ediff-cond-compile-for-xemacs-or-emacs) "ediff-hook"
- ;;;;;;  "ediff-hook.el" (15561 53007))
- ;;; Generated autoloads from ediff-hook.el
- 
- (defvar ediff-window-setup-function)
- 
- (autoload (quote ediff-cond-compile-for-xemacs-or-emacs) "ediff-hook" nil nil 
(quote macro))
- 
- (ediff-cond-compile-for-xemacs-or-emacs (defun ediff-xemacs-init-menus nil 
(if (featurep (quote menubar)) (progn (add-submenu (quote ("Tools")) ediff-menu 
"OO-Browser...") (add-submenu (quote ("Tools")) ediff-merge-menu 
"OO-Browser...") (add-submenu (quote ("Tools")) epatch-menu "OO-Browser...") 
(add-submenu (quote ("Tools")) ediff-misc-menu "OO-Browser...") 
(add-menu-button (quote ("Tools")) "-------" "OO-Browser...")))) nil)
- 
- (ediff-cond-compile-for-xemacs-or-emacs (progn (defvar ediff-menu (quote 
("Compare" ["Two Files..." ediff-files t] ["Two Buffers..." ediff-buffers t] 
["Three Files..." ediff-files3 t] ["Three Buffers..." ediff-buffers3 t] "---" 
["Two Directories..." ediff-directories t] ["Three Directories..." 
ediff-directories3 t] "---" ["File with Revision..." ediff-revision t] 
["Directory Revisions..." ediff-directory-revisions t] "---" ["Windows 
Word-by-word..." ediff-windows-wordwise t] ["Windows Line-by-line..." 
ediff-windows-linewise t] "---" ["Regions Word-by-word..." 
ediff-regions-wordwise t] ["Regions Line-by-line..." ediff-regions-linewise 
t]))) (defvar ediff-merge-menu (quote ("Merge" ["Files..." ediff-merge-files t] 
["Files with Ancestor..." ediff-merge-files-with-ancestor t] ["Buffers..." 
ediff-merge-buffers t] ["Buffers with Ancestor..." 
ediff-merge-buffers-with-ancestor t] "---" ["Directories..." 
ediff-merge-directories t] ["Directories with Ancestor..." 
ediff-merge-directories-with-ancestor t] "---" ["Revisions..." 
ediff-merge-revisions t] ["Revisions with Ancestor..." 
ediff-merge-revisions-with-ancestor t] ["Directory Revisions..." 
ediff-merge-directory-revisions t] ["Directory Revisions with Ancestor..." 
ediff-merge-directory-revisions-with-ancestor t]))) (defvar epatch-menu (quote 
("Apply Patch" ["To a file..." ediff-patch-file t] ["To a buffer..." 
ediff-patch-buffer t]))) (defvar ediff-misc-menu (quote ("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-toggle-multiframe :style toggle :selected (if 
(and (featurep (quote ediff-util)) (boundp (quote 
ediff-window-setup-function))) (eq ediff-window-setup-function (quote 
ediff-setup-windows-multiframe)))] ["Use a toolbar with Ediff control buffer" 
ediff-toggle-use-toolbar :style toggle :selected (if (featurep (quote 
ediff-tbar)) (ediff-use-toolbar-p))]))) (if (and (featurep (quote menubar)) 
(not (featurep (quote infodock))) (not (featurep (quote ediff-hook)))) 
(ediff-xemacs-init-menus))) (if (featurep (quote menu-bar)) (progn (defvar 
menu-bar-ediff-misc-menu (make-sparse-keymap "Ediff Miscellanea")) (fset (quote 
menu-bar-ediff-misc-menu) (symbol-value (quote menu-bar-ediff-misc-menu))) 
(defvar menu-bar-epatch-menu (make-sparse-keymap "Apply Patch")) (fset (quote 
menu-bar-epatch-menu) (symbol-value (quote menu-bar-epatch-menu))) (defvar 
menu-bar-ediff-merge-menu (make-sparse-keymap "Merge")) (fset (quote 
menu-bar-ediff-merge-menu) (symbol-value (quote menu-bar-ediff-merge-menu))) 
(defvar menu-bar-ediff-menu (make-sparse-keymap "Compare")) (fset (quote 
menu-bar-ediff-menu) (symbol-value (quote menu-bar-ediff-menu))) (define-key 
menu-bar-ediff-menu [window] (quote ("This Window and Next Window" . 
compare-windows))) (define-key menu-bar-ediff-menu [ediff-windows-linewise] 
(quote ("Windows Line-by-line..." . ediff-windows-linewise))) (define-key 
menu-bar-ediff-menu [ediff-windows-wordwise] (quote ("Windows Word-by-word..." 
. ediff-windows-wordwise))) (define-key menu-bar-ediff-menu 
[separator-ediff-windows] (quote ("--"))) (define-key menu-bar-ediff-menu 
[ediff-regions-linewise] (quote ("Regions Line-by-line..." . 
ediff-regions-linewise))) (define-key menu-bar-ediff-menu 
[ediff-regions-wordwise] (quote ("Regions Word-by-word..." . 
ediff-regions-wordwise))) (define-key menu-bar-ediff-menu 
[separator-ediff-regions] (quote ("--"))) (define-key menu-bar-ediff-menu 
[ediff-dir-revision] (quote ("Directory Revisions..." . 
ediff-directory-revisions))) (define-key menu-bar-ediff-menu [ediff-revision] 
(quote ("File with Revision..." . ediff-revision))) (define-key 
menu-bar-ediff-menu [separator-ediff-directories] (quote ("--"))) (define-key 
menu-bar-ediff-menu [ediff-directories3] (quote ("Three Directories..." . 
ediff-directories3))) (define-key menu-bar-ediff-menu [ediff-directories] 
(quote ("Two Directories..." . ediff-directories))) (define-key 
menu-bar-ediff-menu [separator-ediff-files] (quote ("--"))) (define-key 
menu-bar-ediff-menu [ediff-buffers3] (quote ("Three Buffers..." . 
ediff-buffers3))) (define-key menu-bar-ediff-menu [ediff-files3] (quote ("Three 
Files..." . ediff-files3))) (define-key menu-bar-ediff-menu [ediff-buffers] 
(quote ("Two Buffers..." . ediff-buffers))) (define-key menu-bar-ediff-menu 
[ediff-files] (quote ("Two Files..." . ediff-files))) (define-key 
menu-bar-ediff-merge-menu [ediff-merge-dir-revisions-with-ancestor] (quote 
("Directory Revisions with Ancestor..." . 
ediff-merge-directory-revisions-with-ancestor))) (define-key 
menu-bar-ediff-merge-menu [ediff-merge-dir-revisions] (quote ("Directory 
Revisions..." . ediff-merge-directory-revisions))) (define-key 
menu-bar-ediff-merge-menu [ediff-merge-revisions-with-ancestor] (quote 
("Revisions with Ancestor..." . ediff-merge-revisions-with-ancestor))) 
(define-key menu-bar-ediff-merge-menu [ediff-merge-revisions] (quote 
("Revisions..." . ediff-merge-revisions))) (define-key 
menu-bar-ediff-merge-menu [separator-ediff-merge] (quote ("--"))) (define-key 
menu-bar-ediff-merge-menu [ediff-merge-directories-with-ancestor] (quote 
("Directories with Ancestor..." . ediff-merge-directories-with-ancestor))) 
(define-key menu-bar-ediff-merge-menu [ediff-merge-directories] (quote 
("Directories..." . ediff-merge-directories))) (define-key 
menu-bar-ediff-merge-menu [separator-ediff-merge-dirs] (quote ("--"))) 
(define-key menu-bar-ediff-merge-menu [ediff-merge-buffers-with-ancestor] 
(quote ("Buffers with Ancestor..." . ediff-merge-buffers-with-ancestor))) 
(define-key menu-bar-ediff-merge-menu [ediff-merge-buffers] (quote 
("Buffers..." . ediff-merge-buffers))) (define-key menu-bar-ediff-merge-menu 
[ediff-merge-files-with-ancestor] (quote ("Files with Ancestor..." . 
ediff-merge-files-with-ancestor))) (define-key menu-bar-ediff-merge-menu 
[ediff-merge-files] (quote ("Files..." . ediff-merge-files))) (define-key 
menu-bar-epatch-menu [ediff-patch-buffer] (quote ("To a Buffer..." . 
ediff-patch-buffer))) (define-key menu-bar-epatch-menu [ediff-patch-file] 
(quote ("To a File..." . ediff-patch-file))) (define-key 
menu-bar-ediff-misc-menu [emultiframe] (quote ("Toggle use of separate control 
buffer frame..." . ediff-toggle-multiframe))) (define-key 
menu-bar-ediff-misc-menu [eregistry] (quote ("List Ediff Sessions..." . 
ediff-show-registry))) (define-key menu-bar-ediff-misc-menu [ediff-cust] (quote 
("Customize Ediff..." . ediff-customize))) (define-key menu-bar-ediff-misc-menu 
[ediff-doc] (quote ("Ediff Manual..." . ediff-documentation))))))
- 
- ;;;***
- 
  ;;;### (autoloads (ediff-show-registry) "ediff-mult" "ediff-mult.el"
  ;;;;;;  (15517 64421))
  ;;; Generated autoloads from ediff-mult.el
--- 6105,6110 ----