* elmo-archive.el (elmo-archive-call-process): Ignore nemacs.

* elmo-msgdb.el (elmo-msgdb-insert-file-header): Ditto.

* elmo-util.el (elmo-read): Ditto.
(elmo-display-error): Ditto.

* elmo-vars.el (elmo-date-match): Ditto.

* pldap.el (ldap-coding-system): Ditto.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 1697719..58b3ac5 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,5 +1,16 @@
 2001-12-02  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
+       * elmo-archive.el (elmo-archive-call-process): Ignore nemacs.
+
+       * elmo-msgdb.el (elmo-msgdb-insert-file-header): Ditto.
+
+       * elmo-util.el (elmo-read): Ditto.
+       (elmo-display-error): Ditto.
+
+       * elmo-vars.el (elmo-date-match): Ditto.
+
+       * pldap.el (ldap-coding-system): Ditto.
+
        * elmo-pipe.el (elmo-pipe-drain): If `copy' is non-nil, bind
        `elmo-inhibit-number-mapping' as nil.
 

diff --git a/elmo/elmo-archive.el b/elmo/elmo-archive.el
index 95efaba..0766110 100644 (file)
--- a/elmo/elmo-archive.el
+++ b/elmo/elmo-archive.el
@@ -260,12 +260,8 @@
   (` (cdr (assq (, type)
                elmo-archive-file-regexp-alist))))
 
-(static-if (boundp 'NEMACS)
-    (defsubst elmo-archive-call-process (prog args &optional output)
-      (apply 'call-process prog nil output nil args)
-      0)
-  (defsubst elmo-archive-call-process (prog args &optional output)
-    (= (apply 'call-process prog nil output nil args) 0)))
+(defsubst elmo-archive-call-process (prog args &optional output)
+  (= (apply 'call-process prog nil output nil args) 0))
 
 (defsubst elmo-archive-call-method (method args &optional output)
   (cond

diff --git a/elmo/elmo-msgdb.el b/elmo/elmo-msgdb.el
index b20646d..d3aca19 100644 (file)
--- a/elmo/elmo-msgdb.el
+++ b/elmo/elmo-msgdb.el
@@ -663,26 +663,21 @@ Header region is supposed to be narrowed."
   (cons (car entity)
        (copy-sequence (cdr entity))))
 
-(static-if (boundp 'nemacs-version)
-    (defsubst elmo-msgdb-insert-file-header (file)
-      "Insert the header of the article (Does not work on nemacs)."
-      (as-binary-input-file
-       (insert-file-contents file)))
-  (defsubst elmo-msgdb-insert-file-header (file)
-    "Insert the header of the article."
-    (let ((beg 0)
-         insert-file-contents-pre-hook   ; To avoid autoconv-xmas...
-         insert-file-contents-post-hook
-         format-alist)
-      (when (file-exists-p file)
-       ;; Read until header separator is found.
-       (while (and (eq elmo-msgdb-file-header-chop-length
-                       (nth 1
-                            (insert-file-contents-as-binary
-                             file nil beg
-                             (incf beg elmo-msgdb-file-header-chop-length))))
-                   (prog1 (not (search-forward "\n\n" nil t))
-                     (goto-char (point-max)))))))))
+(defsubst elmo-msgdb-insert-file-header (file)
+  "Insert the header of the article."
+  (let ((beg 0)
+       insert-file-contents-pre-hook   ; To avoid autoconv-xmas...
+       insert-file-contents-post-hook
+       format-alist)
+    (when (file-exists-p file)
+      ;; Read until header separator is found.
+      (while (and (eq elmo-msgdb-file-header-chop-length
+                     (nth 1
+                          (insert-file-contents-as-binary
+                           file nil beg
+                           (incf beg elmo-msgdb-file-header-chop-length))))
+                 (prog1 (not (search-forward "\n\n" nil t))
+                   (goto-char (point-max))))))))
 
 (defsubst elmo-msgdb-create-overview-entity-from-file (number file)
   (let (insert-file-contents-pre-hook   ; To avoid autoconv-xmas...

diff --git a/elmo/elmo-util.el b/elmo/elmo-util.el
index 3acfea3..502d5dd 100644 (file)
--- a/elmo/elmo-util.el
+++ b/elmo/elmo-util.el
@@ -75,13 +75,7 @@
     (filename newname &optional ok-if-already-exists)
     (copy-file filename newname ok-if-already-exists t)))
 
-;; Nemacs's `read' is different.
-(static-if (fboundp 'nemacs-version)
-    (defun elmo-read (obj)
-      (prog1 (read obj)
-       (if (bufferp obj)
-           (or (bobp) (forward-char -1)))))
-  (defalias 'elmo-read 'read))
+(defalias 'elmo-read 'read)
 
 (defmacro elmo-set-work-buf (&rest body)
   "Execute BODY on work buffer.  Work buffer remains."
@@ -1126,9 +1120,8 @@ the value of `foo'."
        (setq err-mes (concat err-mes (format
                                       (if (stringp (car errobj))
                                           "%s"
-                                        (if (boundp 'nemacs-version)
-                                            "%s"
-                                          "%S")) (car errobj))))
+                                        "%S")
+                                      (car errobj))))
        (setq errobj (cdr errobj))
        (if errobj (setq err-mes (concat err-mes (if first ": " ", "))))
        (setq first nil))

diff --git a/elmo/elmo-vars.el b/elmo/elmo-vars.el
index d501215..5ed767f 100644 (file)
--- a/elmo/elmo-vars.el
+++ b/elmo/elmo-vars.el
@@ -291,7 +291,7 @@ If function, return value of function.")
                              ;; static/dl-database
                              (fboundp 'open-database)))
 
-(defvar elmo-date-match (not (boundp 'nemacs-version))
+(defvar elmo-date-match t
   "Date match is available or not.")
 
 (defvar elmo-network-stream-type-alist

diff --git a/elmo/pldap.el b/elmo/pldap.el
index 6d3d383..c2ff496 100644 (file)
--- a/elmo/pldap.el
+++ b/elmo/pldap.el
@@ -235,8 +235,7 @@ Valid properties include:
   :type 'symbol
   :group 'ldap)
 
-(defcustom ldap-coding-system (if (boundp 'NEMACS) 0
-                               nil)
+(defcustom ldap-coding-system nil
   "*Coding system of LDAP string values.
 LDAP v3 specifies the coding system of strings to be UTF-8.
 Mule support is needed for this."