diff -Nru zzz-to-char-0.1.3/debian/changelog zzz-to-char-0.1.3/debian/changelog --- zzz-to-char-0.1.3/debian/changelog 2019-01-29 08:30:28.000000000 +0000 +++ zzz-to-char-0.1.3/debian/changelog 2019-03-29 07:14:23.000000000 +0000 @@ -1,3 +1,9 @@ +zzz-to-char (0.1.3-2) unstable; urgency=medium + + * Apply recent upstream commits (Closes: #925945) + + -- Lev Lamberov Fri, 29 Mar 2019 12:14:23 +0500 + zzz-to-char (0.1.3-1) unstable; urgency=medium * New upstream version 0.1.3 diff -Nru zzz-to-char-0.1.3/debian/patches/0002-fix-emacs26.diff zzz-to-char-0.1.3/debian/patches/0002-fix-emacs26.diff --- zzz-to-char-0.1.3/debian/patches/0002-fix-emacs26.diff 1970-01-01 00:00:00.000000000 +0000 +++ zzz-to-char-0.1.3/debian/patches/0002-fix-emacs26.diff 2019-03-29 07:14:23.000000000 +0000 @@ -0,0 +1,31 @@ +From: Mark Karpov +Subject: Apply upstream commits to fix zzz-to-char in Emacs 26.1 + +Apply 9f08bf94c56a39a2b65f90b852da76dfa6ec2a6f (Fix the call to +‘avy-jump’) and 1ed6d26bcd481d88c6440984c93c248abdea2804 (Use +‘avy-jump’ instead of ‘avy--generic-jump’) upstream commits. + +--- a/zzz-to-char.el ++++ b/zzz-to-char.el +@@ -63,15 +63,15 @@ This is an internal function, see also ` + (let ((p (point)) + (avy-all-windows nil)) + (avy-with zzz-to-char +- (avy--generic-jump ++ (avy-jump + (if (= 13 char) + "\n" + (regexp-quote (string char))) +- nil +- (max (- p zzz-to-char-reach) +- (point-min)) +- (min (+ p zzz-to-char-reach) +- (point-max)))) ++ :window-flip nil ++ :beg (max (- p zzz-to-char-reach) ++ (point-min)) ++ :end (min (+ p zzz-to-char-reach) ++ (point-max)))) + (let ((n (point))) + (when (/= n p) + (cl-destructuring-bind (beg . end) diff -Nru zzz-to-char-0.1.3/debian/patches/series zzz-to-char-0.1.3/debian/patches/series --- zzz-to-char-0.1.3/debian/patches/series 2019-01-29 08:30:28.000000000 +0000 +++ zzz-to-char-0.1.3/debian/patches/series 2019-03-29 07:14:23.000000000 +0000 @@ -1 +1,2 @@ 0001-remove-badges.diff +0002-fix-emacs26.diff