Mercurial > emacs
comparison lisp/ediff.el @ 55943:b54f2d3d90fc
Move Ediff's debug-ignored-errors from bindings.el.
| author | Juri Linkov <juri@jurta.org> |
|---|---|
| date | Sun, 06 Jun 2004 02:44:14 +0000 |
| parents | d08ef8842be1 |
| children | 905bf9de87af 4c90ffeb71c5 |
comparison
equal
deleted
inserted
replaced
| 55942:7297a6eaf64b | 55943:b54f2d3d90fc |
|---|---|
| 1472 (progn | 1472 (progn |
| 1473 (select-window ctl-window) | 1473 (select-window ctl-window) |
| 1474 (set-window-buffer ctl-window ctl-buf))))))) | 1474 (set-window-buffer ctl-window ctl-buf))))))) |
| 1475 | 1475 |
| 1476 | 1476 |
| 1477 (dolist (mess '("^Errors in diff output. Diff output is in " | |
| 1478 "^Hmm... I don't see an Ediff command around here...$" | |
| 1479 "^Undocumented command! Type `G' in Ediff Control Panel to drop a note to the Ediff maintainer$" | |
| 1480 ": This command runs in Ediff Control Buffer only!$" | |
| 1481 ": Invalid op in ediff-check-version$" | |
| 1482 "^ediff-shrink-window-C can be used only for merging jobs$" | |
| 1483 "^Lost difference info on these directories$" | |
| 1484 "^This command is inapplicable in the present context$" | |
| 1485 "^This session group has no parent$" | |
| 1486 "^Can't hide active session, $" | |
| 1487 "^Ediff: something wrong--no multiple diffs buffer$" | |
| 1488 "^Can't make context diff for Session $" | |
| 1489 "^The patch buffer wasn't found$" | |
| 1490 "^Aborted$" | |
| 1491 "^This Ediff session is not part of a session group$" | |
| 1492 "^No active Ediff sessions or corrupted session registry$" | |
| 1493 "^No session info in this line$" | |
| 1494 "^`.*' is not an ordinary file$" | |
| 1495 "^Patch appears to have failed$" | |
| 1496 "^Recomputation of differences cancelled$" | |
| 1497 "^No fine differences in this mode$" | |
| 1498 "^Lost connection to ancestor buffer...sorry$" | |
| 1499 "^Not merging with ancestor$" | |
| 1500 "^Don't know how to toggle read-only in buffer " | |
| 1501 "Emacs is not running as a window application$" | |
| 1502 "^This command makes sense only when merging with an ancestor$" | |
| 1503 "^At end of the difference list$" | |
| 1504 "^At beginning of the difference list$" | |
| 1505 "^Nothing saved for diff .* in buffer " | |
| 1506 "^Buffer is out of sync for file " | |
| 1507 "^Buffer out of sync for file " | |
| 1508 "^Output from `diff' not found$" | |
| 1509 "^You forgot to specify a region in buffer " | |
| 1510 "^All right. Make up your mind and come back...$" | |
| 1511 "^Current buffer is not visiting any file$" | |
| 1512 "^Failed to retrieve revision: $" | |
| 1513 "^Can't determine display width.$" | |
| 1514 "^File `.*' does not exist or is not readable$" | |
| 1515 "^File `.*' is a directory$" | |
| 1516 "^Buffer .* doesn't exist$" | |
| 1517 "^Directories . and . are the same: " | |
| 1518 "^Directory merge aborted$" | |
| 1519 "^Merge of directory revisions aborted$" | |
| 1520 "^Buffer .* doesn't exist$" | |
| 1521 "^There is no file to merge$" | |
| 1522 "^Version control package .*.el not found. Use vc.el instead$")) | |
| 1523 (add-to-list 'debug-ignored-errors mess)) | |
| 1477 | 1524 |
| 1478 | 1525 |
| 1479 ;;; Local Variables: | 1526 ;;; Local Variables: |
| 1480 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) | 1527 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) |
| 1481 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1) | 1528 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1) |