From: Christian Schwarzgruber Date: Sun, 15 Nov 2015 21:31:41 +0000 (+0100) Subject: epa.el: Add option to replace original text X-Git-Tag: emacs-26.0.90~2936 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ebad964b3afbe5ef77085be94cf566836450c74c;p=emacs.git epa.el: Add option to replace original text * lisp/epa.el (epa-replace-original-text): New user option. (Bug#21947) Copyright-paperwork-exempt: yes --- diff --git a/lisp/epa.el b/lisp/epa.el index 9f112c4eb83..e51d5d86540 100644 --- a/lisp/epa.el +++ b/lisp/epa.el @@ -34,6 +34,17 @@ :link '(custom-manual "(epa) Top") :group 'epg) +(defcustom epa-replace-original-text 'ask + "Whether the original text shall be replaced by the decrypted. + +If t, replace the original text without any confirmation. +If nil, don't replace the original text and show the result in a new buffer. +If neither t nor nil, ask user for confirmation." + :type '(choice (const :tag "Never" nil) + (const :tag "Ask the user" ask) + (const :tag "Always" t)) + :group 'epa) + (defcustom epa-popup-info-window t "If non-nil, display status information from epa commands in another window." :type 'boolean @@ -872,7 +883,9 @@ For example: (with-current-buffer (funcall make-buffer-function) (let ((inhibit-read-only t)) (insert plain))) - (if (y-or-n-p "Replace the original text? ") + (if (or (eq epa-replace-original-text t) + (and epa-replace-original-text + (y-or-n-p "Replace the original text? "))) (let ((inhibit-read-only t)) (delete-region start end) (goto-char start) @@ -968,7 +981,9 @@ For example: (or coding-system-for-read (get-text-property start 'epa-coding-system-used) 'undecided))) - (if (y-or-n-p "Replace the original text? ") + (if (or (eq epa-replace-original-text t) + (and epa-replace-original-text + (y-or-n-p "Replace the original text? "))) (let ((inhibit-read-only t) buffer-read-only) (delete-region start end)