[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 96f6cac: Don't hard-code 1 as point-min.
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] emacs-25 96f6cac: Don't hard-code 1 as point-min. |
Date: |
Wed, 20 Jan 2016 00:09:49 +0000 |
branch: emacs-25
commit 96f6cace6bd088c8a49892502354272eb9d1a702
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
Don't hard-code 1 as point-min.
* lisp/image-mode.el (image-display-size):
* lisp/xwidget.el (xwidget-webkit-last-session)
(xwidget-webkit-current-session): Don't hard-code 1 as point-min.
---
lisp/image-mode.el | 2 +-
lisp/xwidget.el | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 38a25d2..e549b49 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -169,7 +169,7 @@ return the display size taking the slice property into
account. If the list
contains `image' but not `slice', return the `image-size' of the specified
image."
(cond ((eq (car spec) 'xwidget)
- (let ((xwi (xwidget-info (xwidget-at 1)))) ; FIXME point-min?
+ (let ((xwi (xwidget-info (xwidget-at (point-min)))))
(cons (aref xwi 2) (aref xwi 3))))
((eq (car spec) 'image)
(image-size spec pixels frame))
diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index 223f4f2..0fb90c4 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -245,15 +245,13 @@ XWIDGET instance, XWIDGET-EVENT-TYPE depends on the
originating xwidget."
"Last active webkit, or nil."
(if (buffer-live-p xwidget-webkit-last-session-buffer)
(with-current-buffer xwidget-webkit-last-session-buffer
- (xwidget-at 1))
+ (xwidget-at (point-min)))
nil))
(defun xwidget-webkit-current-session ()
"Either the webkit in the current buffer, or the last one used.
The latter might be nil."
- (if (xwidget-at 1)
- (xwidget-at 1)
- (xwidget-webkit-last-session)))
+ (or (xwidget-at (point-min)) (xwidget-webkit-last-session)))
(defun xwidget-adjust-size-to-content (xw)
"Resize XW to content."
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-25 96f6cac: Don't hard-code 1 as point-min.,
Glenn Morris <=