aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2013-05-23 23:55:45 -0700
committerGlenn Morris2013-05-23 23:55:45 -0700
commit9e614a3fa083b1882666b6df50f027df4e471806 (patch)
tree09fc9dc3f5ba17732d36cd1496c4748add00ff67
parent892f8ca3891684df1ea5927f93fec9e6e5cadb26 (diff)
downloademacs-9e614a3fa083b1882666b6df50f027df4e471806.tar.gz
emacs-9e614a3fa083b1882666b6df50f027df4e471806.zip
* 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 0587ad3a618..6baa68cae77 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12013-05-24 Glenn Morris <rgm@gnu.org> 12013-05-24 Glenn Morris <rgm@gnu.org>
2 2
3 * mail/unrmail.el (unrmail):
4 Replace obsolete detect-coding-with-priority.
5
3 * net/socks.el (socks-split-string): Use this rather than split-string. 6 * net/socks.el (socks-split-string): Use this rather than split-string.
4 (socks-nslookup-host): Update for above change. 7 (socks-nslookup-host): Update for above change.
5 (dynamic-choice, s5-dynamic-choice-match) 8 (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."
94 ;; earlier versions did that with the current buffer's encoding. 94 ;; earlier versions did that with the current buffer's encoding.
95 ;; So we want to favor detection of emacs-mule (whose normal 95 ;; So we want to favor detection of emacs-mule (whose normal
96 ;; priority is quite low), but still allow detection of other 96 ;; priority is quite low), but still allow detection of other
97 ;; encodings if emacs-mule won't fit. The call to 97 ;; encodings if emacs-mule won't fit.
98 ;; detect-coding-with-priority below achieves that. 98 (car (with-coding-priority '(emacs-mule)
99 (car (detect-coding-with-priority 99 (detect-coding-region from to)))))
100 from to
101 '((coding-category-emacs-mule . emacs-mule))))))
102 (unless (memq coding-system 100 (unless (memq coding-system
103 '(undecided undecided-unix)) 101 '(undecided undecided-unix))
104 (set-buffer-modified-p t) ; avoid locking when decoding 102 (set-buffer-modified-p t) ; avoid locking when decoding