diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-05-23 23:55:45 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-05-23 23:55:45 -0700 |
| commit | 9e614a3fa083b1882666b6df50f027df4e471806 (patch) | |
| tree | 09fc9dc3f5ba17732d36cd1496c4748add00ff67 /lisp | |
| parent | 892f8ca3891684df1ea5927f93fec9e6e5cadb26 (diff) | |
| download | emacs-9e614a3fa083b1882666b6df50f027df4e471806.tar.gz | |
* mail/unrmail.el (unrmail): Replace obsolete detect-coding-with-priority.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/mail/unrmail.el | 8 |
2 files changed, 6 insertions, 5 deletions
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 <rgm@gnu.org> + * 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 |