diff options
| author | Andrea Corallo <akrl@sdf.org> | 2021-02-10 21:56:55 +0100 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2021-02-10 21:56:55 +0100 |
| commit | 2fcb85c3e780f1f2871ce0f300cfaffce9836eb0 (patch) | |
| tree | a8857ccad8bff12080062a3edaad1a55a3eb8171 /lisp/gnus/gnus-diary.el | |
| parent | 1f626e9662d8120acd5a937f847123cc2b8c6e31 (diff) | |
| parent | 6bfdfeed36fab4680c8db90c22da8f6611694186 (diff) | |
| download | emacs-2fcb85c3e780f1f2871ce0f300cfaffce9836eb0.tar.gz emacs-2fcb85c3e780f1f2871ce0f300cfaffce9836eb0.tar.bz2 emacs-2fcb85c3e780f1f2871ce0f300cfaffce9836eb0.zip | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/gnus/gnus-diary.el')
| -rw-r--r-- | lisp/gnus/gnus-diary.el | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/lisp/gnus/gnus-diary.el b/lisp/gnus/gnus-diary.el index 78f1e53ff7a..52705640bf0 100644 --- a/lisp/gnus/gnus-diary.el +++ b/lisp/gnus/gnus-diary.el @@ -1,4 +1,4 @@ -;;; gnus-diary.el --- Wrapper around the NNDiary Gnus back end +;;; gnus-diary.el --- Wrapper around the NNDiary Gnus back end -*- lexical-binding: t; -*- ;; Copyright (C) 1999-2021 Free Software Foundation, Inc. @@ -57,8 +57,7 @@ (defcustom gnus-diary-time-format "%a, %b %e %y, %H:%M" "Time format to display appointments in nndiary summary buffers. Please refer to `format-time-string' for information on possible values." - :type 'string - :group 'gnus-diary) + :type 'string) (defcustom gnus-diary-delay-format-function 'gnus-diary-delay-format-english "Function called to format a diary delay string. @@ -73,8 +72,7 @@ There are currently two built-in format functions: `gnus-diary-delay-format-french'" :type '(choice (const :tag "english" gnus-diary-delay-format-english) (const :tag "french" gnus-diary-delay-format-french) - (symbol :tag "other")) - :group 'gnus-diary) + (symbol :tag "other"))) (defconst gnus-diary-version nndiary-version "Current Diary back end version.") @@ -276,13 +274,13 @@ Optional prefix (or REVERSE argument) means sort in reverse order." (gnus-diary-update-group-parameters group))) (add-hook 'nndiary-request-create-group-functions - 'gnus-diary-update-group-parameters) + #'gnus-diary-update-group-parameters) ;; Now that we have `gnus-subscribe-newsgroup-functions', this is not needed ;; anymore. Maybe I should remove this completely. (add-hook 'nndiary-request-update-info-functions - 'gnus-diary-update-group-parameters) + #'gnus-diary-update-group-parameters) (add-hook 'gnus-subscribe-newsgroup-functions - 'gnus-diary-maybe-update-group-parameters) + #'gnus-diary-maybe-update-group-parameters) ;; Diary Message Checking =================================================== @@ -360,7 +358,7 @@ If ARG (or prefix) is non-nil, force prompting for all fields." header ": "))) (setq value (if (listp (nth 1 head)) - (gnus-completing-read prompt (cons "*" (mapcar 'car (nth 1 head))) + (gnus-completing-read prompt (cons "*" (mapcar #'car (nth 1 head))) t value 'gnus-diary-header-value-history) (read-string prompt value |