* nnheader.el (nnheader-replace-chars-in-string): Use `static-if'.

* message.el (message-replace-chars-in-string): Ditto.

diff --git a/ChangeLog b/ChangeLog
index 33ba2b5..6596728 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-21  Katsumi Yamaoka <yamaoka@jpl.org>
+
+       * nnheader.el (nnheader-replace-chars-in-string): Use `static-if'.
+       * message.el (message-replace-chars-in-string): Ditto.
+
 2000-08-19  TSUCHIYA Masatoshi  <tsuchiya@pine.kuee.kyoto-u.ac.jp>
 
        * nnshimbun.el (nnshimbun-type-definition): Follow changes of ZDNet.

diff --git a/lisp/lpath.el b/lisp/lpath.el
index 5edcab5..a12dc0f 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -39,7 +39,7 @@
                     url-view-url w3-prepare-buffer
                     set-buffer-multibyte
                     find-non-ascii-charset-region char-charset
-                    find-charset-region subst-char-in-string
+                    find-charset-region
                     find-coding-systems-region get-charset-property
                     coding-system-get w3-region
                     w3-coding-system-for-mime-charset
@@ -109,7 +109,7 @@
                 find-coding-systems-for-charsets find-coding-systems-region
                 font-lock-set-defaults function-max-args get-charset-property
                 make-symbolic-link map-extents smiley-encode-buffer
-                toolbar-gnus subst-char-in-string)))
+                toolbar-gnus)))
 
 (setq load-path (cons "." load-path))
 (require 'custom)

diff --git a/lisp/message.el b/lisp/message.el
index 975ae72..0c5b683 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -5362,7 +5362,7 @@ regexp varstr."
 ;;; Miscellaneous functions
 
 ;; stolen (and renamed) from nnheader.el
-(if (fboundp 'subst-char-in-string)
+(static-if (fboundp 'subst-char-in-string)
     (defsubst message-replace-chars-in-string (string from to)
       (subst-char-in-string from to string))
   (defun message-replace-chars-in-string (string from to)

diff --git a/lisp/nnheader.el b/lisp/nnheader.el
index 2ade866..c2100c4 100644 (file)
--- a/lisp/nnheader.el
+++ b/lisp/nnheader.el
@@ -32,6 +32,7 @@
 ;;; Code:
 
 (eval-when-compile (require 'cl))
+(eval-when-compile (require 'static))
 
 (require 'mail-utils)
 (require 'mime)
@@ -876,7 +877,7 @@ without formatting."
       (apply 'insert format args))
     t))
 
-(if (fboundp 'subst-char-in-string)
+(static-if (fboundp 'subst-char-in-string)
     (defsubst nnheader-replace-chars-in-string (string from to)
       (subst-char-in-string from to string))
   (defun nnheader-replace-chars-in-string (string from to)