Mercurial > emacs

comparison lisp/ediff.el @ 7496:52b5bb0c70e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make menu bar defines unconditional. Don't alter menu-bar-files-menu here; menu-bar.el does that.
author Richard M. Stallman <rms@gnu.org>
date Sat, 14 May 1994 08:59:22 +0000
parents 266bf374a7bf
children 67b7d1ea7b2e
comparison
equal deleted inserted replaced
7495:266bf374a7bf 7496:52b5bb0c70e8
1454 ;;; This is split in three parts to avoid 1454 ;;; This is split in three parts to avoid
1455 ;;; making a line in loaddefs.el that is too long for patch. 1455 ;;; making a line in loaddefs.el that is too long for patch.
1456 ;;; Note that autoload.el currently looks for cookies 1456 ;;; Note that autoload.el currently looks for cookies
1457 ;;; only at top level in the file. 1457 ;;; only at top level in the file.
1458 ;;;###autoload 1458 ;;;###autoload
1459 (if (not (ediff-if-lucid)) 1459 (progn
1460 (progn 1460 (defvar menu-bar-epatch-menu (make-sparse-keymap "menu-bar-epatch-map"))
1461 (defvar menu-bar-epatch-menu (make-sparse-keymap "menu-bar-epatch-map")) 1461 (fset 'menu-bar-epatch-menu (symbol-value 'menu-bar-epatch-menu))
1462 (fset 'menu-bar-epatch-menu (symbol-value 'menu-bar-epatch-menu)) 1462 (defvar menu-bar-ediff-menu (make-sparse-keymap "menu-bar-ediff-map"))
1463 (defvar menu-bar-ediff-menu (make-sparse-keymap "menu-bar-ediff-map")) 1463 (fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu)))
1464 (fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu))))
1465 1464
1466 ;;;###autoload 1465 ;;;###autoload
1467 (if (not (ediff-if-lucid)) 1466 (progn
1468 (progn 1467 (define-key menu-bar-ediff-menu [rcs-ediff]
1469 (define-key menu-bar-ediff-menu [rcs-ediff] 1468 '("With a Revision via RCS ..." . rcs-ediff))
1470 '("With a Revision via RCS ..." . rcs-ediff)) 1469 (define-key menu-bar-ediff-menu [vc-ediff]
1471 (define-key menu-bar-ediff-menu [vc-ediff] 1470 '("With a Revision via VC ..." . vc-ediff))
1472 '("With a Revision via VC ..." . vc-ediff)) 1471 (define-key menu-bar-ediff-menu [ediff-buffers]
1473 (define-key menu-bar-ediff-menu [ediff-buffers] 1472 '("Between Buffers ..." . ediff-buffers))
1474 '("Between Buffers ..." . ediff-buffers)) 1473 (define-key menu-bar-ediff-menu [ediff-files]
1475 (define-key menu-bar-ediff-menu [ediff-files] 1474 '("Between Files ..." . ediff-files)))
1476 '("Between Files ..." . ediff-files))))
1477 1475
1478 ;;;###autoload 1476 ;;;###autoload
1479 (if (not (ediff-if-lucid)) 1477 (progn
1480 (progn 1478 (define-key menu-bar-epatch-menu [ediff-patch-buffer]
1481 (define-key menu-bar-epatch-menu [ediff-patch-buffer] 1479 '("To a Buffer ..." . ediff-patch-buffer))
1482 '("To a Buffer ..." . ediff-patch-buffer)) 1480 (define-key menu-bar-epatch-menu [ediff-patch-file]
1483 (define-key menu-bar-epatch-menu [ediff-patch-file] 1481 '("To a File ..." . ediff-patch-file)))
1484 '("To a File ..." . ediff-patch-file))
1485
1486 (define-key menu-bar-file-menu [epatch]
1487 '("Apply Patch" . menu-bar-epatch-menu))
1488 (define-key menu-bar-file-menu [ediff]
1489 '("Find Differences" . menu-bar-ediff-menu))))
1490 1482
1491 (if (and window-system ediff-want-default-menus (ediff-frame-has-menubar)) 1483 (if (and window-system ediff-want-default-menus (ediff-frame-has-menubar))
1492 (if (ediff-if-lucid) 1484 (if (ediff-if-lucid)
1493 (progn ;; Lucid menu bars 1485 (progn ;; Lucid menu bars
1494 (defvar ediff-menu 1486 (defvar ediff-menu