procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

epa.el: Add option to replace original text

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

Copyright-paperwork-exempt: yes
This commit is contained in:
Christian Schwarzgruber 2015-11-15 22:31:41 +01:00 • committed by Daiki Ueno
parent 5bc966dfda
commit ebad964b3a
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lisp/epa.el
View file

@ -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)