aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris <[email protected]>2013-05-23 23:55:45 -0700
committerGlenn Morris <[email protected]>2013-05-23 23:55:45 -0700
commit9e614a3fa083b1882666b6df50f027df4e471806 (patch)
tree09fc9dc3f5ba17732d36cd1496c4748add00ff67
parent892f8ca3891684df1ea5927f93fec9e6e5cadb26 (diff)
* mail/unrmail.el (unrmail): Replace obsolete detect-coding-with-priority.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/mail/unrmail.el8
2 files changed, 6 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0587ad3a61..6baa68cae7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
2013-05-24 Glenn Morris <[email protected]>
+ * 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 698e9b0e0a..ac28e23e92 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