Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
f9b2678c
Commit
f9b2678c
authored
Oct 14, 1995
by
Michael Kifer
Browse files
Now defines [window] in menu-bar-ediff-menu.
parent
04090c34
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
1 deletion
+9
-1
lisp/ediff-hook.el
lisp/ediff-hook.el
+9
-1
No files found.
lisp/ediff-hook.el
View file @
f9b2678c
...
...
@@ -113,6 +113,8 @@
(
fset
'menu-bar-ediff-menu
(
symbol-value
'menu-bar-ediff-menu
))
;; define ediff-menu
(
define-key
menu-bar-ediff-menu
[window]
'
(
"This Window And Next Window"
.
compare-windows
))
(
define-key
menu-bar-ediff-menu
[ediff-dir-revision]
'
(
"Directory Revisions ..."
.
ediff-directory-revisions
))
(
define-key
menu-bar-ediff-menu
[ediff-revision]
...
...
@@ -183,7 +185,7 @@
)
; cond
;; arrange fo
e
autoloads
;; arrange fo
r
autoloads
(
if
purify-flag
()
; if dumping, autoloads are set up in loaddefs.el
;; if the user decides to load this file, set up autoloads
...
...
@@ -260,10 +262,16 @@
"ediff"
"Merge versions of files in a directory using other versions as ancestors"
t
)
;; misc
(
autoload
'ediff-show-registry
"ediff-meta"
"Display the registry of active Ediff sessions"
t
)
(
autoload
'ediff-version
"ediff"
"Show Ediff's version and last modification date"
t
)
)
; if purify-flag
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment