(wl-kill-buffers): Change from macro to function.

(wl-count-lines): Change from macro to inline-function.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 1840f3c..6054290 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -4,6 +4,8 @@
        instead of `mapcar'. Don't use `function' for lambda.
        (wl-read-search-condition-internal): Don't use `function' for
        lambda.
+       (wl-kill-buffers): Change from macro to function.
+       (wl-count-lines): Change from macro to inline-function.
 
        * wl-draft.el (wl-draft-reply): Use `elmo-parse' instead of `wl-parse'.
 

diff --git a/wl/wl-util.el b/wl/wl-util.el
index 34e56e8..baf4d7a 100644 (file)
--- a/wl/wl-util.el
+++ b/wl/wl-util.el
@@ -504,14 +504,14 @@ that `read' can handle, whenever this is possible."
                wl-summary-buffer-display-mime-mode
                nil nil))))))
 
-(defmacro wl-kill-buffers (regexp)
-  `(mapc
-    (lambda (x)
-      (if (and (buffer-name x)
-              (string-match ,regexp (buffer-name x)))
-         (and (get-buffer x)
-              (kill-buffer x))))
-    (buffer-list)))
+(defun wl-kill-buffers (regexp)
+  (mapc
+   (lambda (x)
+     (if (and (buffer-name x)
+             (string-match regexp (buffer-name x)))
+        (and (get-buffer x)
+             (kill-buffer x))))
+   (buffer-list)))
 
 (defun wl-collect-summary ()
   (let (result)
@@ -653,10 +653,10 @@ that `read' can handle, whenever this is possible."
 
 ;;;
 
-(defmacro wl-count-lines ()
-  '(save-excursion
-     (beginning-of-line)
-     (count-lines 1 (point))))
+(defsubst wl-count-lines ()
+  (save-excursion
+    (beginning-of-line)
+    (count-lines 1 (point))))
 
 (defun wl-horizontal-recenter ()
   "Recenter the current buffer horizontally."