projects
/
elisp
/
wanderlust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed wl-draft-config-alist.
[elisp/wanderlust.git]
/
WL-MK
diff --git
a/WL-MK
b/WL-MK
index
6e49363
..
c4f181c
100644
(file)
--- a/
WL-MK
+++ b/
WL-MK
@@
-20,7
+20,7
@@
(defvar COMPRESS-SUFFIX-LIST '("" ".gz" ".Z" ".bz2"))
(defvar wl-install-utils nil
(defvar COMPRESS-SUFFIX-LIST '("" ".gz" ".Z" ".bz2"))
(defvar wl-install-utils nil
- "if Non-nil, install `wl-utils-modules'.")
+ "If Non-nil, install `wl-utils-modules'.")
;;; INFO
(defconst wl-ja-info "wl-ja.info")
;;; INFO
(defconst wl-ja-info "wl-ja.info")
@@
-28,13
+28,9
@@
(defconst wl-en-info "wl.info")
(defconst wl-en-texi "wl.texi")
(defconst wl-en-info "wl.info")
(defconst wl-en-texi "wl.texi")
-(defvar wl-info-lang "ja"
+(defvar wl-info-lang '("ja" "en")
"The language of info file (\"ja\" or \"en\").")
"The language of info file (\"ja\" or \"en\").")
-;; for Nemacs (dirty!)
-(if (not (fboundp 'file-executable-p))
- (fset 'file-executable-p 'file-exists-p))
-
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
\f
(require 'cl)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
\f
(require 'cl)
@@
-47,7
+43,7
@@
;; ignore broken module
(not (featurep 'tinycustom)))
(when (and (boundp 'emacs-major-version)
;; ignore broken module
(not (featurep 'tinycustom)))
(when (and (boundp 'emacs-major-version)
- (eq emacs-major-version 19)
+ (= emacs-major-version 19)
(>= emacs-minor-version 29))
(message "%s" "
Warning: You don't seem to have \"new custom\" package installed.
(>= emacs-minor-version 29))
(message "%s" "
Warning: You don't seem to have \"new custom\" package installed.
@@
-84,8
+80,7
@@
(setq byte-compile-warnings '(free-vars unresolved callargs redefine))
;; v18, v19
(setq byte-compile-warnings '(free-vars unresolved callargs redefine))
;; v18, v19
-(if (or (boundp 'MULE)
- (fboundp 'nemacs-version))
+(if (boundp 'MULE)
(setq max-lisp-eval-depth 400))
;; FIXME: it is currently needed to byte-compile with Emacs 21.
(setq max-lisp-eval-depth 400))
;; FIXME: it is currently needed to byte-compile with Emacs 21.
@@
-101,7
+96,6
@@
(setq load-path (cons (expand-file-name ".") load-path))
(setq load-path (cons (expand-file-name WLDIR)
(cons (expand-file-name ELMODIR) load-path)))
(setq load-path (cons (expand-file-name ".") load-path))
(setq load-path (cons (expand-file-name WLDIR)
(cons (expand-file-name ELMODIR) load-path)))
- (setq wl-icon-dir (expand-file-name ICONDIR))
;; load custom file if exists. `WL-CFG.el' override for committer.
(load "./WL-CFG" t nil nil)
;; load-path
;; load custom file if exists. `WL-CFG.el' override for committer.
(load "./WL-CFG" t nil nil)
;; load-path
@@
-109,13
+103,17
@@
(setq load-path (cons (expand-file-name UTILSDIR) load-path)))
(require 'install)
(load "./WL-ELS" nil nil t)
(setq load-path (cons (expand-file-name UTILSDIR) load-path)))
(require 'install)
(load "./WL-ELS" nil nil t)
- (condition-case ()
- (require 'mime-setup)
- (error (error "No MIME module was detected. Please install SEMI or tm.")))
+ ;; product.el version check
+ (require 'product)
+ (if (not (fboundp 'product-version-as-string))
+ (error "Please install new APEL. See INSTALL or INSTALL.ja"))
;; smtp.el version check.
(require 'smtp)
(if (not (fboundp 'smtp-send-buffer))
;; smtp.el version check.
(require 'smtp)
(if (not (fboundp 'smtp-send-buffer))
- (error "Please install FLIM 1.14.0 or later."))))
+ (error "Please install new FLIM. See INSTALL or INSTALL.ja"))
+ (condition-case ()
+ (require 'mime-setup)
+ (error (error "Cannot load `mime-setup'. Please install SEMI")))))
(defun config-wl-pixmap-dir (&optional packagedir)
"Examine pixmap directory where icon files should go."
(defun config-wl-pixmap-dir (&optional packagedir)
"Examine pixmap directory where icon files should go."
@@
-124,10
+122,7
@@
(if (string= pixmap-dir "NONE")
(if packagedir
(expand-file-name "etc/wl/" packagedir)
(if (string= pixmap-dir "NONE")
(if packagedir
(expand-file-name "etc/wl/" packagedir)
- (if (or (featurep 'xemacs)
- (and (boundp 'emacs-major-version)
- (>= emacs-major-version 21)))
- (expand-file-name "wl/icons/" data-directory)))
+ (expand-file-name "wl/icons/" data-directory))
pixmap-dir)))
(if PIXMAPDIR
(princ (format "PIXMAPDIR is %s\n" PIXMAPDIR)))
pixmap-dir)))
(if PIXMAPDIR
(princ (format "PIXMAPDIR is %s\n" PIXMAPDIR)))
@@
-147,6
+142,7
@@
(princ "\n"))
(defun test-wl ()
(princ "\n"))
(defun test-wl ()
+ "Run test suite for developer."
(config-wl-package)
(require 'lunit)
(let ((files (directory-files "tests" t "^test-.*\\.el$"))
(config-wl-package)
(require 'lunit)
(let ((files (directory-files "tests" t "^test-.*\\.el$"))
@@
-163,6
+159,7
@@
(lunit suite)))
(defun check-wl ()
(lunit suite)))
(defun check-wl ()
+ "Check user environment. Not for developer."
(config-wl-package)
(require 'lunit)
(let ((files (directory-files "tests" t "^check-.*\\.el$"))
(config-wl-package)
(require 'lunit)
(let ((files (directory-files "tests" t "^check-.*\\.el$"))
@@
-203,10
+200,7
@@
(defun compile-wl-package ()
(defun compile-wl-package ()
- ;; For nemacs byte compiler's strange behavior(?).
(config-wl-package)
(config-wl-package)
- (if (fboundp 'nemacs-version)
- (load (expand-file-name "wl.el" WLDIR)))
(mapcar
'(lambda (x)
(compile-elisp-modules (cdr x) (car x)))
(mapcar
'(lambda (x)
(compile-elisp-modules (cdr x) (car x)))
@@
-216,7
+210,14
@@
(if (not (file-directory-p PIXMAPDIR))
(make-directory PIXMAPDIR t))
(let* ((case-fold-search t)
(if (not (file-directory-p PIXMAPDIR))
(make-directory PIXMAPDIR t))
(let* ((case-fold-search t)
- (icons (directory-files ICONDIR t "\\.x[bp]m$"))
+ (icons (directory-files ICONDIR t
+ (cond ((featurep 'xemacs)
+ "\\.x[bp]m$")
+ ((and (boundp 'emacs-major-version)
+ (>= emacs-major-version 21))
+ "\\.img$\\|\\.x[bp]m$")
+ ((featurep 'mule)
+ "\\.img$\\|\\.xbm$"))))
icon dest)
(while icons
(setq icon (car icons)
icon dest)
(while icons
(setq icon (car icons)
@@
-266,7
+267,7
@@
(defun config-wl-package-xmas ()
(if (not (featurep 'xemacs))
(defun config-wl-package-xmas ()
(if (not (featurep 'xemacs))
- (error "This directive is only for XEmacs."))
+ (error "This directive is only for XEmacs"))
(config-wl-package-subr)
;; PACKAGEDIR check.
(let (package-dir)
(config-wl-package-subr)
;; PACKAGEDIR check.
(let (package-dir)
@@
-386,8
+387,6
@@
(defun wl-detect-info-directory ()
(config-wl-package-subr)
(defun wl-detect-info-directory ()
(config-wl-package-subr)
- (if (fboundp 'nemacs-version)
- (error "Cannot format info on Nemacs. Please use another formatter."))
;; INFODIR check.
(require 'info)
(if (fboundp 'info-initialize)
;; INFODIR check.
(require 'info)
(if (fboundp 'info-initialize)