projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nnimap.el: Handle plain value for nnimap-stream
[gnus]
/
lisp
/
gnus-diary.el
diff --git
a/lisp/gnus-diary.el
b/lisp/gnus-diary.el
index
183214f
..
0f5c613
100644
(file)
--- a/
lisp/gnus-diary.el
+++ b/
lisp/gnus-diary.el
@@
-1,7
+1,6
@@
;;; gnus-diary.el --- Wrapper around the NNDiary Gnus back end
;;; gnus-diary.el --- Wrapper around the NNDiary Gnus back end
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-;; 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2015 Free Software Foundation, Inc.
;; Author: Didier Verna <didier@xemacs.org>
;; Maintainer: Didier Verna <didier@xemacs.org>
;; Author: Didier Verna <didier@xemacs.org>
;; Maintainer: Didier Verna <didier@xemacs.org>
@@
-10,20
+9,18
@@
;; This file is part of GNU Emacs.
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software
;
you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published
-;;
by the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; GNU Emacs is free software
:
you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published
by
+;;
the Free Software Foundation, either version 3 of the License, or
+;;
(at your option)
any later version.
-;; GNU Emacs is distributed in the hope that it will be useful,
but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU
-;; General Public License for more details.
+;; GNU Emacs is distributed in the hope that it will be useful,
+;;
but
WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; G
NU G
eneral Public License for more details.
;; You should have received a copy of the GNU General Public License
;; 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., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;;; Commentary:
@@
-160,7
+157,7
@@
There are currently two built-in format functions:
;; I just ignore it.
;;;###autoload
(defun gnus-user-format-function-d (header)
;; I just ignore it.
;;;###autoload
(defun gnus-user-format-function-d (header)
- ;; Return
s an aproximative delay string for the next occu
rence of this
+ ;; Return
an approximate delay string for the next occur
rence of this
;; message. The delay is given only in the first non zero unit.
;; Code partly stolen from article-make-date-line
(let* ((extras (mail-header-extra header))
;; message. The delay is given only in the first non zero unit.
;; Code partly stolen from article-make-date-line
(let* ((extras (mail-header-extra header))
@@
-197,7
+194,7
@@
There are currently two built-in format functions:
;; I just ignore it.
;;;###autoload
(defun gnus-user-format-function-D (header)
;; I just ignore it.
;;;###autoload
(defun gnus-user-format-function-D (header)
- ;; Returns a formatted time string for the next occurence of this message.
+ ;; Returns a formatted time string for the next occur
r
ence of this message.
(let* ((extras (mail-header-extra header))
(sched (gnus-diary-header-schedule extras))
(occur (nndiary-next-occurence sched (current-time))))
(let* ((extras (mail-header-extra header))
(sched (gnus-diary-header-schedule extras))
(occur (nndiary-next-occurence sched (current-time))))
@@
-280,18
+277,18
@@
Optional prefix (or REVERSE argument) means sort in reverse order."
;; Called when a group is subscribed. This is needed because groups created
;; because of mail splitting are *not* created with the back end function.
;; Called when a group is subscribed. This is needed because groups created
;; because of mail splitting are *not* created with the back end function.
-;; Thus, `nndiary-request-create-group-
hook
s' is inoperative.
+;; Thus, `nndiary-request-create-group-
function
s' is inoperative.
(defun gnus-diary-maybe-update-group-parameters (group)
(when (eq (car (gnus-find-method-for-group group)) 'nndiary)
(gnus-diary-update-group-parameters group)))
(defun gnus-diary-maybe-update-group-parameters (group)
(when (eq (car (gnus-find-method-for-group group)) 'nndiary)
(gnus-diary-update-group-parameters group)))
-(add-hook 'nndiary-request-create-group-
hook
s
+(add-hook 'nndiary-request-create-group-
function
s
'gnus-diary-update-group-parameters)
'gnus-diary-update-group-parameters)
-;; Now that we have `gnus-subscribe-newsgroup-
hook
s', this is not needed
+;; Now that we have `gnus-subscribe-newsgroup-
function
s', this is not needed
;; anymore. Maybe I should remove this completely.
;; anymore. Maybe I should remove this completely.
-(add-hook 'nndiary-request-update-info-
hook
s
+(add-hook 'nndiary-request-update-info-
function
s
'gnus-diary-update-group-parameters)
'gnus-diary-update-group-parameters)
-(add-hook 'gnus-subscribe-newsgroup-
hook
s
+(add-hook 'gnus-subscribe-newsgroup-
function
s
'gnus-diary-maybe-update-group-parameters)
'gnus-diary-maybe-update-group-parameters)
@@
-353,7
+350,7
@@
If ARG (or prefix) is non-nil, force prompting for all fields."
(condition-case ()
(nndiary-parse-schedule-value value
(nth 1 head) (nth 2 head))
(condition-case ()
(nndiary-parse-schedule-value value
(nth 1 head) (nth 2 head))
- (
t
+ (
error
(setq invalid t)))
;; #### NOTE: this (along with the `gnus-diary-add-header'
;; function) could be rewritten in a better way, in particular
(setq invalid t)))
;; #### NOTE: this (along with the `gnus-diary-add-header'
;; function) could be rewritten in a better way, in particular
@@
-370,24
+367,24
@@
If ARG (or prefix) is non-nil, force prompting for all fields."
header ": ")))
(setq value
(if (listp (nth 1 head))
header ": ")))
(setq value
(if (listp (nth 1 head))
- (
completing-read prompt (cons '("*" nil) (nth 1 head
))
-
nil
t value
- gnus-diary-header-value-history)
+ (
gnus-completing-read prompt (cons "*" (mapcar 'car (nth 1 head)
))
+
t value
+
'
gnus-diary-header-value-history)
(read-string prompt value
(read-string prompt value
- gnus-diary-header-value-history))))
+
'
gnus-diary-header-value-history))))
(setq ask nil)
(setq invalid nil)
(condition-case ()
(nndiary-parse-schedule-value value
(nth 1 head) (nth 2 head))
(setq ask nil)
(setq invalid nil)
(condition-case ()
(nndiary-parse-schedule-value value
(nth 1 head) (nth 2 head))
- (
t
+ (
error
(setq invalid t))))
(gnus-diary-add-header (concat header ": " value))
))
nndiary-headers)
))
(setq invalid t))))
(gnus-diary-add-header (concat header ": " value))
))
nndiary-headers)
))
-(add-hook 'nndiary-request-accept-article-
hook
s
+(add-hook 'nndiary-request-accept-article-
function
s
(lambda () (gnus-diary-check-message nil)))
(define-key message-mode-map "\C-c\C-fd" 'gnus-diary-check-message)
(lambda () (gnus-diary-check-message nil)))
(define-key message-mode-map "\C-c\C-fd" 'gnus-diary-check-message)
@@
-403,5
+400,4
@@
If ARG (or prefix) is non-nil, force prompting for all fields."
(provide 'gnus-diary)
(provide 'gnus-diary)
-;; arch-tag: 98467e70-337e-4ddc-b92d-45d403ff1b4b
;;; gnus-diary.el ends here
;;; gnus-diary.el ends here