aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2016-02-10 14:50:12 +1100
committerLars Ingebrigtsen2016-02-10 14:50:12 +1100
commit7c7ac0e7fa8d54c8b4274c7e6f33fe8536b5d826 (patch)
treec51a9776f5c98b548413a280cfda4387966002d2
parent14369a976379499b18f9de1a128e5d2c867c84c2 (diff)
downloademacs-7c7ac0e7fa8d54c8b4274c7e6f33fe8536b5d826.tar.gz
emacs-7c7ac0e7fa8d54c8b4274c7e6f33fe8536b5d826.zip
Remove compat code from compface.el
* lisp/gnus/compface.el: Remove XEmacs compat code throughout.
-rw-r--r--lisp/gnus/compface.el17
1 files changed, 5 insertions, 12 deletions
diff --git a/lisp/gnus/compface.el b/lisp/gnus/compface.el
index cd70d6c87c9..e2f607b1be3 100644
--- a/lisp/gnus/compface.el
+++ b/lisp/gnus/compface.el
@@ -31,7 +31,7 @@ Requires the external programs `uncompface', and `icontopbm'. On a
31GNU/Linux system these might be in packages with names like `compface' 31GNU/Linux system these might be in packages with names like `compface'
32or `faces-xface' and `netpbm' or `libgr-progs', for instance." 32or `faces-xface' and `netpbm' or `libgr-progs', for instance."
33 (with-temp-buffer 33 (with-temp-buffer
34 (unless (featurep 'xemacs) (set-buffer-multibyte nil)) 34 (set-buffer-multibyte nil)
35 (insert face) 35 (insert face)
36 (let ((coding-system-for-read 'raw-text) 36 (let ((coding-system-for-read 'raw-text)
37 ;; At least "icontopbm" doesn't work with Windows because 37 ;; At least "icontopbm" doesn't work with Windows because
@@ -44,17 +44,10 @@ or `faces-xface' and `netpbm' or `libgr-progs', for instance."
44 (goto-char (point-min)) 44 (goto-char (point-min))
45 (insert "/* Format_version=1, Width=48, Height=48, Depth=1,\ 45 (insert "/* Format_version=1, Width=48, Height=48, Depth=1,\
46 Valid_bits_per_item=16 */\n") 46 Valid_bits_per_item=16 */\n")
47 ;; I just can't get "icontopbm" to work correctly on its 47 ;; Emacs doesn't understand un-raw pbm files.
48 ;; own in XEmacs. And Emacs doesn't understand un-raw pbm 48 (eq 0 (call-process-region (point-min) (point-max)
49 ;; files. 49 "icontopbm"
50 (if (not (featurep 'xemacs)) 50 'delete '(t nil))))
51 (eq 0 (call-process-region (point-min) (point-max)
52 "icontopbm"
53 'delete '(t nil)))
54 (shell-command-on-region (point-min) (point-max)
55 "icontopbm | pnmnoraw"
56 (current-buffer) t)
57 t))
58 (buffer-string))))) 51 (buffer-string)))))
59 52
60(provide 'compface) 53(provide 'compface)