diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
| commit | 07fcbb558d797272b9f43547da60beda485873a3 (patch) | |
| tree | 77d5da14e9f9d9d8b1d877c70c01296fd3893796 /lisp/epa-file.el | |
| parent | c9bdeff3e45a7ac84a74a81bb048046f82dddc91 (diff) | |
| parent | fb81c8c3adf8633f2f617c82f6019aef630860c7 (diff) | |
| download | emacs-07fcbb558d797272b9f43547da60beda485873a3.tar.gz | |
Merge remote-tracking branch 'origin/master' into athena/unstable
Diffstat (limited to 'lisp/epa-file.el')
| -rw-r--r-- | lisp/epa-file.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/epa-file.el b/lisp/epa-file.el index e46e3684c8a..33bf5adabe6 100644 --- a/lisp/epa-file.el +++ b/lisp/epa-file.el @@ -198,7 +198,9 @@ encryption is used." (mapcar #'car (epg-context-result-for context 'encrypted-to))) (if (or beg end) - (setq string (substring string (or beg 0) end))) + (setq string (substring string + (or beg 0) + (and end (min end (length string)))))) (save-excursion ;; If visiting, bind off buffer-file-name so that ;; file-locking will not ask whether we should |