Commits

Anonymous committed a79a2eb Merge

fixup commit for tag 'xwem-1_16'

  • Participants
  • Parent commits 72d7da4, 0f37555
  • Branches RELEASE_1_0
  • Tags xwem-1_16

Comments (0)

Files changed (4)

-2004-09-16  Norbert Koch  <viteno@xemacs.org>
-
-	* Makefile (VERSION): XEmacs package 1.18 released.
-
-2004-09-15  Steve Youngs  <steve@youngs.au.com>
-
-	* lisp/xwem-clients.el (xwem-client-info): Typo fix. car -> cdr.
-
-2004-09-15  Norbert Koch  <viteno@xemacs.org>
-
-	* Makefile (VERSION): XEmacs package 1.17 released.
-
-2004-09-15  Steve Youngs  <steve@youngs.au.com>
-
-	* lisp/xwem-icons.el (xwem-icons-cl-icon): Remove redundant `if' in
-	previous patch.
-
 2004-09-15  Norbert Koch  <viteno@xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 1.16 released.
 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-VERSION = 1.18
+VERSION = 1.16
 AUTHOR_VERSION = 0.2
 MAINTAINER = Zajcev Evgeny <zevlg@yandex.ru>
 PACKAGE = xwem

File lisp/xwem-clients.el

 	  (xwem-message 'info "id: 0x%d, usize: %dx%d, psize: %dx%d, uptime: %s, name: `%s'"
 			(X-Win-id (xwem-cl-xwin client))
 			(car usz) (cdr usz)
-			(car psz) (cdr psz)
+			(car psz) (car psz)
 			(xwem-cl-get-uptime client)
 			(xwem-client-name client)))
       (xwem-message 'warn "No active clients found.")))

File lisp/xwem-icons.el

     (when iname
       (setq ximg (plist-get xwem-icons-list iname))
       (unless ximg
-	(setq fname (expand-file-name iname xwem-icons-dir))
+	(if (file-exists-p (expand-file-name iname xwem-icons-dir))
+	    (setq fname (expand-file-name iname xwem-icons-dir))
+	  (setq fname (expand-file-name iname)))
 	(setq ximg (X:xpm-pixmap-from-file (xwem-dpy) (XDefaultRootWindow (xwem-dpy)) fname))
 	(setq ximg-mask-pixmap (X:xpm-pixmap-from-file (xwem-dpy) (XDefaultRootWindow (xwem-dpy)) fname t))