[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master f6a47c8 3/6: Merge from origin/emacs-26
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master f6a47c8 3/6: Merge from origin/emacs-26 |
Date: |
Sat, 15 Jun 2019 12:50:46 -0400 (EDT) |
branch: master
commit f6a47c822b77677845500e8c82ffd755cb9f18e6
Merge: cd406b9 6242324
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
Merge from origin/emacs-26
6242324 * lisp/net/sieve-manage.el (sieve-manage-parse-capability): D...
---
lisp/net/sieve-manage.el | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lisp/net/sieve-manage.el b/lisp/net/sieve-manage.el
index 72731b8..d14475a 100644
--- a/lisp/net/sieve-manage.el
+++ b/lisp/net/sieve-manage.el
@@ -511,7 +511,8 @@ If NAME is nil, return the full server list of
capabilities."
(defun sieve-manage-parse-capability (str)
"Parse managesieve capability string `STR'.
-Set variable `sieve-manage-capability' to "
+Return alist of capabilities, suitable for assignment
+to local variable `sieve-manage-capability'."
(let ((capas (delq nil
(mapcar #'split-string-and-unquote
(split-string str "\n")))))
- [Emacs-diffs] master updated (ca0b4ed -> 402113d), Glenn Morris, 2019/06/15
- [Emacs-diffs] master 6436682 4/6: ; Merge from origin/emacs-26, Glenn Morris, 2019/06/15
- [Emacs-diffs] master cd406b9 2/6: ; Merge from origin/emacs-26, Glenn Morris, 2019/06/15
- [Emacs-diffs] master 30e3e58 5/6: Merge from origin/emacs-26, Glenn Morris, 2019/06/15
- [Emacs-diffs] master f6a47c8 3/6: Merge from origin/emacs-26,
Glenn Morris <=
- [Emacs-diffs] master 402113d 6/6: ; Merge from origin/emacs-26, Glenn Morris, 2019/06/15
- [Emacs-diffs] master 689e7c0 1/6: Merge from origin/emacs-26, Glenn Morris, 2019/06/15