From 2b57a56ca1ae2827d4efc3538a12dcc522368eef Mon Sep 17 00:00:00 2001 From: yamaoka Date: Mon, 2 Oct 2000 12:43:07 +0000 Subject: [PATCH] (wl-icon-dir): Default to $(data-directory)/wl/icons/ when Emacs 21 is running. --- wl/wl-vars.el | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/wl/wl-vars.el b/wl/wl-vars.el index f464b17..b6a0384 100644 --- a/wl/wl-vars.el +++ b/wl/wl-vars.el @@ -155,8 +155,12 @@ If you don't have multiple e-mail addresses, you don't have to set this." :group 'wl) (defcustom wl-icon-dir (if (fboundp 'locate-data-directory) - (locate-data-directory "wl")) - "*Icon directory (XEmacs)." + (locate-data-directory "wl") + (let ((icons (expand-file-name "wl/icons/" + data-directory))) + (if (file-directory-p icons) + icons))) + "*Icon directory (XEmacs or Emacs 21)." :type '(choice (const :tag "none" nil) string) :group 'wl) -- 1.7.10.4