Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!

Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-490 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-491 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-492 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-493 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-494 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-495 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-496 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-497 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-498 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-499 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-500 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-501 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-502 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-503 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-504 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-505 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-506 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-507 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-508 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-509 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-510 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-511 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-512 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-513 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-514 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-515 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-516 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-517 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-518 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-519 Update from CVS: etc/TUTORIAL.cn: Updated. * emacs@sv.gnu.org/emacs--devo--0--patch-520 Merge from erc--emacs--22 * emacs@sv.gnu.org/emacs--devo--0--patch-521 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-522 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-523 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-524 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-525 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-526 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-527 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-528 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-529 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-530 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-531 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-532 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-533 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-534 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-535 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-161 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-162 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-163 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-164 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-165 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-166 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-167 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-168 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-169 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-170 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-588
author: Karoly Lorentey 2006-12-03 15:03:30 +0000
committer: Karoly Lorentey 2006-12-03 15:03:30 +0000
commit: 974b73e83842d63b14512aa225cc53983a9b5d14 (patch)
tree: 462170d38cbb7057e98f08e8c612a9d30eeea0fd /src/buffer.c
parent: d0104e754a241cf83811fef30195d41201de533c (diff)
parent: f5be22a273892218aad1db32c43ba562a08f3925 (diff)
download: emacs-974b73e83842d63b14512aa225cc53983a9b5d14.tar.gz
emacs-974b73e83842d63b14512aa225cc53983a9b5d14.zip
1 files changed, 2 insertions, 2 deletions
diff --git a/src/buffer.c b/src/buffer.c
index f2f15a54743..05555913c59 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5948,8 +5948,8 @@ An entry of the form POSITION indicates that point was at the buffer
 location given by the integer.  Undoing an entry of this form places
 point at POSITION.
-nil marks undo boundaries.  The undo command treats the changes
+Entries with value `nil' mark undo boundaries.  The undo command treats
-between two undo boundaries as a single step to be undone.
+the changes between two undo boundaries as a single step to be undone.
 If the value of the variable is t, undo information is not recorded.  */);
author	Karoly Lorentey	2006-12-03 15:03:30 +0000
committer	Karoly Lorentey	2006-12-03 15:03:30 +0000
commit	974b73e83842d63b14512aa225cc53983a9b5d14 (patch)
tree	462170d38cbb7057e98f08e8c612a9d30eeea0fd /src/buffer.c
parent	d0104e754a241cf83811fef30195d41201de533c (diff)
parent	f5be22a273892218aad1db32c43ba562a08f3925 (diff)
download	emacs-974b73e83842d63b14512aa225cc53983a9b5d14.tar.gz emacs-974b73e83842d63b14512aa225cc53983a9b5d14.zip

diff --git a/src/buffer.c b/src/buffer.c index f2f15a54743..05555913c59 100644 --- a/src/buffer.c +++ b/src/buffer.c
@@ -5948,8 +5948,8 @@ An entry of the form POSITION indicates that point was at the buffer
5948	location given by the integer. Undoing an entry of this form places	5948	location given by the integer. Undoing an entry of this form places
5949	point at POSITION.	5949	point at POSITION.
5950		5950
5951	nil marks undo boundaries. The undo command treats the changes	5951	Entries with value `nil' mark undo boundaries. The undo command treats
5952	between two undo boundaries as a single step to be undone.	5952	the changes between two undo boundaries as a single step to be undone.
5953		5953
5954	If the value of the variable is t, undo information is not recorded. */);	5954	If the value of the variable is t, undo information is not recorded. */);
5955		5955