[Emacs-diffs] Changes to emacs/lisp/ido.el

[Kim F. Storm]

Index: emacs/lisp/ido.el
diff -u emacs/lisp/ido.el:1.83 emacs/lisp/ido.el:1.84
--- emacs/lisp/ido.el:1.83      Mon Feb  6 14:33:34 2006
+++ emacs/lisp/ido.el   Sat Feb 11 20:30:49 2006
@@ -2022,9 +2022,10 @@
        (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 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)