2001-11-28 12:00:00 ShengHuo ZHU <zsh@cs.rochester.edu>

	* nnheader.el (nnheader-find-nov-line): Don't use macro
	gnus-delete-line.

	* gnus-group.el (gnus-group-name-decode): Defun instead of defsubst.
	(gnus-group-name-charset): Ditto.

	* gnus-util.el (gnus-buffer-live-p): Ditto.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 32eb0b3..39c17cd 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2001-11-28 12:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * nnheader.el (nnheader-find-nov-line): Don't use macro
+       gnus-delete-line.
+
+       * gnus-group.el (gnus-group-name-decode): Defun instead of defsubst.
+       (gnus-group-name-charset): Ditto.
+
+       * gnus-util.el (gnus-buffer-live-p): Ditto.
+
 2001-11-28 11:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * sieve-manage.el (sieve-manage-stream-alist): Backslash before

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 11a461e..c5a1249 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -1012,7 +1012,7 @@ The following commands are available:
     (when gnus-carpal
       (gnus-carpal-setup-buffer 'group))))
 
-(defsubst gnus-group-name-charset (method group)
+(defun gnus-group-name-charset (method group)
   (if (null method)
       (setq method (gnus-find-method-for-group group)))
   (let ((item (assoc method gnus-group-name-charset-method-alist))
@@ -1026,7 +1026,7 @@ The following commands are available:
                  result (cdr item))))
       result)))
 
-(defsubst gnus-group-name-decode (string charset)
+(defun gnus-group-name-decode (string charset)
   (if (and string charset (featurep 'mule))
       (mm-decode-coding-string string charset)
     string))

diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index 2696795..2e92f33 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -471,7 +471,7 @@ If N, return the Nth ancestor instead."
        (setq ids (cdr ids)))
       (car ids))))
 
-(defsubst gnus-buffer-live-p (buffer)
+(defun gnus-buffer-live-p (buffer)
   "Say whether BUFFER is alive or not."
   (and buffer
        (get-buffer buffer)

diff --git a/lisp/nnheader.el b/lisp/nnheader.el
index ed74363..8cc9173 100644 (file)
--- a/lisp/nnheader.el
+++ b/lisp/nnheader.el
@@ -81,7 +81,6 @@ on your system, you could say something like:
   (autoload 'mail-position-on-field "sendmail")
   (autoload 'message-remove-header "message")
   (autoload 'gnus-point-at-eol "gnus-util")
-  (autoload 'gnus-delete-line "gnus-util" nil nil 'macro)
   (autoload 'gnus-buffer-live-p "gnus-util"))
 
 ;;; Header access macros.
@@ -451,7 +450,8 @@ the line could be found."
        (setq prev (point))
        (while (and (not (numberp (setq num (read cur))))
                    (not (eobp)))
-         (gnus-delete-line))
+         (delete-region (progn (beginning-of-line) (point))
+                        (progn (forward-line 1) (point))))
        (cond ((> num article)
               (setq max (point)))
              ((< num article)