delete->dispose (summary mark operation)

[elisp/wanderlust.git] / WL-MK

diff --git a/WL-MK b/WL-MK
index a31fd19..cb0235d 100644 (file)
--- a/WL-MK
+++ b/WL-MK
@@ -174,8 +174,8 @@
 (defun test-wl ()
   "Run test suite for developer."
   (config-wl-package)
+  (make-wl-news)
   (require 'lunit)
-  (require 'wl-news "wl-news.el.in")
   (let ((files (directory-files "tests" t "^test-.*\\.el$"))
        (suite (lunit-make-test-suite)))
     (while files
@@ -192,8 +192,10 @@
 (defun check-wl ()
   "Check user environment.  Not for developer."
   (config-wl-package)
+  ;; Avoid load error
+  (provide 'wl-news)
+  (load "wl-news.el.in")
   (require 'lunit)
-  (require 'wl-news "wl-news.el.in")
   (let ((files (directory-files "tests" t "^check-.*\\.el$"))
        (suite (lunit-make-test-suite)))
     (while files
@@ -396,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))))
@@ -406,42 +409,42 @@
     (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))))
 
 (defun wl-primary-info-file ()
   "Get primary info file (for wl-detect-info-directory)."
-  (cond
-   ((listp wl-info-lang)
-    (let ((wl-info-lang (car wl-info-lang)))
-      (wl-primary-info-file)))
-   ((stringp wl-info-lang)
-    (symbol-value (intern (format "wl-%s-info" wl-info-lang))))))
+  (cond ((null wl-info-lang))
+       ((listp wl-info-lang)
+        (let ((wl-info-lang (car wl-info-lang)))
+          (wl-primary-info-file)))
+       ((stringp wl-info-lang)
+        (symbol-value (intern (format "wl-%s-info" wl-info-lang))))))
 
 (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))
+                     (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)
@@ -484,7 +487,14 @@
            (if wl-news-lang
                (progn
                  (insert "(defconst wl-news-news-alist\n  '")
-                 (prin1 (wl-news-parse-news wl-news-lang) (current-buffer))
+                 (let ((p (point)))
+                   (prin1 (wl-news-parse-news wl-news-lang) (current-buffer))
+                   (save-excursion
+                     (narrow-to-region p (point))
+                     (goto-char (1+ p))
+                     (while (re-search-forward "^(" nil t)
+                       (replace-match "\\\\(")) ; avoid font-lock confusion
+                     (widen)))
                  (insert ")\n"))
              (insert "(defconst wl-news-news-alist nil)\n\n"))
            (let ((buffer-file-coding-system (mime-charset-to-coding-system 'x-ctext)))