mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00
Code Issues Projects Releases Wiki Activity

Move Ediff's debug-ignored-errors from bindings.el.

Browse source
This commit is contained in:
Juri Linkov 2004-06-06 02:44:14 +00:00
parent cd8d6674f6
commit fb0fb4fa4e
1 changed files with 47 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

47
lisp/ediff.el
View file

@ -1474,6 +1474,53 @@ With optional NODE, goes to that node."
(set-window-buffer ctl-window ctl-buf)))))))
(dolist (mess '("^Errors in diff output. Diff output is in "
"^Hmm... I don't see an Ediff command around here...$"
"^Undocumented command! Type `G' in Ediff Control Panel to drop a note to the Ediff maintainer$"
": This command runs in Ediff Control Buffer only!$"
": Invalid op in ediff-check-version$"
"^ediff-shrink-window-C can be used only for merging jobs$"
"^Lost difference info on these directories$"
"^This command is inapplicable in the present context$"
"^This session group has no parent$"
"^Can't hide active session, $"
"^Ediff: something wrong--no multiple diffs buffer$"
"^Can't make context diff for Session $"
"^The patch buffer wasn't found$"
"^Aborted$"
"^This Ediff session is not part of a session group$"
"^No active Ediff sessions or corrupted session registry$"
"^No session info in this line$"
"^`.*' is not an ordinary file$"
"^Patch appears to have failed$"
"^Recomputation of differences cancelled$"
"^No fine differences in this mode$"
"^Lost connection to ancestor buffer...sorry$"
"^Not merging with ancestor$"
"^Don't know how to toggle read-only in buffer "
"Emacs is not running as a window application$"
"^This command makes sense only when merging with an ancestor$"
"^At end of the difference list$"
"^At beginning of the difference list$"
"^Nothing saved for diff .* in buffer "
"^Buffer is out of sync for file "
"^Buffer out of sync for file "
"^Output from `diff' not found$"
"^You forgot to specify a region in buffer "
"^All right. Make up your mind and come back...$"
"^Current buffer is not visiting any file$"
"^Failed to retrieve revision: $"
"^Can't determine display width.$"
"^File `.*' does not exist or is not readable$"
"^File `.*' is a directory$"
"^Buffer .* doesn't exist$"
"^Directories . and . are the same: "
"^Directory merge aborted$"
"^Merge of directory revisions aborted$"
"^Buffer .* doesn't exist$"
"^There is no file to merge$"
"^Version control package .*.el not found. Use vc.el instead$"))
(add-to-list 'debug-ignored-errors mess))
;;; Local Variables: