[Emacs-diffs] Changes to emacs/lisp/url/url-handlers.el [emacs-unicode-2]

[Miles Bader]

Index: emacs/lisp/url/url-handlers.el
diff -c emacs/lisp/url/url-handlers.el:1.4.2.1 
emacs/lisp/url/url-handlers.el:1.4.2.2
*** emacs/lisp/url/url-handlers.el:1.4.2.1      Mon Jun 28 07:30:01 2004
--- emacs/lisp/url/url-handlers.el      Tue Sep 21 09:34:11 2004
***************
*** 1,6 ****
  ;;; url-handlers.el --- file-name-handler stuff for URL loading
  
! ;; Copyright (c) 1996,97,98,1999,2004  Free Software Foundation, Inc.
  ;; Copyright (c) 1993 - 1996 by William M. Perry <address@hidden>
  
  ;; Keywords: comm, data, processes, hypermedia
--- 1,6 ----
  ;;; url-handlers.el --- file-name-handler stuff for URL loading
  
! ;; Copyright (c) 1996, 1997, 1998, 1999, 2004  Free Software Foundation, Inc.
  ;; Copyright (c) 1993 - 1996 by William M. Perry <address@hidden>
  
  ;; Keywords: comm, data, processes, hypermedia
***************
*** 170,177 ****
        (handle nil))
      (if (not buffer)
        (error "Opening input file: No such file or directory, %s" url))
!     (save-excursion
!       (set-buffer buffer)
        (setq handle (mm-dissect-buffer t)))
      (mm-save-part-to-file handle newname)
      (kill-buffer buffer)
--- 170,176 ----
        (handle nil))
      (if (not buffer)
        (error "Opening input file: No such file or directory, %s" url))
!     (with-current-buffer buffer
        (setq handle (mm-dissect-buffer t)))
      (mm-save-part-to-file handle newname)
      (kill-buffer buffer)
***************
*** 194,211 ****
      (if (not buffer)
        (error "Opening input file: No such file or directory, %s" url))
      (if visit (setq buffer-file-name url))
!     (save-excursion
!       (set-buffer buffer)
        (setq handle (mm-dissect-buffer t))
        (set-buffer (mm-handle-buffer handle))
!       (if beg
!         (setq data (buffer-substring beg end))
!       (setq data (buffer-string))))
      (kill-buffer buffer)
      (mm-destroy-parts handle)
      (if replace (delete-region (point-min) (point-max)))
      (save-excursion
!       (insert data))
      (list url (length data))))
  
  (defun url-file-name-completion (url directory)
--- 193,214 ----
      (if (not buffer)
        (error "Opening input file: No such file or directory, %s" url))
      (if visit (setq buffer-file-name url))
!     (with-current-buffer buffer
        (setq handle (mm-dissect-buffer t))
        (set-buffer (mm-handle-buffer handle))
!       (setq data (if beg (buffer-substring beg end)
!                  (buffer-string))))
      (kill-buffer buffer)
      (mm-destroy-parts handle)
      (if replace (delete-region (point-min) (point-max)))
      (save-excursion
!       (let ((start (point)))
!       (insert data)
!       ;; FIXME: for text/plain data, we sometimes receive a `charset'
!       ;; annotation which we could use as a hint of the locale in use
!       ;; at the remote site.  Not sure how/if that should be done.  --Stef
!       (decode-coding-inserted-region
!        start (point) buffer-file-name visit beg end replace)))
      (list url (length data))))
  
  (defun url-file-name-completion (url directory)