diff options
| author | Richard M. Stallman | 1997-07-24 21:41:33 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1997-07-24 21:41:33 +0000 |
| commit | cdd4703c10922d4454c3cc9e47dff611af578e73 (patch) | |
| tree | 50057aeea4bb3690df7722be03e25d5a389982d4 /lisp | |
| parent | b1cba2ee7701114a07a8c86c61d8d28eab2d54fb (diff) | |
| download | emacs-cdd4703c10922d4454c3cc9e47dff611af578e73.tar.gz emacs-cdd4703c10922d4454c3cc9e47dff611af578e73.zip | |
(debug-ignored-errors): Update the dabbrev.el errors.
Add errors generated by ediff*.el.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/bindings.el | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/lisp/bindings.el b/lisp/bindings.el index f92534f340a..66e46b310d7 100644 --- a/lisp/bindings.el +++ b/lisp/bindings.el | |||
| @@ -166,6 +166,7 @@ is okay. See `mode-line-format'.") | |||
| 166 | ;; dabbrev | 166 | ;; dabbrev |
| 167 | "^No dynamic expansion for .* found$" | 167 | "^No dynamic expansion for .* found$" |
| 168 | "^No further dynamic expansion for .* found$" | 168 | "^No further dynamic expansion for .* found$" |
| 169 | "^No possible abbreviation preceding point$" | ||
| 169 | 170 | ||
| 170 | ;; Completion | 171 | ;; Completion |
| 171 | "^To complete, the point must be after a symbol at least [0-9]* character long\\.$" | 172 | "^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'.") | |||
| 208 | "^File .* not in current tags tables$" | 209 | "^File .* not in current tags tables$" |
| 209 | "^No tags table loaded" | 210 | "^No tags table loaded" |
| 210 | "^Nothing to complete$" | 211 | "^Nothing to complete$" |
| 212 | |||
| 213 | ;; ediff | ||
| 214 | "^Errors in diff output. Diff output is in " | ||
| 215 | "^Hmm... I don't see an Ediff command around here...$" | ||
| 216 | "^Undocumented command! Type `G' in Ediff Control Panel to drop a note to the Ediff maintainer$" | ||
| 217 | ": This command runs in Ediff Control Buffer only!$" | ||
| 218 | ": Invalid op in ediff-check-version$" | ||
| 219 | "^ediff-shrink-window-C can be used only for merging jobs$" | ||
| 220 | "^Lost difference info on these directories$" | ||
| 221 | "^This command is inapplicable in the present context$" | ||
| 222 | "^This session group has no parent$" | ||
| 223 | "^Can't hide active session, $" | ||
| 224 | "^Sorry, I don't do this for everyone...$" | ||
| 225 | "^Ediff: something wrong--no multiple diffs buffer$" | ||
| 226 | "^Can't make context diff for Session $" | ||
| 227 | "^The patch buffer wasn't found$" | ||
| 228 | "^Aborted$" | ||
| 229 | "^This Ediff session is not part of a session group$" | ||
| 230 | "^No active Ediff sessions or corrupted session registry$" | ||
| 231 | "^No session info in this line$" | ||
| 232 | "^`.*' is not an ordinary file$" | ||
| 233 | "^Patch appears to have failed$" | ||
| 234 | "^Recomputation of differences cancelled$" | ||
| 235 | "^No fine differences in this mode$" | ||
| 236 | "^Lost connection to ancestor buffer...sorry$" | ||
| 237 | "^Not merging with ancestor$" | ||
| 238 | "^Don't know how to toggle read-only in buffer " | ||
| 239 | "Emacs is not running as a window application$" | ||
| 240 | "^This command makes sense only when merging with an ancestor$" | ||
| 241 | "^At end of the difference list$" | ||
| 242 | "^At beginning of the difference list$" | ||
| 243 | "^Quit$" | ||
| 244 | "^Nothing saved for diff .* in buffer " | ||
| 245 | "^Buffer is out of sync for file " | ||
| 246 | "^Buffer out of sync for file " | ||
| 247 | "^Output from `diff' not found$" | ||
| 248 | "^You forgot to specify a region in buffer " | ||
| 249 | "^All right. Make up your mind and come back...$" | ||
| 250 | "^Current buffer is not visiting any file$" | ||
| 251 | "^Failed to retrieve revision: $" | ||
| 252 | "^Can't determine display width.$" | ||
| 253 | "^File `.*' does not exist or is not readable$" | ||
| 254 | "^File `.*' is a directory$" | ||
| 255 | "^Buffer .* doesn't exist$" | ||
| 256 | "^Directories . and . are the same: " | ||
| 257 | "^Directory merge aborted$" | ||
| 258 | "^Merge of directory revisions aborted$" | ||
| 259 | "^Buffer .* doesn't exist$" | ||
| 260 | "^There is no file to merge$" | ||
| 261 | "^Version control package .*.el not found. Use vc.el instead$" | ||
| 211 | 262 | ||
| 212 | ;; BBDB | 263 | ;; BBDB |
| 213 | "^no previous record$" | 264 | "^no previous record$" |