[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/bindings.el
From: |
Juri Linkov |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/bindings.el |
Date: |
Sat, 05 Jun 2004 22:44:20 -0400 |
Index: emacs/lisp/bindings.el
diff -c emacs/lisp/bindings.el:1.130 emacs/lisp/bindings.el:1.131
*** emacs/lisp/bindings.el:1.130 Sat May 1 03:50:24 2004
--- emacs/lisp/bindings.el Sun Jun 6 02:42:55 2004
***************
*** 542,604 ****
file-supersession
"^Previous command was not a yank$"
"^Minibuffer window is not active$"
"^End of history; no next item$"
"^Beginning of history; no preceding item$"
"^No recursive edit is in progress$"
"^Changes to be undone are outside visible portion of buffer$"
"^No undo information in this buffer$"
! "^No further undo information$"
"^Save not confirmed$"
"^Recover-file cancelled\\.$"
"^Cannot switch buffers in a dedicated window$"
!
! ;; 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, $"
! "^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$"))
(make-variable-buffer-local 'indent-tabs-mode)
--- 542,561 ----
file-supersession
"^Previous command was not a yank$"
"^Minibuffer window is not active$"
+ "^No previous history search regexp$"
+ "^No later matching history item$"
+ "^No earlier matching history item$"
+ "^End of history; no default available$"
"^End of history; no next item$"
"^Beginning of history; no preceding item$"
"^No recursive edit is in progress$"
"^Changes to be undone are outside visible portion of buffer$"
"^No undo information in this buffer$"
! "^No further undo information"
"^Save not confirmed$"
"^Recover-file cancelled\\.$"
"^Cannot switch buffers in a dedicated window$"
! ))
(make-variable-buffer-local 'indent-tabs-mode)
- [Emacs-diffs] Changes to emacs/lisp/bindings.el,
Juri Linkov <=