[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ediff-hook.el
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ediff-hook.el |
Date: |
Fri, 04 Apr 2003 01:21:53 -0500 |
Index: emacs/lisp/ediff-hook.el
diff -c emacs/lisp/ediff-hook.el:1.23 emacs/lisp/ediff-hook.el:1.24
*** emacs/lisp/ediff-hook.el:1.23 Wed Sep 18 21:02:06 2002
--- emacs/lisp/ediff-hook.el Tue Feb 4 06:13:06 2003
***************
*** 57,63 ****
(defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form)
(if (string-match "XEmacs" emacs-version)
xemacs-form emacs-form))
!
;; This autoload is useless in Emacs because ediff-hook.el is dumped with
;; emacs, but it is needed in XEmacs
;;;###autoload
--- 57,63 ----
(defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form)
(if (string-match "XEmacs" emacs-version)
xemacs-form emacs-form))
!
;; This autoload is useless in Emacs because ediff-hook.el is dumped with
;; emacs, but it is needed in XEmacs
;;;###autoload
***************
*** 147,158 ****
:selected (if (featurep 'ediff-tbar)
(ediff-use-toolbar-p))]
))
!
;; put these menus before Object-Oriented-Browser in Tools menu
(if (and (featurep 'menubar) (not (featurep 'infodock))
(not (featurep 'ediff-hook)))
(ediff-xemacs-init-menus)))
!
;; Emacs--only if menu-bar is loaded
(if (featurep 'menu-bar)
(progn
--- 147,158 ----
:selected (if (featurep 'ediff-tbar)
(ediff-use-toolbar-p))]
))
!
;; put these menus before Object-Oriented-Browser in Tools menu
(if (and (featurep 'menubar) (not (featurep 'infodock))
(not (featurep 'ediff-hook)))
(ediff-xemacs-init-menus)))
!
;; Emacs--only if menu-bar is loaded
(if (featurep 'menu-bar)
(progn
***************
*** 164,170 ****
(defvar menu-bar-epatch-menu (make-sparse-keymap "Apply Patch"))
(fset 'menu-bar-epatch-menu (symbol-value 'menu-bar-epatch-menu))
(defvar menu-bar-ediff-merge-menu (make-sparse-keymap "Merge"))
! (fset 'menu-bar-ediff-merge-menu
(symbol-value 'menu-bar-ediff-merge-menu))
(defvar menu-bar-ediff-menu (make-sparse-keymap "Compare"))
(fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu))
--- 164,170 ----
(defvar menu-bar-epatch-menu (make-sparse-keymap "Apply Patch"))
(fset 'menu-bar-epatch-menu (symbol-value 'menu-bar-epatch-menu))
(defvar menu-bar-ediff-merge-menu (make-sparse-keymap "Merge"))
! (fset 'menu-bar-ediff-merge-menu
(symbol-value 'menu-bar-ediff-merge-menu))
(defvar menu-bar-ediff-menu (make-sparse-keymap "Compare"))
(fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu))
***************
*** 222,228 ****
. ediff-merge-directories-with-ancestor))
(define-key menu-bar-ediff-merge-menu [ediff-merge-directories]
'("Directories..." . ediff-merge-directories))
! (define-key
menu-bar-ediff-merge-menu [separator-ediff-merge-dirs] '("--"))
(define-key
menu-bar-ediff-merge-menu [ediff-merge-buffers-with-ancestor]
--- 222,228 ----
. ediff-merge-directories-with-ancestor))
(define-key menu-bar-ediff-merge-menu [ediff-merge-directories]
'("Directories..." . ediff-merge-directories))
! (define-key
menu-bar-ediff-merge-menu [separator-ediff-merge-dirs] '("--"))
(define-key
menu-bar-ediff-merge-menu [ediff-merge-buffers-with-ancestor]
***************
*** 251,257 ****
(define-key menu-bar-ediff-misc-menu [ediff-doc]
'("Ediff Manual..." . ediff-documentation))
)
!
) ; emacs case
) ; ediff-cond-compile-for-xemacs-or-emacs
--- 251,257 ----
(define-key menu-bar-ediff-misc-menu [ediff-doc]
'("Ediff Manual..." . ediff-documentation))
)
!
) ; emacs case
) ; ediff-cond-compile-for-xemacs-or-emacs
***************
*** 273,285 ****
(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
--- 273,285 ----
(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
***************
*** 308,316 ****
(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
--- 308,316 ----
(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
***************
*** 326,334 ****
"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"
--- 326,334 ----
"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"
***************
*** 364,370 ****
"ediff-util"
"Toggle the use of Ediff toolbar."
t)
!
) ; if purify-flag
--- 364,370 ----
"ediff-util"
"Toggle the use of Ediff toolbar."
t)
!
) ; if purify-flag
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/ediff-hook.el,
Miles Bader <=