projects
/
elisp
/
gnus.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Synch to No Gnus 200507290604.
[elisp/gnus.git-]
/
lisp
/
gnus-int.el
diff --git
a/lisp/gnus-int.el
b/lisp/gnus-int.el
index
c2ed96a
..
b6f0115
100644
(file)
--- a/
lisp/gnus-int.el
+++ b/
lisp/gnus-int.el
@@
-20,8
+20,8
@@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
;;; Commentary:
@@
-48,19
+48,12
@@
If the server is covered by Gnus agent, the possible values are
`denied', set the server denied; `offline', set the server offline;
nil, ask user. If the server is not covered by Gnus agent, set the
server denied."
`denied', set the server denied; `offline', set the server offline;
nil, ask user. If the server is not covered by Gnus agent, set the
server denied."
- :version "21.4"
+ :version "22.1"
:group 'gnus-start
:type '(choice (const :tag "Ask" nil)
(const :tag "Deny server" denied)
(const :tag "Unplug Agent" offline)))
:group 'gnus-start
:type '(choice (const :tag "Ask" nil)
(const :tag "Deny server" denied)
(const :tag "Unplug Agent" offline)))
-(defcustom gnus-servers-that-use-local-marks '(nntp)
- "A list of backends that store marks locally. This means that
- the backend is used to set its marks even when unplugged."
- :version "21.4"
- :group 'gnus-start
- :type '(repeat symbol))
-
(defvar gnus-internal-registry-spool-current-method nil
"The current method, for the registry.")
(defvar gnus-internal-registry-spool-current-method nil
"The current method, for the registry.")
@@
-421,11
+414,7
@@
If FETCH-OLD, retrieve all headers (or some subset thereof) in the group."
(defun gnus-request-set-mark (group action)
"Set marks on articles in the back end."
(defun gnus-request-set-mark (group action)
"Set marks on articles in the back end."
- (let* ((gnus-command-method (gnus-find-method-for-group group))
- (gnus-agent (if (member (car gnus-command-method)
- gnus-servers-that-use-local-marks)
- nil
- gnus-agent)))
+ (let ((gnus-command-method (gnus-find-method-for-group group)))
(if (not (gnus-check-backend-function
'request-set-mark (car gnus-command-method)))
action
(if (not (gnus-check-backend-function
'request-set-mark (car gnus-command-method)))
action
@@
-435,11
+424,7
@@
If FETCH-OLD, retrieve all headers (or some subset thereof) in the group."
(defun gnus-request-update-mark (group article mark)
"Allow the back end to change the mark the user tries to put on an article."
(defun gnus-request-update-mark (group article mark)
"Allow the back end to change the mark the user tries to put on an article."
- (let* ((gnus-command-method (gnus-find-method-for-group group))
- (gnus-agent (if (member (car gnus-command-method)
- gnus-servers-that-use-local-marks)
- nil
- gnus-agent)))
+ (let ((gnus-command-method (gnus-find-method-for-group group)))
(if (not (gnus-check-backend-function
'request-update-mark (car gnus-command-method)))
mark
(if (not (gnus-check-backend-function
'request-update-mark (car gnus-command-method)))
mark
@@
-578,12
+563,12
@@
If GROUP is nil, all groups on GNUS-COMMAND-METHOD are scanned."
not-deleted))
(defun gnus-request-move-article (article group server accept-function
not-deleted))
(defun gnus-request-move-article (article group server accept-function
- &optional last)
+ &optional last move-is-internal)
(let* ((gnus-command-method (gnus-find-method-for-group group))
(result (funcall (gnus-get-function gnus-command-method
'request-move-article)
article (gnus-group-real-name group)
(let* ((gnus-command-method (gnus-find-method-for-group group))
(result (funcall (gnus-get-function gnus-command-method
'request-move-article)
article (gnus-group-real-name group)
- (nth 1 gnus-command-method) accept-function last)))
+ (nth 1 gnus-command-method) accept-function last move-is-internal)))
(when (and result gnus-agent
(gnus-agent-method-p gnus-command-method))
(gnus-agent-unfetch-articles group (list article)))
(when (and result gnus-agent
(gnus-agent-method-p gnus-command-method))
(gnus-agent-unfetch-articles group (list article)))
@@
-603,8
+588,8
@@
If GROUP is nil, all groups on GNUS-COMMAND-METHOD are scanned."
(insert "\n"))
(let ((gnus-command-method (or gnus-command-method
(gnus-find-method-for-group group)))
(insert "\n"))
(let ((gnus-command-method (or gnus-command-method
(gnus-find-method-for-group group)))
- (result
- (funcall
+ (result
+ (funcall
(gnus-get-function gnus-command-method 'request-accept-article)
(if (stringp group) (gnus-group-real-name group) group)
(cadr gnus-command-method)
(gnus-get-function gnus-command-method 'request-accept-article)
(if (stringp group) (gnus-group-real-name group) group)
(cadr gnus-command-method)