diff options
| author | Gerd Möllmann <gerd@gnu.org> | 2022-12-31 09:04:56 +0100 |
|---|---|---|
| committer | Gerd Möllmann <gerd@gnu.org> | 2022-12-31 09:04:56 +0100 |
| commit | 716d676747119f9950861f9a64a8e7871b0082d4 (patch) | |
| tree | b71f94b50896736a007d6977c97679e1abd895a6 /lisp/desktop.el | |
| parent | 54ec3973e298c3d2b3d81484f80053d881694f88 (diff) | |
| parent | 7493b4026fc74a51c76c5b614bc83b864af9bc31 (diff) | |
| download | emacs-scratch/pkg.tar.gz | |
Merge remote-tracking branch 'origin/master' into scratch/pkgscratch/pkg
Diffstat (limited to 'lisp/desktop.el')
| -rw-r--r-- | lisp/desktop.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/desktop.el b/lisp/desktop.el index ef73bc596df..d55739bb6f8 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -828,7 +828,7 @@ is nil, ask the user where to save the desktop." ;; If we own it, we don't anymore. (when (eq (emacs-pid) (desktop-owner)) ;; Allow exiting Emacs even if we can't delete the desktop file. - (ignore-error 'file-error + (ignore-error file-error (desktop-release-lock)))) ;; ---------------------------------------------------------------------------- |