From c19befd46a6c1b6f360d86b8546fabbcd294bdbb Mon Sep 17 00:00:00 2001 From: yoichi Date: Tue, 8 Apr 2003 12:30:04 +0000 Subject: [PATCH] * WL-MK: Nil for wl-info-lang means do nothing on info. --- ChangeLog | 4 ++++ WL-MK | 46 +++++++++++++++++++++++++--------------------- 2 files changed, 29 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0dd38cd..68c0472 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2003-04-08 Yoichi NAKAYAMA + + * WL-MK: Nil for wl-info-lang means do nothing on info. + 2003-02-05 Yoichi NAKAYAMA * WL-MK (make-wl-news): Replace "^(" by "\\\\(" to avoid font-lock diff --git a/WL-MK b/WL-MK index 9823afd..b77ac88 100644 --- a/WL-MK +++ b/WL-MK @@ -398,7 +398,8 @@ (defun wl-texinfo-format () (wl-detect-info-directory) - (cond ((listp wl-info-lang) + (cond ((null wl-info-lang)) + ((listp wl-info-lang) (mapcar 'wl-texinfo-format-file wl-info-lang)) ((stringp wl-info-lang) (wl-texinfo-format-file wl-info-lang)))) @@ -408,7 +409,8 @@ (install-file infofile DOCDIR INFODIR nil 'overwrite))) (defun wl-texinfo-install () - (cond ((listp wl-info-lang) + (cond ((null wl-info-lang)) + ((listp wl-info-lang) (mapcar 'wl-texinfo-install-file wl-info-lang)) ((stringp wl-info-lang) (wl-texinfo-install-file wl-info-lang)))) @@ -416,6 +418,7 @@ (defun wl-primary-info-file () "Get primary info file (for wl-detect-info-directory)." (cond + ((null wl-info-lang)) ((listp wl-info-lang) (let ((wl-info-lang (car wl-info-lang))) (wl-primary-info-file))) @@ -425,25 +428,26 @@ (defun wl-detect-info-directory () (config-wl-package-subr) ;; INFODIR check. - (require 'info) - (if (fboundp 'info-initialize) - (info-initialize)) - (unless INFODIR - (let ((infodir (car command-line-args-left)) - (info (wl-primary-info-file)) - previous) - (setq INFODIR - (if (string= infodir "NONE") - (if (setq previous - (exec-installed-p info Info-directory-list - COMPRESS-SUFFIX-LIST)) - ;;(progn - ;;(condition-case nil (delete-file previous)) - (directory-file-name (file-name-directory previous));) - (car Info-directory-list)) - infodir)) - (setq command-line-args-left (cdr command-line-args-left)))) - (princ (format "INFODIR is %s\n\n" INFODIR))) + (when wl-info-lang + (require 'info) + (if (fboundp 'info-initialize) + (info-initialize)) + (unless INFODIR + (let ((infodir (car command-line-args-left)) + (info (wl-primary-info-file)) + previous) + (setq INFODIR + (if (string= infodir "NONE") + (if (setq previous + (exec-installed-p info Info-directory-list + COMPRESS-SUFFIX-LIST)) + ;;(progn + ;;(condition-case nil (delete-file previous)) + (directory-file-name (file-name-directory previous));) + (car Info-directory-list)) + infodir)) + (setq command-line-args-left (cdr command-line-args-left)))) + (princ (format "INFODIR is %s\n\n" INFODIR)))) (defun install-wl-info () (wl-texinfo-format) -- 1.7.10.4