From: Kim F. Storm <storm@cua.dk>
Date: Sat, 11 Feb 2006 20:30:49 +0000 (+0000)
Subject: (ido-buffer-internal): Set mark for ido-insert-buffer.
X-Git-Tag: emacs-pretest-22.0.90~4211
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2d13e5880dc28c2036be0832c49d78a5ae1138e5;p=emacs.git

(ido-buffer-internal): Set mark for ido-insert-buffer.
Don't use insert-buffer; do insert-buffer-substring directly.
(ido-file-internal): Set mark for ido-insert-file. Use insert-file-1.
---

diff --git a/lisp/ido.el b/lisp/ido.el
index 9c1a3bbbaa6..77479de04d8 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -2022,9 +2022,10 @@ If INITIAL is non-nil, it specifies the initial input string."
 	(if (eq method 'insert)
 	    (progn
 	      (ido-record-command 'insert-buffer buf)
-	      (with-no-warnings
-		;; we really want to run insert-buffer here
-		(insert-buffer buf)))
+	      (push-mark
+	       (save-excursion
+		 (insert-buffer-substring (get-buffer buf))
+		 (point))))
 	  (ido-visit-buffer buf method t)))
 
        ;; buffer doesn't exist
@@ -2225,9 +2226,10 @@ If INITIAL is non-nil, it specifies the initial input string."
 	 (if ido-find-literal 'insert-file-literally 'insert-file)
 	 filename)
 	(ido-record-work-directory)
-	(if ido-find-literal
-	    (insert-file-contents-literally filename)
-	  (insert-file-contents filename)))
+	(insert-file-1 filename
+		       (if ido-find-literal
+			   #'insert-file-contents-literally
+			 #'insert-file-contents)))
 
        (filename
 	(ido-record-work-file filename)