From 824fe18b2ad090f609041a4af11de484bdb7e3a8 Mon Sep 17 00:00:00 2001 From: kaoru Date: Fri, 1 Jan 2010 15:51:02 +0000 Subject: [PATCH] * 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/ChangeLog | 4 ++++ wl/wl-fldmgr.el | 13 +++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/wl/ChangeLog b/wl/ChangeLog index 69ba0b3..da3a321 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,5 +1,9 @@ 2010-01-01 TAKAHASHI Kaoru + * 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 --- 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 -- 1.7.10.4