From: Raimon Grau <raimonster@gmail.com>
Date: Sun, 9 Dec 2018 23:42:41 +0000 (+0200)
Subject: Guard occur against an undefined orig-line
X-Git-Tag: emacs-26.1.91~51
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ee1ebe8246c333e9ca0e3454f357d12c713c129b;p=emacs.git

Guard occur against an undefined orig-line

; Not to be merged to master
* lisp/replace.el (occur-engine): Avoid inserting the current line if
orig-line is nil.  This happens, for example, when reverting an occur
buffer with `list-matching-lines-jump-to-current-line' set to t.
(Bug#33476)
---

diff --git a/lisp/replace.el b/lisp/replace.el
index 940bf566509..4f0cbf4b958 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1748,6 +1748,7 @@ See also `multi-occur'."
                           (when (and list-matching-lines-jump-to-current-line
                                      (not multi-occur-p)
                                      (not orig-line-shown-p)
+                                     orig-line
                                      (>= curr-line orig-line))
                             (insert
                              (concat
@@ -1774,7 +1775,8 @@ See also `multi-occur'."
                   ;; Insert original line if haven't done yet.
                   (when (and list-matching-lines-jump-to-current-line
                              (not multi-occur-p)
-                             (not orig-line-shown-p))
+                             (not orig-line-shown-p)
+                             orig-line)
                     (with-current-buffer out-buf
                       (insert
                        (concat