From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.ciao.gmane.io!not-for-mail From: Jonas Bernoulli Newsgroups: gmane.emacs.bugs Subject: bug#41276: [PATCH 5/9] Improve and add doc-strings Date: Thu, 14 May 2020 22:16:14 +0200 Message-ID: <20200514201618.26313-5-jonas@bernoul.li> References: <20200514201618.26313-1-jonas@bernoul.li> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="ciao.gmane.io:159.69.161.202"; logging-data="48506"; mail-complaints-to="usenet@ciao.gmane.io" To: 41276@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu May 14 22:20:27 2020 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jZKLB-000CUT-SF for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 14 May 2020 22:20:25 +0200 Original-Received: from localhost ([::1]:41960 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jZKLA-0005mm-Ng for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 14 May 2020 16:20:24 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:37548) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZKHw-0001WX-GL for bug-gnu-emacs@gnu.org; Thu, 14 May 2020 16:17:04 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:51704) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jZKHw-0003Tl-2I for bug-gnu-emacs@gnu.org; Thu, 14 May 2020 16:17:04 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jZKHv-0003Qk-V8 for bug-gnu-emacs@gnu.org; Thu, 14 May 2020 16:17:03 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Jonas Bernoulli Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 14 May 2020 20:17:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41276 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 41276-submit@debbugs.gnu.org id=B41276.158948738813069 (code B ref 41276); Thu, 14 May 2020 20:17:03 +0000 Original-Received: (at 41276) by debbugs.gnu.org; 14 May 2020 20:16:28 +0000 Original-Received: from localhost ([127.0.0.1]:35001 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jZKHL-0003Oi-Ss for submit@debbugs.gnu.org; Thu, 14 May 2020 16:16:28 -0400 Original-Received: from mail.hostpark.net ([212.243.197.30]:60570) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jZKHE-0003NE-Fq for 41276@debbugs.gnu.org; Thu, 14 May 2020 16:16:21 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by mail.hostpark.net (Postfix) with ESMTP id CEB661668B for <41276@debbugs.gnu.org>; Thu, 14 May 2020 22:16:19 +0200 (CEST) X-Virus-Scanned: by Hostpark/NetZone Mailprotection at hostpark.net Original-Received: from mail.hostpark.net ([127.0.0.1]) by localhost (mail0.hostpark.net [127.0.0.1]) (amavisd-new, port 10124) with ESMTP id Uj5vNbzOl2VB for <41276@debbugs.gnu.org>; Thu, 14 May 2020 22:16:19 +0200 (CEST) Original-Received: from customer (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.hostpark.net (Postfix) with ESMTPSA id 4567B166B6 for <41276@debbugs.gnu.org>; Thu, 14 May 2020 22:16:19 +0200 (CEST) X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200514201618.26313-1-jonas@bernoul.li> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:180271 Archived-At: * lisp/epa-file.el (epa-file-select-keys), lisp/epa-hook.el (epa-file-name-regexp), lisp/epa.el (epa-exit-buffer): Improve doc-string. * lisp/epa-hook.el (epa-file-name-regexp-update): Add doc-string. --- lisp/epa-file.el | 4 ++-- lisp/epa-hook.el | 11 +++++++---- lisp/epa.el | 3 +-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lisp/epa-file.el b/lisp/epa-file.el index 43399d2852..ede7177054 100644 --- a/lisp/epa-file.el +++ b/lisp/epa-file.el @@ -43,9 +43,9 @@ epa-file-cache-passphrase-for-symmetric-encryption (defcustom epa-file-select-keys nil "Control whether or not to pop up the key selection dialog. -If t, always asks user to select recipients. +If t, always ask user to select recipients. If nil, query user only when `epa-file-encrypt-to' is not set. -If neither t nor nil, doesn't ask user. In this case, symmetric +If neither t nor nil, don't ask user. In this case, symmetric encryption is used." :type '(choice (const :tag "Ask always" t) (const :tag "Ask when recipients are not set" nil) diff --git a/lisp/epa-hook.el b/lisp/epa-hook.el index 002f46ad27..6f12f8a6bf 100644 --- a/lisp/epa-hook.el +++ b/lisp/epa-hook.el @@ -36,10 +36,10 @@ epa-file--file-name-regexp-set (defcustom epa-file-name-regexp (purecopy "\\.gpg\\(~\\|\\.~[0-9]+~\\)?\\'") "Regexp which matches filenames to be encrypted with GnuPG. -If you set this outside Custom while epa-file is already enabled, you -have to call `epa-file-name-regexp-update' after setting it to -properly update file-name-handler-alist. Setting this through Custom -does that automatically." +If you set this outside Custom while epa-file is already enabled, +you have to call `epa-file-name-regexp-update' after setting it +to properly update `file-name-handler-alist'. Setting this +through Custom does that automatically." :type 'regexp :group 'epa-file :set 'epa-file--file-name-regexp-set) @@ -73,6 +73,9 @@ epa-file-auto-mode-alist-entry (list epa-file-name-regexp nil 'epa-file)) (defun epa-file-name-regexp-update () + "Update `file-name-handler-alist' after configuring outside Custom. +After setting `epa-file-name-regexp-update' outside the Custom +interface, update `file-name-handler-alist'." (interactive) (unless (equal (car epa-file-handler) epa-file-name-regexp) (setcar epa-file-handler epa-file-name-regexp))) diff --git a/lisp/epa.el b/lisp/epa.el index 62a4941f9d..b06b0ac8e4 100644 --- a/lisp/epa.el +++ b/lisp/epa.el @@ -347,8 +347,7 @@ epa-unmark-key ;;;; Quitting (defun epa-exit-buffer () - "Exit the current buffer. -`epa-exit-buffer-function' is called if it is set." + "Exit the current buffer using `epa-exit-buffer-function'." (interactive) (funcall epa-exit-buffer-function)) -- 2.26.0