aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman <[email protected]>1997-07-24 21:41:33 +0000
committerRichard M. Stallman <[email protected]>1997-07-24 21:41:33 +0000
commitcdd4703c10922d4454c3cc9e47dff611af578e73 (patch)
tree50057aeea4bb3690df7722be03e25d5a389982d4
parentb1cba2ee7701114a07a8c86c61d8d28eab2d54fb (diff)
(debug-ignored-errors): Update the dabbrev.el errors.
Add errors generated by ediff*.el.
-rw-r--r--lisp/bindings.el51
1 files changed, 51 insertions, 0 deletions
diff --git a/lisp/bindings.el b/lisp/bindings.el
index f92534f340..66e46b310d 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -166,6 +166,7 @@ is okay. See `mode-line-format'.")
;; dabbrev
"^No dynamic expansion for .* found$"
"^No further dynamic expansion for .* found$"
+ "^No possible abbreviation preceding point$"
;; Completion
"^To complete, the point must be after a symbol at least [0-9]* character long\\.$"
@@ -208,6 +209,56 @@ is okay. See `mode-line-format'.")
"^File .* not in current tags tables$"
"^No tags table loaded"
"^Nothing to complete$"
+
+ ;; ediff
+ "^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, $"
+ "^Sorry, I don't do this for everyone...$"
+ "^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$"
+ "^Quit$"
+ "^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$"
;; BBDB
"^no previous record$"