Run of fresh-snapshots for emacs-wgrep

Try this locally (using the lintian-brush package):

debcheckout emacs-wgrep
cd emacs-wgrep
new-upstream --snapshot --refresh-patches

Merge these changes:

git pull https://janitor.debian.net/git/emacs-wgrep fresh-snapshots/main
git pull https://janitor.debian.net/git/emacs-wgrep fresh-snapshots/upstream

Summary

Merged new upstream version: 2.3.2+9.gf0ef9bf+git20210323.1.f9687c2 (was: 2.3.2+9.gf0ef9bf).

Diff

Branch: main

diff --git a/README.md b/README.md
index b50436d..a6c5212 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,7 @@ M-x wgrep-save-all-buffers
 - Can handle newline insertion in *grep* buffer.
 - Delete whole line include newline.
 
-### Similar softwares:
+### Similar software:
 
 [GNU sed](https://www.gnu.org/software/sed/)
 [helm-ag](https://github.com/syohex/emacs-helm-ag) has a similar feature.
diff --git a/debian/changelog b/debian/changelog
index b047ff3..9ce13a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+emacs-wgrep (2.3.2+9.gf0ef9bf+git20210323.1.f9687c2-1) UNRELEASED; urgency=low
+
+  * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Tue, 01 Jun 2021 07:12:35 -0000
+
 emacs-wgrep (2.3.2+9.gf0ef9bf-2) unstable; urgency=medium
 
   * Mention helm-ag in elpa-wgrep-helm's long description.
diff --git a/debian/patches/0001-disable-wgrep-ag-normal-test.patch b/debian/patches/0001-disable-wgrep-ag-normal-test.patch
index 14c9eb8..be98e53 100644
--- a/debian/patches/0001-disable-wgrep-ag-normal-test.patch
+++ b/debian/patches/0001-disable-wgrep-ag-normal-test.patch
@@ -7,10 +7,10 @@ Forwarded: https://github.com/mhayashi1120/Emacs-wgrep/issues/73
  wgrep-subtest.el | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/wgrep-subtest.el b/wgrep-subtest.el
-index 7e4974a..41ff23b 100644
---- a/wgrep-subtest.el
-+++ b/wgrep-subtest.el
+Index: emacs-wgrep/wgrep-subtest.el
+===================================================================
+--- emacs-wgrep.orig/wgrep-subtest.el
++++ emacs-wgrep/wgrep-subtest.el
 @@ -7,6 +7,7 @@
      (wgrep-test--wait buf)))
  
diff --git a/wgrep-helm.el b/wgrep-helm.el
index 96a5b54..f4db3bb 100644
--- a/wgrep-helm.el
+++ b/wgrep-helm.el
@@ -7,7 +7,7 @@
 ;; Package-Requires: ((wgrep "2.1.1"))
 ;; URL: http://github.com/mhayashi1120/Emacs-wgrep/raw/master/wgrep-helm.el
 ;; Emacs: GNU Emacs 25 or later
-;; Version: 2.3.2
+;; Version: 2.3.3
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
@@ -75,7 +75,8 @@
         (let* ((value (get-text-property (point) 'helm-realvalue))
                (data  (when (eq major-mode 'helm-grep-mode)
                         (helm-grep-split-line value)))
-               (fn    (or (get-text-property (point) 'buffer-name)
+               (bufname (get-text-property (point) 'buffer-name))
+               (fn    (or (and bufname (buffer-file-name (get-buffer bufname)))
                           (get-text-property (point) 'helm-grep-fname)))
                (line  (if data
                           (string-to-number (nth 1 data))
diff --git a/wgrep.el b/wgrep.el
index ccd3953..e9833d7 100644
--- a/wgrep.el
+++ b/wgrep.el
@@ -80,7 +80,7 @@
 ;; - Can handle newline insertion in *grep* buffer.
 ;; - Delete whole line include newline.
 
-;; ### Similar softwares:
+;; ### Similar software:
 
 ;; [GNU sed](https://www.gnu.org/software/sed/)
 ;; [helm-ag](https://github.com/syohex/emacs-helm-ag) has a similar feature.
@@ -123,9 +123,9 @@
 ;;; Variable / Constant
 ;;;
 
-;;
-;; Customize
-;;
+;;;;
+;;;; Customize
+;;;;
 
 (defcustom wgrep-change-readonly-file nil
   "Non-nil means to enable change read-only files."
@@ -153,9 +153,9 @@ Key to enable `wgrep-mode'."
 
 (defvar wgrep-mode-map nil)
 
-;;
-;; Internal variable
-;;
+;;;;
+;;;; Internal variable
+;;;;
 
 (defvar wgrep-readonly-state nil)
 (make-variable-buffer-local 'wgrep-readonly-state)
@@ -181,9 +181,9 @@ Key to enable `wgrep-mode'."
 ;; GNU Emacs have this variable at least version 21 or later
 (defvar auto-coding-regexp-alist)
 
-;;
-;; Constant
-;;
+;;;;
+;;;; Constant
+;;;;
 
 ;; These regexp come from `grep-regexp-alist' at grep.el
 (eval-and-compile
@@ -207,15 +207,15 @@ Key to enable `wgrep-mode'."
      wgrep-colon-file-separator-header-regexp
      "\\)")))
 
-;;
-;; Error
-;;
+;;;;
+;;;; Error
+;;;;
 
 (define-error 'wgrep-error "wgrep error")
 
-;;
-;; Overridable functions / regexp
-;;
+;;;;
+;;;; Overridable functions / regexp
+;;;;
 
 (defvar wgrep-line-file-regexp wgrep-default-line-header-regexp
   "Regexp that match to line header of grep result.
@@ -240,9 +240,9 @@ non editable region.")
 ;;; Basic utilities
 ;;;
 
-;;
-;; misc
-;;
+;;;;
+;;;; misc
+;;;;
 
 ;;Hack function
 (defun wgrep-string-replace-bom (string cs)
@@ -273,9 +273,9 @@ non editable region.")
     (or (null proc)
         (eq (process-status proc) 'exit))))
 
-;;
-;; error
-;;
+;;;;
+;;;; error
+;;;;
 
 (defun wgrep-check-file (file)
   (unless (file-exists-p file)
@@ -283,9 +283,9 @@ non editable region.")
   (unless (file-writable-p file)
     (signal 'wgrep-error (list "File is not writable."))))
 
-;;
-;; overlay
-;;
+;;;;
+;;;; overlay
+;;;;
 
 (defun wgrep-cleanup-overlays (beg end)
   (dolist (ov (overlays-in beg end))

Branch: upstream

Tag: 2.3.2+9.gf0ef9bf+git20210323.1.f9687c2

Diff is too long (more than 200 lines). Download the raw diff.

Debdiff

[The following lists of changes regard files as different if they have different names, permissions or owners.]

Files in second set of .debs but not in first

-rw-r--r--  root/root   /usr/share/emacs/site-lisp/elpa-src/wgrep-helm-2.3.3/wgrep-helm-autoloads.el
-rw-r--r--  root/root   /usr/share/emacs/site-lisp/elpa-src/wgrep-helm-2.3.3/wgrep-helm-pkg.el
-rw-r--r--  root/root   /usr/share/emacs/site-lisp/elpa-src/wgrep-helm-2.3.3/wgrep-helm.el

Files in first set of .debs but not in second

-rw-r--r--  root/root   /usr/share/emacs/site-lisp/elpa-src/wgrep-helm-2.3.2/wgrep-helm-autoloads.el
-rw-r--r--  root/root   /usr/share/emacs/site-lisp/elpa-src/wgrep-helm-2.3.2/wgrep-helm-pkg.el
-rw-r--r--  root/root   /usr/share/emacs/site-lisp/elpa-src/wgrep-helm-2.3.2/wgrep-helm.el

No differences were encountered between the control files of package elpa-wgrep

No differences were encountered between the control files of package elpa-wgrep-ack

No differences were encountered between the control files of package elpa-wgrep-ag

No differences were encountered between the control files of package elpa-wgrep-helm

Resulting package

The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:

apt install -t fresh-snapshots elpa-wgrep-ack
apt install -t fresh-snapshots elpa-wgrep-ag
apt install -t fresh-snapshots elpa-wgrep-helm
apt install -t fresh-snapshots elpa-wgrep

Lintian Result

Full worker log Full build log Full dist log