From: Glenn Morris Date: Fri, 24 May 2013 06:55:45 +0000 (-0700) Subject: * mail/unrmail.el (unrmail): Replace obsolete detect-coding-with-priority. X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~209 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9e614a3fa083b1882666b6df50f027df4e471806;p=emacs.git * mail/unrmail.el (unrmail): Replace obsolete detect-coding-with-priority. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0587ad3a618..6baa68cae77 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2013-05-24 Glenn Morris + * mail/unrmail.el (unrmail): + Replace obsolete detect-coding-with-priority. + * net/socks.el (socks-split-string): Use this rather than split-string. (socks-nslookup-host): Update for above change. (dynamic-choice, s5-dynamic-choice-match) diff --git a/lisp/mail/unrmail.el b/lisp/mail/unrmail.el index 698e9b0e0a0..ac28e23e924 100644 --- a/lisp/mail/unrmail.el +++ b/lisp/mail/unrmail.el @@ -94,11 +94,9 @@ The variable `unrmail-mbox-format' controls which mbox format to use." ;; earlier versions did that with the current buffer's encoding. ;; So we want to favor detection of emacs-mule (whose normal ;; priority is quite low), but still allow detection of other - ;; encodings if emacs-mule won't fit. The call to - ;; detect-coding-with-priority below achieves that. - (car (detect-coding-with-priority - from to - '((coding-category-emacs-mule . emacs-mule)))))) + ;; encodings if emacs-mule won't fit. + (car (with-coding-priority '(emacs-mule) + (detect-coding-region from to))))) (unless (memq coding-system '(undecided undecided-unix)) (set-buffer-modified-p t) ; avoid locking when decoding