diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-03-22 07:50:37 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-03-22 07:50:37 -0700 |
| commit | 0afb436eeb9b87dbd13b012e3b13d51fc6745f0d (patch) | |
| tree | 683cf853c6bc6065a5f5a3d9ae81feda1882da95 /lisp/gnus/gnus-cloud.el | |
| parent | 081c39beb0340f5d6084dc90796ba726a52c928e (diff) | |
| parent | 8ac621bb5594786c66cc724864e6037c8c650774 (diff) | |
| download | emacs-0afb436eeb9b87dbd13b012e3b13d51fc6745f0d.tar.gz emacs-0afb436eeb9b87dbd13b012e3b13d51fc6745f0d.tar.bz2 emacs-0afb436eeb9b87dbd13b012e3b13d51fc6745f0d.zip | |
Merge from origin/emacs-26
8ac621b (origin/emacs-26) Document DEFUN attributes
16d0cc7 * etc/NEWS: Add an entry for auth-source-pass.
cc1702f Fix the MSDOS build
daa9e85 Improve warning and error messages
7612dd1 Adjust eieio persistence tests for expected failure
f0cf4dc Let eieio-persistent-read read what object-write has written
40ad1ff Handle possible classtype values in eieio-persistent-read
4ec935d Add new tests for eieio persistence
47917d8 * lisp/gnus/gnus-cloud.el (gnus-cloud-synced-files): Fix doc ...
e32f352 * lisp/ibuf-ext.el (ibuffer-never-search-content-mode): Fix t...
5268f30 * doc/lispref/windows.texi (Selecting Windows): Fix a typo.
143b485 * doc/lispref/internals.texi (Writing Emacs Primitives): Fix ...
4ab4551 Firm up documentation of generalized variables
a5bf099 Improve documentation of Auto-Revert mode
ed05eaa Improvements in dired.texi
Conflicts:
etc/NEWS
Diffstat (limited to 'lisp/gnus/gnus-cloud.el')
| -rw-r--r-- | lisp/gnus/gnus-cloud.el | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lisp/gnus/gnus-cloud.el b/lisp/gnus/gnus-cloud.el index ac5ff7d47cf..86cd399ff1c 100644 --- a/lisp/gnus/gnus-cloud.el +++ b/lisp/gnus/gnus-cloud.el @@ -48,10 +48,14 @@ "~/.authinfo.gpg" "~/.gnus.el" (:directory "~/News" :match ".*.SCORE\\'")) - "List of file regexps that should be kept up-to-date via the cloud." + "List of files that should be kept up-to-date via the cloud. +Each element may be either a string or a property list. +The latter should have a :directory element whose value is a string, +and a :match element whose value is a regular expression to match +against the basename of files in said directory." :group 'gnus-cloud - ;; FIXME this type does not match the default. Nor does the documentation. - :type '(repeat regexp)) + :type '(repeat (choice (string :tag "File") + (plist :tag "Property list")))) (defcustom gnus-cloud-storage-method (if (featurep 'epg) 'epg 'base64-gzip) "Storage method for cloud data, defaults to EPG if that's available." @@ -290,6 +294,8 @@ Use old data if FORCE-OLDER is not nil." (dolist (elem gnus-cloud-synced-files) (cond ((stringp elem) + ;; This seems fragile. String comparison, with no + ;; expand-file-name to resolve ~, etc. (when (equal elem file-name) (setq matched t))) ((consp elem) |