Searched +refs:ediff +refs:window (Results 1 - 4 of 4) sorted by relevance

/macosx-10.10/emacs-93/emacs/lisp/
H A Dediff-hook.el0 ;;; ediff-hook.el --- setup for Ediff's menus and autoloads
31 ;; (define-key menu-bar-tools-menu [ediff-misc]
32 ;; '("Ediff Miscellanea" . menu-bar-ediff-misc-menu))
35 ;; (define-key menu-bar-tools-menu [ediff-merge]
36 ;; '("Merge" . menu-bar-ediff-merge-menu))
37 ;; (define-key menu-bar-tools-menu [ediff]
38 ;; '("Compare" . menu-bar-ediff-menu))
41 (defvar ediff-menu)
42 (defvar ediff-merge-menu)
44 (defvar ediff
[all...]
H A Dediff-diff.el0 ;;; ediff-diff.el --- diff-related utilities
31 (defvar ediff-default-variant)
37 (or (featurep 'ediff-init)
38 (load "ediff-init.el" nil nil 'nosuffix))
39 (or (featurep 'ediff-util)
40 (load "ediff-util.el" nil nil 'nosuffix))
44 (require 'ediff-init)
46 (defgroup ediff-diff nil
48 :prefix "ediff-"
49 :group 'ediff)
[all...]
H A Dediff-util.el0 ;;; ediff-util.el --- the core commands and utilities of ediff
31 (defvar ediff-patch-diagnostics)
32 (defvar ediff-patchbufer)
33 (defvar ediff-use-toolbar-p)
34 (defvar ediff-toolbar-height)
35 (defvar ediff-toolbar)
36 (defvar ediff-toolbar-3way)
41 (defvar ediff-emacs-p)
43 (defvar ediff
[all...]
H A Dldefs-boot.el135 Switch to other file in other window '\\[ada-ff-other-window]'
136 or '\\[ff-mouse-find-other-file-other-window]
175 ;;;;;; change-log-mode add-change-log-entry-other-window add-change-log-entry
234 Third arg OTHER-WINDOW non-nil means visit in other window.
253 (autoload (quote add-change-log-entry-other-window) "add-log" "\
254 Find change log file in other window and add entry and item.
256 the change log file in another window.
259 (define-key ctl-x-4-map "a" 'add-change-log-entry-other-window)
264 New log entries are usually made with \\[add-change-log-entry] or \\[add-change-log-entry-other-window]
8560 (defalias (quote ediff) (quote ediff-files)) function
[all...]

Completed in 88 milliseconds