Upstream child frame preview

lisp/pdf-annot.el

@@ -1013,7 +1013,7 @@ other annotations."
              :map (pdf-view-apply-hotspot-functions
                    window page size)
              :width (car size))
-           (when pdf-view-roll-minor-mode page)))
+           page))
         (pdf-util-scroll-to-edges
          (pdf-util-scale-relative-to-pixel (car edges)))))))
 
@@ -1129,9 +1129,7 @@ Return the new annotation."
      (list posn)))
   (pdf-util-assert-pdf-window)
   (when (posnp pos)
-    (setq page (or page
-                   (when pdf-view-roll-minor-mode
-                     (1+ (/ (posn-point pos) 4)))))
+    (setq page (pdf-view-posn-page pos))
     (setq pos (posn-object-x-y pos)))
   (let ((isize (pdf-view-image-size))
         (x (car pos))
@@ -1576,6 +1574,11 @@ scroll the current page."
 
 ;; TODO 'merge' this function with `pdf-links-read-link-action' into a single
 ;; universal 'read-action' function (in `pdf-util'?)
+
+(autoload 'pdf-links-read-link-action--create-keys "pdf-links")
+(declare-function pdf-links-read-link-action--read-chars "pdf-links")
+(defvar pdf-links-convert-pointsize-scale)
+(defvar pdf-links-read-link-convert-commands)
 (defun pdf-annot-read-annot (prompt)
   "Using PROMPT, interactively read an annot-action.
 
@@ -1617,7 +1620,7 @@ See `pdf-annot-edit' for the interface."
              (car size) image-data 'pdf-annot-read-annot))
           (pdf-view-display-image
            (create-image image-data (pdf-view-image-type) t)
-           (when pdf-view-roll-minor-mode (pdf-view-current-page)))
+           (pdf-view-current-page))
           (pdf-links-read-link-action--read-chars prompt alist))
       (pdf-view-redisplay))))
 

lisp/pdf-cache.el

@@ -471,6 +471,7 @@ Used solely in `pdf-cache--prefetch-start'.")
 (defun pdf-cache--prefetch-start (buffer)
   "Start prefetching images in BUFFER."
   (when (and pdf-cache-prefetch-minor-mode
+             (pdf-view-current-page)
              (not pdf-cache--prefetch-started-p)
              (pdf-util-pdf-buffer-p)
              (not isearch-mode)

lisp/pdf-isearch.el

@@ -249,8 +249,7 @@ This is a Isearch interface function."
   (when (> (length string) 0)
     (let ((same-search-p (pdf-isearch-same-search-p))
           (oldpage pdf-isearch-current-page)
-          (pages (or (image-mode-window-get 'displayed-pages (selected-window))
-                     (list (pdf-view-current-page))))
+          (pages (reverse (pdf-view-displayed-pages (selected-window))))
           matches
           next-match)
       (dolist (page pages)
@@ -284,23 +283,16 @@ This is a Isearch interface function."
         ;; Don't get off track.
         (when (or (and (bobp) (not isearch-forward))
                   (and (eobp) isearch-forward))
-          (unless pdf-view-roll-minor-mode
-            (goto-char (1+ (/ (buffer-size) 2)))))
-        ;; Signal success to isearch.
-        ;; Moving the point is for `pdf-roll'. It ensures that
-        ;; `re-search-forward' takes us back to the starting point. Otherwise
-        ;; every call to `isearch-repeat' will increment/decrement the point
-        ;; and that causes recentering.
+          (goto-char (1+ (/ (buffer-size) 2))))
         (if isearch-forward
-            (progn (unless (bobp) (forward-char -1))
-                   (re-search-forward "."))
-          (unless (eobp) (forward-char 1))
+            (re-search-forward ".")
           (re-search-backward ".")))
-       ((and (not pdf-isearch-narrow-to-page)
-             (not (pdf-isearch-empty-match-p pdf-isearch-current-matches)))
+       ((not (pdf-isearch-empty-match-p pdf-isearch-current-matches))
         (let ((next-page (pdf-isearch-find-next-matching-page
                           string pdf-isearch-current-page t)))
-          (when next-page
+          (when (and next-page
+                     (or (not pdf-isearch-narrow-to-page)
+                         (memq next-page pages)))
             (pdf-view-goto-page next-page)
             (pdf-isearch-search-function string))))))))
 
@@ -324,9 +316,7 @@ This is a Isearch interface function."
           (pdf-isearch-hl-matches
            pdf-isearch-current-match
            pdf-isearch-current-matches
-           nil (image-mode-window-get 'displayed-pages (selected-window)))
-        (when pdf-view-roll-minor-mode
-          (pdf-view-redisplay)))
+           nil (pdf-view-displayed-pages)))
       (image-set-window-hscroll hscroll)
       (image-set-window-vscroll vscroll))))
 
@@ -362,8 +352,7 @@ This is a Isearch interface function."
         pdf-isearch-current-match nil
         pdf-isearch-current-matches nil
         pdf-isearch-current-parameter nil)
-  (unless pdf-view-roll-minor-mode
-    (goto-char (1+ (/ (buffer-size) 2)))))
+  (goto-char (1+ (/ (buffer-size) 2))))
 
 (defun pdf-isearch-same-search-p (&optional ignore-search-string-p)
   "Return non-nil, if search parameter have not changed.
@@ -405,8 +394,7 @@ there was no previous search, this function returns t."
    pdf-isearch-current-match
    pdf-isearch-current-matches
    nil
-   (or (image-mode-window-get 'displayed-pages (selected-window))
-       (list (pdf-view-current-page)))))
+   (pdf-view-displayed-pages (selected-window))))
 
 (defun pdf-isearch-update ()
   "Update search and redisplay, if necessary."
@@ -744,9 +732,7 @@ MATCH-BG LAZY-FG LAZY-BG\)."
   (cl-destructuring-bind (fg1 bg1 fg2 bg2)
       (pdf-isearch-current-colors)
     (let* ((window (selected-window))
-           (pages (or pages
-                      (image-mode-window-get 'displayed-pages (selected-window))
-                      (list (pdf-view-current-page))))
+           (pages (or pages (pdf-view-displayed-pages window)))
            (buffer (current-buffer))
            (tick (cl-incf pdf-isearch--hl-matches-tick)))
       (dolist (page pages)
@@ -763,8 +749,7 @@ MATCH-BG LAZY-FG LAZY-BG\)."
                       (when (and (derived-mode-p 'pdf-view-mode)
                                  (or isearch-mode occur-hack-p
                                      (memq last-command '(isearch-repeat-forward isearch-repeat-backward)))
-                                 (or (eq page (pdf-view-current-page))
-                                     (memq page (image-mode-window-get 'displayed-pages window))))
+                                 (memq page (pdf-view-displayed-pages window)))
                         (pdf-view-display-image
                          (pdf-view-create-image data :width width)
                          page window)))))))