[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/emerge.el [lexbind]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/emerge.el [lexbind] |
Date: |
Tue, 14 Oct 2003 19:51:46 -0400 |
Index: emacs/lisp/emerge.el
diff -c emacs/lisp/emerge.el:1.45.4.1 emacs/lisp/emerge.el:1.45.4.2
*** emacs/lisp/emerge.el:1.45.4.1 Fri Apr 4 01:20:04 2003
--- emacs/lisp/emerge.el Tue Oct 14 19:51:00 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
***************
*** 3217,3220 ****
--- 3209,3213 ----
(provide 'emerge)
+ ;;; arch-tag: a575f092-6e44-400e-b8a2-4124e9377585
;;; emerge.el ends here
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/emerge.el [lexbind],
Miles Bader <=