New upstream version 2.8.3

3 files changed, 20 insertions, 13 deletions

diff --git a/with-editor.el b/with-editor.el
index 80929d5..906d8e3 100644
--- a/with-editor.el
+++ b/with-editor.el
@@ -1,6 +1,6 @@
 ;;; with-editor.el --- Use the Emacsclient as $EDITOR -*- lexical-binding: t -*-
 
-;; Copyright (C) 2014-2018  The Magit Project Contributors
+;; Copyright (C) 2014-2019  The Magit Project Contributors
 ;;
 ;; You should have received a copy of the AUTHORS.md file.  If not,
 ;; see https://github.com/magit/with-editor/blob/master/AUTHORS.md.
@@ -432,8 +432,13 @@ And some tools that do not handle $EDITOR properly also break."
 (put 'with-editor-mode 'permanent-local t)
 
 (defun with-editor-kill-buffer-noop ()
-  (user-error (substitute-command-keys "\
-Don't kill this buffer.  Instead cancel using \\[with-editor-cancel]")))
+  (if (memq this-command '(save-buffers-kill-terminal
+                           save-buffers-kill-emacs))
+      (let ((with-editor-cancel-query-functions nil))
+        (with-editor-cancel nil)
+        t)
+    (user-error (substitute-command-keys "\
+Don't kill this buffer.  Instead cancel using \\[with-editor-cancel]"))))
 
 (defun with-editor-usage-message ()
   ;; Run after `server-execute', which is run using
diff --git a/with-editor.org b/with-editor.org
index 443a615..f1f1433 100644
--- a/with-editor.org
+++ b/with-editor.org
@@ -2,16 +2,18 @@
 :PREAMBLE:
 #+AUTHOR: Jonas Bernoulli
 #+EMAIL: jonas@bernoul.li
-#+DATE: 2015-2018
+#+DATE: 2015-2019
 #+LANGUAGE: en
 
 #+TEXINFO_DIR_CATEGORY: Emacs
 #+TEXINFO_DIR_TITLE: With-Editor: (with-editor).
 #+TEXINFO_DIR_DESC: Using the Emacsclient as $EDITOR
-#+SUBTITLE: for version 2.8.0 (v2.8.0-2-g87c96b3+1)
-#+BIND: ox-texinfo+-before-export-hook ox-texinfo+-update-version-strings
+#+SUBTITLE: for version 2.8.3
 
 #+TEXINFO_DEFFN: t
+#+PROPERTY: header-args :eval never
+#+BIND: ox-texinfo+-before-export-hook ox-texinfo+-update-copyright-years
+#+BIND: ox-texinfo+-before-export-hook ox-texinfo+-update-version-strings
 #+OPTIONS: H:4 num:4 toc:2
 
 The library ~with-editor~ makes it easy to use the Emacsclient as the
@@ -30,10 +32,10 @@ additional functionality which makes it useful even for end-users, who
 don't use Magit or another package which uses it internally.
 
 #+TEXINFO: @noindent
-This manual is for With-Editor version 2.8.0 (v2.8.0-2-g87c96b3+1).
+This manual is for With-Editor version 2.8.3.
 
 #+BEGIN_QUOTE
-Copyright (C) 2015-2018 Jonas Bernoulli <jonas@bernoul.li>
+Copyright (C) 2015-2019 Jonas Bernoulli <jonas@bernoul.li>
 
 You can redistribute this document and/or modify it under the terms
 of the GNU General Public License as published by the Free Software
@@ -296,7 +298,7 @@ Emacs and what is the output of ~M-x with-editor-debug RET~.
 :END:
 
 #+BEGIN_QUOTE
-Copyright (C) 2015-2018 Jonas Bernoulli <jonas@bernoul.li>
+Copyright (C) 2015-2019 Jonas Bernoulli <jonas@bernoul.li>
 
 You can redistribute this document and/or modify it under the terms
 of the GNU General Public License as published by the Free Software
diff --git a/with-editor.texi b/with-editor.texi
index 8c9462c..793c6cb 100644
--- a/with-editor.texi
+++ b/with-editor.texi
@@ -8,7 +8,7 @@
 
 @copying
 @quotation
-Copyright (C) 2015-2018 Jonas Bernoulli <jonas@@bernoul.li>
+Copyright (C) 2015-2019 Jonas Bernoulli <jonas@@bernoul.li>
 
 You can redistribute this document and/or modify it under the terms
 of the GNU General Public License as published by the Free Software
@@ -31,7 +31,7 @@ General Public License for more details.
 @finalout
 @titlepage
 @title With-Editor User Manual
-@subtitle for version 2.8.0 (v2.8.0-2-g87c96b3+1)
+@subtitle for version 2.8.3
 @author Jonas Bernoulli
 @page
 @vskip 0pt plus 1filll
@@ -60,10 +60,10 @@ additional functionality which makes it useful even for end-users, who
 don't use Magit or another package which uses it internally.
 
 @noindent
-This manual is for With-Editor version 2.8.0 (v2.8.0-2-g87c96b3+1).
+This manual is for With-Editor version 2.8.3.
 
 @quotation
-Copyright (C) 2015-2018 Jonas Bernoulli <jonas@@bernoul.li>
+Copyright (C) 2015-2019 Jonas Bernoulli <jonas@@bernoul.li>
 
 You can redistribute this document and/or modify it under the terms
 of the GNU General Public License as published by the Free Software