From 5436e541f6f541c7e97734c9c2a83021bd9e25cc Mon Sep 17 00:00:00 2001 From: yamaoka Date: Fri, 2 Jul 1999 13:10:53 +0000 Subject: [PATCH] (gnus-point-at-eol, gnus-point-at-bol): Use `static-cond'. --- lisp/gnus-util.el | 78 +++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 55 insertions(+), 23 deletions(-) diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el index 775cb43..f11b824 100644 --- a/lisp/gnus-util.el +++ b/lisp/gnus-util.el @@ -110,29 +110,61 @@ (when (gnus-buffer-exists-p buf) (kill-buffer buf)))) -(static-if (fboundp 'point-at-bol) - (fset 'gnus-point-at-bol 'point-at-bol) - (static-if (fboundp 'line-beginning-position) - (fset 'gnus-point-at-bol 'line-beginning-position) - (defun gnus-point-at-bol () - "Return point at the beginning of the line." - (let ((p (point))) - (beginning-of-line) - (prog1 - (point) - (goto-char p)))))) - -(static-if (fboundp 'point-at-eol) - (fset 'gnus-point-at-eol 'point-at-eol) - (static-if (fboundp 'line-end-position) - (fset 'gnus-point-at-eol 'line-end-position) - (defun gnus-point-at-eol () - "Return point at the end of the line." - (let ((p (point))) - (end-of-line) - (prog1 - (point) - (goto-char p)))))) +(static-if (fboundp 'static-cond) + (progn + (static-cond + ((fboundp 'point-at-bol) + (fset 'gnus-point-at-bol 'point-at-bol)) + ((fboundp 'line-beginning-position) + (fset 'gnus-point-at-bol 'line-beginning-position)) + (t + (defun gnus-point-at-bol () + "Return point at the beginning of the line." + (let ((p (point))) + (beginning-of-line) + (prog1 + (point) + (goto-char p)))) + )) + (static-cond + ((fboundp 'point-at-eol) + (fset 'gnus-point-at-eol 'point-at-eol)) + ((fboundp 'line-end-position) + (fset 'gnus-point-at-eol 'line-end-position)) + (t + (defun gnus-point-at-eol () + "Return point at the end of the line." + (let ((p (point))) + (end-of-line) + (prog1 + (point) + (goto-char p)))) + )) + ) + ;; The following parts will be abolished in the future. + (static-if (fboundp 'point-at-bol) + (fset 'gnus-point-at-bol 'point-at-bol) + (static-if (fboundp 'line-beginning-position) + (fset 'gnus-point-at-bol 'line-beginning-position) + (defun gnus-point-at-bol () + "Return point at the beginning of the line." + (let ((p (point))) + (beginning-of-line) + (prog1 + (point) + (goto-char p)))))) + (static-if (fboundp 'point-at-eol) + (fset 'gnus-point-at-eol 'point-at-eol) + (static-if (fboundp 'line-end-position) + (fset 'gnus-point-at-eol 'line-end-position) + (defun gnus-point-at-eol () + "Return point at the end of the line." + (let ((p (point))) + (end-of-line) + (prog1 + (point) + (goto-char p)))))) + ) (defun gnus-delete-first (elt list) "Delete by side effect the first occurrence of ELT as a member of LIST." -- 1.7.10.4