aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2008-04-05 20:08:27 +0000
committerStefan Monnier2008-04-05 20:08:27 +0000
commit2b57967e5cb99389b4584356abb225264ee69576 (patch)
treee2a6acb6697d0c839c41199c90972f5729df872c
parentd7eb3b362d86cd14a1e1541f1fb6a651f973e337 (diff)
downloademacs-2b57967e5cb99389b4584356abb225264ee69576.tar.gz
emacs-2b57967e5cb99389b4584356abb225264ee69576.zip
(gnus-x-splash): Avoid binding default-enable-multibyte-characters.
-rw-r--r--lisp/gnus/ChangeLog3
-rw-r--r--lisp/gnus/gnus-ems.el4
2 files changed, 5 insertions, 2 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index d5850f7511b..4fd0615e5eb 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,8 @@
12008-04-05 Stefan Monnier <monnier@iro.umontreal.ca> 12008-04-05 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * gnus-ems.el (gnus-x-splash): Prefer mm-disable-multibyte to
4 default-enable-multibyte-characters.
5
3 * gnus-fun.el (gnus-display-x-face-in-from): Remove unnecessary use of 6 * gnus-fun.el (gnus-display-x-face-in-from): Remove unnecessary use of
4 default-enable-multibyte-characters. 7 default-enable-multibyte-characters.
5 8
diff --git a/lisp/gnus/gnus-ems.el b/lisp/gnus/gnus-ems.el
index 337fc38b281..550a5344422 100644
--- a/lisp/gnus/gnus-ems.el
+++ b/lisp/gnus/gnus-ems.el
@@ -179,9 +179,9 @@
179 (sit-for 0) ;; Necessary for measuring the window size correctly. 179 (sit-for 0) ;; Necessary for measuring the window size correctly.
180 (when (and file 180 (when (and file
181 (ignore-errors 181 (ignore-errors
182 (let ((coding-system-for-read 'raw-text) 182 (let ((coding-system-for-read 'raw-text))
183 default-enable-multibyte-characters)
184 (with-temp-buffer 183 (with-temp-buffer
184 (mm-disable-multibyte)
185 (insert-file-contents file) 185 (insert-file-contents file)
186 (goto-char (point-min)) 186 (goto-char (point-min))
187 (setq pixmap (read (current-buffer))))))) 187 (setq pixmap (read (current-buffer)))))))