Commit ebad964b authored by Christian Schwarzgruber's avatar Christian Schwarzgruber Committed by Daiki Ueno

epa.el: Add option to replace original text

* lisp/epa.el (epa-replace-original-text): New user option.
(Bug#21947)

Copyright-paperwork-exempt: yes
parent 5bc966df
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment