This commit was manufactured by cvs2svn to create branch 'elmo-imap4-new-

[elisp/wanderlust.git] / wl / wl-demo.el

diff --git a/wl/wl-demo.el b/wl/wl-demo.el
index f6772c8..5b90ed2 100644 (file)
--- a/wl/wl-demo.el
+++ b/wl/wl-demo.el
@@ -31,7 +31,7 @@
 ;;; Code:
 
 (defconst wl-demo-copyright-notice
-  "Copyright (C) 1998-2009 Yuuichi Teranishi <teranisi@gohome.org>"
+  "Copyright (C) 1998-2011 Yuuichi Teranishi <teranisi@gohome.org>"
   "A declaration of the copyright on Wanderlust.")
 
 (eval-when-compile
@@ -190,9 +190,10 @@ Return a number of lines that an image occupies in the buffer."
                                         file image-type)))))
                 (when (eq 'xbm image-type)
                   (set-glyph-face image 'wl-highlight-logo-face))
-                (insert-char ?\  (max 0 (/ (+ (* (- width (glyph-width image))
-                                                 (window-width)) width)
-                                           (* 2 width))))
+                (insert-char (string-to-char " ")
+                             (max 0 (/ (+ (* (- width (glyph-width image))
+                                             (window-width)) width)
+                                       (* 2 width))))
                 (set-extent-end-glyph (make-extent (point) (point)) image)
                 (insert "\n")
                 (/ (+ (* 2 (glyph-height image) (window-height)) height)
@@ -235,11 +236,11 @@ Return a number of lines that an image occupies in the buffer."
 
                 ;; Emacs 21.x may fail on computing the end of the
                 ;; column if there're bitmap characters.
-                ;;(setq width 0)
-                ;;(while (progn
-                ;;         (end-of-line 0)
-                ;;         (not (bobp)))
-                ;;  (setq width (max width (current-column))))
+;;;             (setq width 0)
+;;;             (while (progn
+;;;                      (end-of-line 0)
+;;;                      (not (bobp)))
+;;;               (setq width (max width (current-column))))
                 (setq width 1024)
                 (while (progn
                          (end-of-line 0)
@@ -407,6 +408,17 @@ argument."
               1))
     buffer))
 
+;; Prune functions provided temporarily to avoid compile warnings.
+(eval-when-compile
+  (dolist (fn '(face-background-name
+               frame-char-height frame-char-width glyph-height glyph-width
+               image-size make-extent propertize set-extent-end-glyph
+               window-pixel-height window-pixel-width))
+    (when (and (get fn 'defalias-maybe)
+              (eq (symbol-function fn) 'ignore))
+      (put fn 'defalias-maybe nil)
+      (fmakunbound fn))))
+
 (require 'product)
 (product-provide (provide 'wl-demo) (require 'wl-version))