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

[Juri Linkov]

Index: emacs/lisp/ediff-hook.el
diff -c emacs/lisp/ediff-hook.el:1.25 emacs/lisp/ediff-hook.el:1.26
*** emacs/lisp/ediff-hook.el:1.25       Mon Sep  1 15:45:11 2003
--- emacs/lisp/ediff-hook.el    Mon Mar 28 01:18:22 2005
***************
*** 131,140 ****
         ))
     (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-toggle-multiframe
        :style toggle
        :selected (if (and (featurep 'ediff-util)
--- 131,140 ----
         ))
     (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-toggle-multiframe
        :style toggle
        :selected (if (and (featurep 'ediff-util)
***************
*** 242,255 ****
  
         ;; define ediff miscellanea
         (define-key menu-bar-ediff-misc-menu [emultiframe]
!        '("Toggle use of separate control buffer frame..."
           . ediff-toggle-multiframe))
         (define-key menu-bar-ediff-misc-menu [eregistry]
!        '("List Ediff Sessions..." . ediff-show-registry))
         (define-key menu-bar-ediff-misc-menu [ediff-cust]
!        '("Customize Ediff..." . ediff-customize))
         (define-key menu-bar-ediff-misc-menu [ediff-doc]
!        '("Ediff Manual..." . ediff-documentation))
         )
  
        ) ; emacs case
--- 242,255 ----
  
         ;; define ediff miscellanea
         (define-key menu-bar-ediff-misc-menu [emultiframe]
!        '("Toggle use of separate control buffer frame"
           . ediff-toggle-multiframe))
         (define-key menu-bar-ediff-misc-menu [eregistry]
!        '("List Ediff Sessions" . ediff-show-registry))
         (define-key menu-bar-ediff-misc-menu [ediff-cust]
!        '("Customize Ediff" . ediff-customize))
         (define-key menu-bar-ediff-misc-menu [ediff-doc]
!        '("Ediff Manual" . ediff-documentation))
         )
  
        ) ; emacs case