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
3755bd32
Commit
3755bd32
authored
Jul 31, 2002
by
Markus Rost
Browse files
(ediff-backup): New autoloaded command.
parent
32d9a725
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
0 deletions
+23
-0
lisp/ChangeLog
lisp/ChangeLog
+7
-0
lisp/ediff.el
lisp/ediff.el
+16
-0
No files found.
lisp/ChangeLog
View file @
3755bd32
2002-07-31 Markus Rost <rost@math.ohio-state.edu>
* help-fns.el (describe-function-1): Test function for
obsolescence only if it is a symbol.
* ediff.el (ediff-backup): New autoloaded command.
2002-07-31 Richard M. Stallman <rms@gnu.org>
* emacs-lisp/bytecomp.el (byte-compile-find-cl-functions):
...
...
lisp/ediff.el
View file @
3755bd32
...
...
@@ -367,6 +367,22 @@
;;;###autoload
(
defalias
'ediff
'ediff-files
)
;;;###autoload
(
defun
ediff-backup
(
file
)
"Run Ediff on FILE and its backup file.
Uses the latest backup, if there are several numerical backups.
If this file is a backup, `ediff' it with its original."
(
interactive
(
list
(
read-file-name
"Ediff (file with backup): "
)))
;; The code is taken from `diff-backup'.
(
require
'diff
)
(
let
(
bak
ori
)
(
if
(
backup-file-name-p
file
)
(
setq
bak
file
ori
(
file-name-sans-versions
file
))
(
setq
bak
(
or
(
diff-latest-backup-file
file
)
(
error
"No backup found for %s"
file
))
ori
file
))
(
ediff-files
bak
ori
)))
;;;###autoload
(
defun
ediff-buffers
(
buffer-A
buffer-B
&optional
startup-hooks
job-name
)
...
...
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