[Emacs-diffs] trunk r116986: * lisp/image-mode.el (image-mode-window-put): Also update the property of

[Stefan Monnier]

------------------------------------------------------------
revno: 116986
revision-id: address@hidden
parent: address@hidden
author: Ian D <address@hidden>
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2014-04-16 23:58:25 -0400
message:
  * lisp/image-mode.el (image-mode-window-put): Also update the property of
  the "default window".
  * lisp/doc-view.el (doc-view-new-window-function): If no window
  exists,       move to the last known page.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/doc-view.el               docview.el-20091113204419-o5vbwnq5f7feedwu-6334
  lisp/image-mode.el             
imagemode.el-20091113204419-o5vbwnq5f7feedwu-3391

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-04-16 19:43:46 +0000
+++ b/lisp/ChangeLog    2014-04-17 03:58:25 +0000
@@ -1,3 +1,10 @@
+2014-04-17  Ian D  <address@hidden>  (tiny change)
+
+       * image-mode.el (image-mode-window-put): Also update the property of
+       the "default window".
+       * doc-view.el (doc-view-new-window-function): If no window
+       exists, move to the last known page.
+
 2014-04-16  Stefan Monnier  <address@hidden>
 
        * progmodes/perl-mode.el (perl-calculate-indent): Don't auto-indent in

=== modified file 'lisp/doc-view.el'
--- a/lisp/doc-view.el  2014-04-14 21:01:37 +0000
+++ b/lisp/doc-view.el  2014-04-17 03:58:25 +0000
@@ -336,7 +336,7 @@
       ;; Don't do it if there's a conversion is running, since in that case, it
       ;; will be done later.
       (with-selected-window (car winprops)
-        (doc-view-goto-page 1)))))
+        (doc-view-goto-page (image-mode-window-get 'page t))))))
 
 (defvar-local doc-view--current-files nil
   "Only used internally.")

=== modified file 'lisp/image-mode.el'
--- a/lisp/image-mode.el        2014-01-01 07:43:34 +0000
+++ b/lisp/image-mode.el        2014-04-17 03:58:25 +0000
@@ -90,6 +90,9 @@
 
 (defun image-mode-window-put (prop val &optional winprops)
   (unless (consp winprops) (setq winprops (image-mode-winprops winprops)))
+  (setcdr (assq t image-mode-winprops-alist)
+          (cons (cons prop val)
+                (delq (assq prop (cdr winprops)) (cdr winprops))))
   (setcdr winprops (cons (cons prop val)
                          (delq (assq prop (cdr winprops)) (cdr winprops)))))