aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2016-05-23 08:13:03 -0700
committerPaul Eggert2016-05-23 08:13:20 -0700
commitc6493c68f8fd6a5e6893eb3837a1a27f8d8a98a8 (patch)
tree0ab2b6aa39f535e4c283a62bd1fc0370c38e6097
parentb6baa31e9d37451dbf49d5b9050a2fe0dffff570 (diff)
downloademacs-c6493c68f8fd6a5e6893eb3837a1a27f8d8a98a8.tar.gz
emacs-c6493c68f8fd6a5e6893eb3837a1a27f8d8a98a8.zip
Fix seq requirement that broke bootstrap
* lisp/image.el (image--get-image): Require seq here, not at the top level, to avoid ‘(require seq) while preparing to dump’ while bootstrapping. Suggested by Tino Calancha in: http://lists.gnu.org/archive/html/emacs-devel/2016-05/msg00477.html
-rw-r--r--lisp/image.el3
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/image.el b/lisp/image.el
index a6464f7d4af..e06cb6f4733 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -25,8 +25,6 @@
25 25
26;;; Code: 26;;; Code:
27 27
28(require 'seq)
29
30(defgroup image () 28(defgroup image ()
31 "Image support." 29 "Image support."
32 :group 'multimedia) 30 :group 'multimedia)
@@ -975,6 +973,7 @@ default is 20%."
975 0.8))) 973 0.8)))
976 974
977(defun image--get-image () 975(defun image--get-image ()
976 (require 'seq)
978 (let ((image (or (get-text-property (point) 'display) 977 (let ((image (or (get-text-property (point) 'display)
979 ;; `put-image' uses overlays, so find an image in 978 ;; `put-image' uses overlays, so find an image in
980 ;; the overlays. 979 ;; the overlays.