diff lisp/subr.el @ 83156:8e09aff3715a

Merged in changes from CVS trunk. Patches applied: * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-383 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-384 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-385 src/xfaces.c (push_named_merge_point): Return 0 if a cycle is detected * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-386 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-387 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-388 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-389 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-390 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-391 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-392 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-393 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-196

--- a/lisp/subr.el	Tue Jun 08 01:33:48 2004 +0000
+++ b/lisp/subr.el	Thu Jun 10 17:17:08 2004 +0000
@@ -1339,7 +1339,7 @@
 		(replace-match (format " (default %s)" default) t t prompt 1)
 	      (replace-regexp-in-string "[ \t]*\\'"
 					(format " (default %s) " default)
-					prompt t t)))) 
+					prompt t t))))
     (while
 	(progn
 	  (let ((str (read-from-minibuffer prompt nil nil nil nil
@@ -1708,8 +1708,8 @@
 (defun insert-buffer-substring-no-properties (buffer &optional start end)
   "Insert before point a substring of BUFFER, without text properties.
 BUFFER may be a buffer or a buffer name.
-Arguments START and END are character numbers specifying the substring.
-They default to the beginning and the end of BUFFER."
+Arguments START and END are character positions specifying the substring.
+They default to the values of (point-min) and (point-max) in BUFFER."
   (let ((opoint (point)))
     (insert-buffer-substring buffer start end)
     (let ((inhibit-read-only t))
@@ -1718,8 +1718,8 @@
 (defun insert-buffer-substring-as-yank (buffer &optional start end)
   "Insert before point a part of BUFFER, stripping some text properties.
 BUFFER may be a buffer or a buffer name.
-Arguments START and END are character numbers specifying the substring.
-They default to the beginning and the end of BUFFER.
+Arguments START and END are character positions specifying the substring.
+They default to the values of (point-min) and (point-max) in BUFFER.
 Strip text properties from the inserted text according to
 `yank-excluded-properties'."
   ;; Since the buffer text should not normally have yank-handler properties,