[bongo-patches] Don't specify pixel-width space in Emacs 21, which does not support it (reported by Romain Francoise)

[Daniel Brockman]

Sun Dec 31 12:27:10 CET 2006  Daniel Brockman <address@hidden>

 * Don't specify pixel-width space in Emacs 21, which does
   not support it (reported by Romain Francoise).

diff -rN -u old-bongo/bongo.el new-bongo/bongo.el
--- old-bongo/bongo.el  2006-12-31 12:29:28.000000000 +0100
+++ new-bongo/bongo.el  2006-12-31 12:29:28.000000000 +0100
@@ -1211,7 +1211,8 @@
   (when (and window-system (not (bongo-playing-p)))
     (let ((icon-size (bongo-mode-line-icon-size)))
       (concat
-       (propertize " " 'display '(space :width (1)))
+       (when (>= emacs-major-version 22)
+         (propertize " " 'display '(space :width (1))))
        (propertize "[Start]"
                    'display (cond ((= icon-size 18)
                                    (eval bongo-mode-line-resume-icon-18))
@@ -1220,14 +1221,16 @@
                    'help-echo (concat "mouse-1: start playback")
                    'local-map bongo-mode-line-start-map
                    'mouse-face 'highlight)
-       (propertize " " 'display '(space :width (1)))))))
+       (when (>= emacs-major-version 22)
+         (propertize " " 'display '(space :width (1))))))))
 
 (defun bongo-mode-line-stop-button ()
   "Return the string to use as [Stop] button in the mode line."
   (when (and window-system (bongo-playing-p))
     (let ((icon-size (bongo-mode-line-icon-size)))
       (concat
-       (propertize " " 'display '(space :width (1)))
+       (when (>= emacs-major-version 22)
+         (propertize " " 'display '(space :width (1))))
        (propertize "[Stop]"
                    'display (cond ((= icon-size 18)
                                    (eval bongo-mode-line-stop-icon-18))
@@ -1236,7 +1239,8 @@
                    'help-echo (concat "mouse-1: stop playback")
                    'local-map bongo-mode-line-stop-map
                    'mouse-face 'highlight)
-       (propertize " " 'display '(space :width (1)))))))
+       (when (>= emacs-major-version 22)
+         (propertize " " 'display '(space :width (1))))))))
 
 (defun bongo-mode-line-start/stop-button ()
   "Return the string to use as [Start] or [Stop] button."
@@ -1249,7 +1253,8 @@
     (if window-system
         (let ((icon-size (bongo-mode-line-icon-size)))
           (concat
-           (propertize " " 'display '(space :width (1)))
+           (when (>= emacs-major-version 22)
+             (propertize " " 'display '(space :width (1))))
            (propertize
             " "
             'display (if (bongo-paused-p)
@@ -1268,7 +1273,8 @@
                                 (bongo-player-infoset bongo-player)))
             'local-map bongo-mode-line-pause/resume-map
             'mouse-face 'highlight)
-           (propertize " " 'display '(space :width (1)))))
+           (when (>= emacs-major-version 22)
+             (propertize " " 'display '(space :width (1))))))
       (if (bongo-paused-p)
           bongo-mode-line-paused-string
         bongo-mode-line-playing-string))))
@@ -1278,7 +1284,8 @@
   (when (and window-system (bongo-point-at-current-track-line))
     (let ((icon-size (bongo-mode-line-icon-size)))
       (concat
-       (propertize " " 'display '(space :width (1)))
+       (when (>= emacs-major-version 22)
+         (propertize " " 'display '(space :width (1))))
        (propertize "[Previous]"
                    'display (cond ((= icon-size 18)
                                    (eval bongo-mode-line-previous-icon-18))
@@ -1294,14 +1301,16 @@
                        "No previous track"))
                    'local-map bongo-mode-line-previous-map
                    'mouse-face 'highlight)
-       (propertize " " 'display '(space :width (1)))))))
+       (when (>= emacs-major-version 22)
+         (propertize " " 'display '(space :width (1))))))))
 
 (defun bongo-mode-line-next-button ()
   "Return the string to use as [Next] button in the mode line."
   (when (and window-system (bongo-point-at-current-track-line))
     (let ((icon-size (bongo-mode-line-icon-size)))
       (concat
-       (propertize " " 'display '(space :width (1)))
+       (when (>= emacs-major-version 22)
+         (propertize " " 'display '(space :width (1))))
        (propertize "[Next]"
                    'display (cond ((= icon-size 18)
                                    (eval bongo-mode-line-next-icon-18))
@@ -1317,7 +1326,8 @@
                        "No next track"))
                    'local-map bongo-mode-line-next-map
                    'mouse-face 'highlight)
-       (propertize " " 'display '(space :width (1)))))))
+       (when (>= emacs-major-version 22)
+         (propertize " " 'display '(space :width (1))))))))
 
 (defvar bongo-mode-line-indicator-string nil
   "Bongo mode line indicator string.

-- 
Daniel Brockman <address@hidden>