[xpm] Fix byte-compilation bugs.

* packages/xpm/xpm-m2z.el: Require ‘cl’ when compiling.
* packages/xpm/xpm.el: Likewise.
Also, add "manual" autoload for ‘image-toggle-display’.

diff --git a/packages/xpm/NEWS b/packages/xpm/NEWS
index c78384c2208e4a0c95410ddb540562ffe02febb0..623a2dfb0539f4616bf569b8d62e190ba9ae9312 100644 (file)
--- a/packages/xpm/NEWS
+++ b/packages/xpm/NEWS
@@ -2,6 +2,9 @@ NEWS for xpm.el (et al)
 See the end for copying conditions.
 
 
+- 1.0.1 | NOT YET RELEASED
+  - byte-compilation bugfix
+
 - 1.0.0 | 2014-05-18
   - initial release
 

diff --git a/packages/xpm/xpm-m2z.el b/packages/xpm/xpm-m2z.el
index c699b9a46b0c8392d8253b735280cbc775317622..c9124f97a47bcd8f83d3081955b92dac9b10f05b 100644 (file)
--- a/packages/xpm/xpm-m2z.el
+++ b/packages/xpm/xpm-m2z.el
@@ -31,6 +31,7 @@
 
 (require 'artist)
 (require 'cl-lib)
+(eval-when-compile (require 'cl))
 
 ;;;###autoload
 (defun xpm-m2z-ellipse (cx cy rx ry)

diff --git a/packages/xpm/xpm.el b/packages/xpm/xpm.el
index 26b5f7f30739b592263f2efcaca93fd1452c5196..c8cad4e63cc4cee744717a14a0abc5d3863def30 100644 (file)
--- a/packages/xpm/xpm.el
+++ b/packages/xpm/xpm.el
@@ -67,6 +67,9 @@
 ;;; Code:
 
 (require 'cl-lib)
+(eval-when-compile (require 'cl))
+
+(autoload 'image-toggle-display "image-mode" t) ; hmm is this TRT?
 
 (defvar xpm-raster-inhibit-continuity-optimization nil
   "Non-nil disables a heuristic in `xpm-raster' filling.