* wl-fldmgr.el (wl-fldmgr-make-indent): Change from macro to function.

(wl-fldmgr-delete-line): Change from macro to function. Use `point-at-bol' and `point-at-eol'.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 69ba0b3..da3a321 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,5 +1,9 @@
 2010-01-01  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
+       * wl-fldmgr.el (wl-fldmgr-make-indent): Change from macro to function.
+       (wl-fldmgr-delete-line): Change from macro to function. Use
+       `point-at-bol' and `point-at-eol'.
+
        * wl.el (toplevel): Use `mapc' instead of `mapcar'. Don't use
        `function' for lambda.
 

diff --git a/wl/wl-fldmgr.el b/wl/wl-fldmgr.el
index a505606..642a928 100644 (file)
--- a/wl/wl-fldmgr.el
+++ b/wl/wl-fldmgr.el
@@ -106,14 +106,11 @@
 ;;; Macro and misc Function
 ;;
 
-(defmacro wl-fldmgr-delete-line ()
-  '(delete-region (save-excursion (beginning-of-line)
-                                 (point))
-                 (save-excursion (end-of-line)
-                                 (+ 1 (point)))))
-
-(defmacro wl-fldmgr-make-indent (level)
-  `(concat " " (make-string (* 2 ,level) ,(string-to-char " "))))
+(defun wl-fldmgr-delete-line ()
+  (delete-region (point-at-bol) (1+ (point-at-eol))))
+
+(defun wl-fldmgr-make-indent (level)
+  (concat " " (make-string (* 2 level) (string-to-char " "))))
 
 (defmacro wl-fldmgr-get-entity-id (&optional entity)
   `(get-text-property (if ,entity