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

[Richard M . Stallman]

Index: emacs/lisp/url/url-vars.el
diff -c emacs/lisp/url/url-vars.el:1.6 emacs/lisp/url/url-vars.el:1.7
*** emacs/lisp/url/url-vars.el:1.6      Tue Oct 12 09:55:08 2004
--- emacs/lisp/url/url-vars.el  Sat Oct 16 15:02:02 2004
***************
*** 191,209 ****
                       (string :tag "Proxy")))
    :group 'url)
  
- (defcustom url-passwd-entry-func nil
-   "*Symbol indicating which function to call to read in a password.
- It will be set up depending on whether you are running EFS or ange-ftp
- at startup if it is nil.  This function should accept the prompt
- string as its first argument, and the default value as its second
- argument."
-   :type '(choice (const :tag "Guess" :value nil)
-                (const :tag "Use Ange-FTP" :value ange-ftp-read-passwd)
-                (const :tag "Use EFS"      :value efs-read-passwd)
-                (const :tag "Use Password Package" :value read-passwd)
-                (function :tag "Other"))
-   :group 'url-hairy)
- 
  (defcustom url-standalone-mode nil
    "*Rely solely on the cache?"
    :type 'boolean
--- 191,196 ----
***************
*** 240,263 ****
  (defvar url-mime-encoding-string nil
    "*String to send in the Accept-encoding: field in HTTP requests.")
  
- ;; `mm-mime-mule-charset-alist' in Gnus 5.8/9 contains elements whose
- ;; cars aren't valid MIME charsets/coding systems, at least in Emacs.
- ;; This gets it correct by construction in Emacs.  Fixme: DTRT for
- ;; XEmacs -- its `coding-system-list' doesn't have the BASE-ONLY arg.
- (when (and (not (featurep 'xemacs))
-          (fboundp 'coding-system-list))
-   (setq mm-mime-mule-charset-alist
-       (apply
-        'nconc
-        (mapcar
-         (lambda (cs)
-           (when (and (coding-system-get cs 'mime-charset)
-                      (not (eq t (coding-system-get cs 'safe-charsets))))
-             (list (cons (coding-system-get cs 'mime-charset)
-                         (delq 'ascii
-                               (coding-system-get cs 'safe-charsets))))))
-         (coding-system-list 'base-only)))))
- 
  ;; Perhaps the first few should actually be given decreasing `q's and
  ;; the list should be trimmed significantly.
  ;; Fixme: do something sane if we don't have `sort-coding-systems'
--- 227,232 ----
***************
*** 381,394 ****
  
  (defvar url-setup-done nil "Has setup configuration been done?")
  
! (defconst weekday-alist
    '(("Sunday" . 0) ("Monday" . 1) ("Tuesday" . 2) ("Wednesday" . 3)
      ("Thursday" . 4) ("Friday" . 5) ("Saturday" . 6)
      ("Tues" . 2) ("Thurs" . 4)
      ("Sun" . 0) ("Mon" . 1) ("Tue" . 2) ("Wed" . 3)
      ("Thu" . 4) ("Fri" . 5) ("Sat" . 6)))
  
! (defconst monthabbrev-alist
    '(("Jan" . 1) ("Feb" . 2) ("Mar" . 3) ("Apr" . 4) ("May" . 5) ("Jun" . 6)
      ("Jul" . 7) ("Aug" . 8) ("Sep" . 9) ("Oct" . 10) ("Nov" . 11)
      ("Dec" . 12)))
--- 350,363 ----
  
  (defvar url-setup-done nil "Has setup configuration been done?")
  
! (defconst url-weekday-alist
    '(("Sunday" . 0) ("Monday" . 1) ("Tuesday" . 2) ("Wednesday" . 3)
      ("Thursday" . 4) ("Friday" . 5) ("Saturday" . 6)
      ("Tues" . 2) ("Thurs" . 4)
      ("Sun" . 0) ("Mon" . 1) ("Tue" . 2) ("Wed" . 3)
      ("Thu" . 4) ("Fri" . 5) ("Sat" . 6)))
  
! (defconst url-monthabbrev-alist
    '(("Jan" . 1) ("Feb" . 2) ("Mar" . 3) ("Apr" . 4) ("May" . 5) ("Jun" . 6)
      ("Jul" . 7) ("Aug" . 8) ("Sep" . 9) ("Oct" . 10) ("Nov" . 11)
      ("Dec" . 12)))
***************
*** 425,430 ****
--- 394,401 ----
  (defun url-vars-unload-hook ()
    (remove-hook 'set-language-environment-hook 'url-set-mime-charset-string))
  
+ (add-hook 'url-vars-unload-hook 'url-vars-unload-hook)
+ 
  (provide 'url-vars)
  
  ;;; arch-tag: 29205e5f-c5ce-433c-8d5d-38cbaed64b49