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

[Thien-Thi Nguyen]

Index: emacs/lisp/url/url.el
diff -c emacs/lisp/url/url.el:1.12 emacs/lisp/url/url.el:1.13
*** emacs/lisp/url/url.el:1.12  Fri Jul 15 05:11:28 2005
--- emacs/lisp/url/url.el       Sat Aug  6 15:55:38 2005
***************
*** 1,7 ****
  ;;; url.el --- Uniform Resource Locator retrieval tool
  
! ;; Copyright (c) 1996, 1997, 1998, 1999, 2001, 2004, 2005
! ;;           Free Software Foundation, Inc.
  
  ;; Author: Bill Perry <address@hidden>
  ;; Keywords: comm, data, processes, hypermedia
--- 1,7 ----
  ;;; url.el --- Uniform Resource Locator retrieval tool
  
! ;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2004,
! ;;   2005 Free Software Foundation, Inc.
  
  ;; Author: Bill Perry <address@hidden>
  ;; Keywords: comm, data, processes, hypermedia
***************
*** 56,62 ****
  (require 'url-parse)
  (require 'url-util)
  
! ;; Fixme: customize? convert-standard-filename? 
  ;;;###autoload
  (defvar url-configuration-directory "~/.url")
  
--- 56,62 ----
  (require 'url-parse)
  (require 'url-util)
  
! ;; Fixme: customize? convert-standard-filename?
  ;;;###autoload
  (defvar url-configuration-directory "~/.url")
  
***************
*** 71,77 ****
  
      (mailcap-parse-mailcaps)
      (mailcap-parse-mimetypes)
!     
      ;; Register all the authentication schemes we can handle
      (url-register-auth-scheme "basic" nil 4)
      (url-register-auth-scheme "digest" nil 7)
--- 71,77 ----
  
      (mailcap-parse-mailcaps)
      (mailcap-parse-mimetypes)
! 
      ;; Register all the authentication schemes we can handle
      (url-register-auth-scheme "basic" nil 4)
      (url-register-auth-scheme "digest" nil 7)
***************
*** 79,89 ****
      (setq url-cookie-file
          (or url-cookie-file
              (expand-file-name "cookies" url-configuration-directory)))
!     
      (setq url-history-file
          (or url-history-file
              (expand-file-name "history" url-configuration-directory)))
!   
      ;; Parse the global history file if it exists, so that it can be used
      ;; for URL completion, etc.
      (url-history-parse-history)
--- 79,89 ----
      (setq url-cookie-file
          (or url-cookie-file
              (expand-file-name "cookies" url-configuration-directory)))
! 
      (setq url-history-file
          (or url-history-file
              (expand-file-name "history" url-configuration-directory)))
! 
      ;; Parse the global history file if it exists, so that it can be used
      ;; for URL completion, etc.
      (url-history-parse-history)
***************
*** 229,235 ****
            (message "Viewing externally")
            (kill-buffer (current-buffer)))
        (display-buffer (current-buffer))
!       (add-hook 'kill-buffer-hook 
                  `(lambda () (mm-destroy-parts ',handle))
                  nil
                  t)))))
--- 229,235 ----
            (message "Viewing externally")
            (kill-buffer (current-buffer)))
        (display-buffer (current-buffer))
!       (add-hook 'kill-buffer-hook
                  `(lambda () (mm-destroy-parts ',handle))
                  nil
                  t)))))