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

[Andreas Schwab]

Index: emacs/lisp/emerge.el
diff -c emacs/lisp/emerge.el:1.48 emacs/lisp/emerge.el:1.49
*** emacs/lisp/emerge.el:1.48   Mon Mar 24 03:52:20 2003
--- emacs/lisp/emerge.el        Sat Aug  2 18:04:44 2003
***************
*** 27,56 ****
  
  ;;;###autoload
  (defvar menu-bar-emerge-menu (make-sparse-keymap "Emerge"))
! ;;;###autoload
! (fset 'menu-bar-emerge-menu (symbol-value 'menu-bar-emerge-menu))
  
! ;;;###autoload
! (define-key menu-bar-emerge-menu [emerge-merge-directories]
!   '("Merge Directories..." . emerge-merge-directories))
! ;;;###autoload
! (define-key menu-bar-emerge-menu [emerge-revisions-with-ancestor]
!   '("Revisions with Ancestor..." . emerge-revisions-with-ancestor))
! ;;;###autoload
! (define-key menu-bar-emerge-menu [emerge-revisions]
!   '("Revisions..." . emerge-revisions))
! ;;;###autoload
! (define-key menu-bar-emerge-menu [emerge-files-with-ancestor]
!   '("Files with Ancestor..." . emerge-files-with-ancestor))
! ;;;###autoload
! (define-key menu-bar-emerge-menu [emerge-files]
!   '("Files..." . emerge-files))
! ;;;###autoload
! (define-key menu-bar-emerge-menu [emerge-buffers-with-ancestor]
!   '("Buffers with Ancestor..." . emerge-buffers-with-ancestor))
! ;;;###autoload
! (define-key menu-bar-emerge-menu [emerge-buffers]
!   '("Buffers..." . emerge-buffers))
  
  ;;; Macros
  
--- 27,48 ----
  
  ;;;###autoload
  (defvar menu-bar-emerge-menu (make-sparse-keymap "Emerge"))
! ;;;###autoload (fset 'menu-bar-emerge-menu (symbol-value 
'menu-bar-emerge-menu))
  
! ;;;###autoload (define-key menu-bar-emerge-menu [emerge-merge-directories]
! ;;;###autoload   '("Merge Directories..." . emerge-merge-directories))
! ;;;###autoload (define-key menu-bar-emerge-menu 
[emerge-revisions-with-ancestor]
! ;;;###autoload   '("Revisions with Ancestor..." . 
emerge-revisions-with-ancestor))
! ;;;###autoload (define-key menu-bar-emerge-menu [emerge-revisions]
! ;;;###autoload   '("Revisions..." . emerge-revisions))
! ;;;###autoload (define-key menu-bar-emerge-menu [emerge-files-with-ancestor]
! ;;;###autoload   '("Files with Ancestor..." . emerge-files-with-ancestor))
! ;;;###autoload (define-key menu-bar-emerge-menu [emerge-files]
! ;;;###autoload   '("Files..." . emerge-files))
! ;;;###autoload (define-key menu-bar-emerge-menu [emerge-buffers-with-ancestor]
! ;;;###autoload   '("Buffers with Ancestor..." . emerge-buffers-with-ancestor))
! ;;;###autoload (define-key menu-bar-emerge-menu [emerge-buffers]
! ;;;###autoload   '("Buffers..." . emerge-buffers))
  
  ;;; Macros