New upstream version

3 files changed, 6 insertions, 66 deletions

diff --git a/debian/changelog b/debian/changelog
index ff6ec53..339a6b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+with-editor (2.7.2-1) UNRELEASED; urgency=medium
+
+  * New upstream version
+
+ -- Rémi Vanicat <vanicat@debian.org>  Tue, 03 Apr 2018 06:33:49 +0200
+
 with-editor (2.7.1-1) unstable; urgency=medium
 
   * New upstream version
diff --git a/debian/patches/0001-Add-some-autoload.patch b/debian/patches/0001-Add-some-autoload.patch
deleted file mode 100644
index 5b08f22..0000000
--- a/debian/patches/0001-Add-some-autoload.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From: =?utf-8?q?R=C3=A9mi_Vanicat?= <vanicat@debian.org>
-Date: Tue, 13 Feb 2018 11:59:50 +0100
-Bug: https://github.com/magit/with-editor/pull/47
-Applied-Upstream: f401e12316f1db871b7c194696ff3f4e7e5bf347
-Subject: Add some autoload
-
-with-editor-export-editor: set environment variable for shell-mode,
-term-mode and eshell-mode.
-
-with-editor-async-shell-command and with-editor-shell-command: run a
-command.
----
- with-editor.el | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/with-editor.el b/with-editor.el
-index 45c9378..e7592ad 100644
---- a/with-editor.el
-+++ b/with-editor.el
-@@ -588,6 +588,7 @@ which may or may not insert the text into the PROCESS' buffer."
- 
- ;;; Augmentations
- 
-+;;;###autoload
- (cl-defun with-editor-export-editor (&optional (envvar "EDITOR"))
-   "Teach subsequent commands to use current Emacs instance as editor.
- 
-@@ -617,11 +618,13 @@ This works in `shell-mode', `term-mode' and `eshell-mode'."
-     (error "Cannot export environment variables in this buffer")))
-   (message "Successfully exported %s" envvar))
- 
-+;;;###autoload
- (defun with-editor-export-git-editor ()
-   "Like `with-editor-export-editor' but always set `$GIT_EDITOR'."
-   (interactive)
-   (with-editor-export-editor "GIT_EDITOR"))
- 
-+;;;###autoload
- (defun with-editor-export-hg-editor ()
-   "Like `with-editor-export-editor' but always set `$HG_EDITOR'."
-   (interactive)
-@@ -643,6 +646,7 @@ This works in `shell-mode', `term-mode' and `eshell-mode'."
-                                 with-editor-envvars nil nil nil nil default)))
-     (if (string= reply "") (user-error "Nothing selected") reply)))
- 
-+;;;###autoload
- (define-minor-mode shell-command-with-editor-mode
-   "Teach `shell-command' to use current Emacs instance as editor.
- 
-@@ -661,6 +665,7 @@ which also allows the use of another variable instead of
- \"EDITOR\"."
-   :global t)
- 
-+;;;###autoload
- (defun with-editor-async-shell-command
-     (command &optional output-buffer error-buffer envvar)
-   "Like `async-shell-command' but with `$EDITOR' set.
-@@ -683,6 +688,7 @@ Also see `async-shell-command' and `shell-command'."
-     (with-editor
-       (async-shell-command command output-buffer error-buffer))))
- 
-+;;;###autoload
- (defun with-editor-shell-command
-     (command &optional output-buffer error-buffer envvar)
-   "Like `shell-command' or `with-editor-async-shell-command'.
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 952c150..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Add-some-autoload.patch