comparison lisp/gnus/gnus-art.el @ 90732:bc10a33dd40b

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 563-582) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 177-185) - Merge from emacs--devo--0 - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-158
author Miles Bader <miles@gnu.org>
date Mon, 01 Jan 2007 03:21:06 +0000
parents f1d13e615070 21f28d10d73a
children 95d0cdf160ea
comparison
equal deleted inserted replaced
90731:a6c97c25a666 90732:bc10a33dd40b
1323 (make-obsolete-variable 'gnus-treat-display-xface 1323 (make-obsolete-variable 'gnus-treat-display-xface
1324 'gnus-treat-display-x-face) 1324 'gnus-treat-display-x-face)
1325 1325
1326 (defcustom gnus-treat-display-x-face 1326 (defcustom gnus-treat-display-x-face
1327 (and (not noninteractive) 1327 (and (not noninteractive)
1328 (or (and (fboundp 'image-type-available-p) 1328 (gnus-image-type-available-p 'xbm)
1329 (image-type-available-p 'xbm) 1329 (if (featurep 'xemacs)
1330 (string-match "^0x" (shell-command-to-string "uncompface")) 1330 (featurep 'xface)
1331 (executable-find "icontopbm")) 1331 (and (string-match "^0x" (shell-command-to-string "uncompface"))
1332 (and (featurep 'xemacs) 1332 (executable-find "icontopbm")))
1333 (featurep 'xface)))
1334 'head) 1333 'head)
1335 "Display X-Face headers. 1334 "Display X-Face headers.
1336 Valid values are nil, t, `head', `last', an integer or a predicate. 1335 Valid values are nil, t, `head', `last', an integer or a predicate.
1337 See Info node `(gnus)Customizing Articles' and Info node 1336 See Info node `(gnus)Customizing Articles' and Info node
1338 `(gnus)X-Face' for details." 1337 `(gnus)X-Face' for details."
1360 value))))) 1359 value)))))
1361 (put 'gnus-treat-display-x-face 'highlight t) 1360 (put 'gnus-treat-display-x-face 'highlight t)
1362 1361
1363 (defcustom gnus-treat-display-face 1362 (defcustom gnus-treat-display-face
1364 (and (not noninteractive) 1363 (and (not noninteractive)
1365 (or (and (fboundp 'image-type-available-p) 1364 (gnus-image-type-available-p 'png)
1366 (image-type-available-p 'png))
1367 (and (featurep 'xemacs)
1368 (featurep 'png)))
1369 'head) 1365 'head)
1370 "Display Face headers. 1366 "Display Face headers.
1371 Valid values are nil, t, `head', `last', an integer or a predicate. 1367 Valid values are nil, t, `head', `last', an integer or a predicate.
1372 See Info node `(gnus)Customizing Articles' and Info node 1368 See Info node `(gnus)Customizing Articles' and Info node
1373 `(gnus)X-Face' for details." 1369 `(gnus)X-Face' for details."
1376 :link '(custom-manual "(gnus)Customizing Articles") 1372 :link '(custom-manual "(gnus)Customizing Articles")
1377 :link '(custom-manual "(gnus)X-Face") 1373 :link '(custom-manual "(gnus)X-Face")
1378 :type gnus-article-treat-head-custom) 1374 :type gnus-article-treat-head-custom)
1379 (put 'gnus-treat-display-face 'highlight t) 1375 (put 'gnus-treat-display-face 'highlight t)
1380 1376
1381 (defcustom gnus-treat-display-smileys 1377 (defcustom gnus-treat-display-smileys (gnus-image-type-available-p 'xpm)
1382 (if (or (and (featurep 'xemacs)
1383 (featurep 'xpm))
1384 (and (fboundp 'image-type-available-p)
1385 (image-type-available-p 'pbm)))
1386 t nil)
1387 "Display smileys. 1378 "Display smileys.
1388 Valid values are nil, t, `head', `last', an integer or a predicate. 1379 Valid values are nil, t, `head', `last', an integer or a predicate.
1389 See Info node `(gnus)Customizing Articles' and Info node 1380 See Info node `(gnus)Customizing Articles' and Info node
1390 `(gnus)Smileys' for details." 1381 `(gnus)Smileys' for details."
1391 :group 'gnus-article-treat 1382 :group 'gnus-article-treat