Mercurial > hg > xemacs-beta

changeset 1139:c2550fff5469

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-12-03 14:02:49 by didierv] Small fix for set-face-background-pixmap-file
author didierv
date Tue, 03 Dec 2002 14:02:50 +0000
parents 05ed51332340
children db9bfcf5e054
files lisp/ChangeLog lisp/faces.el
diffstat 2 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Tue Dec 03 11:01:44 2002 +0000
+++ b/lisp/ChangeLog	Tue Dec 03 14:02:50 2002 +0000
@@ -1,3 +1,8 @@
+2002-12-03  Didier Verna  <didier@xemacs.org>
+
+	* faces.el (set-face-background-pixmap-file): Ensure default value
+	can be computed.
+
 2002-12-03  Didier Verna  <didier@xemacs.org>
 
 	* faces.el (background-pixmap-file-history): New.
--- a/lisp/faces.el	Tue Dec 03 11:01:44 2002 +0000
+++ b/lisp/faces.el	Tue Dec 03 14:02:50 2002 +0000
@@ -635,11 +635,13 @@
 designed for interactive use."
   (interactive
    (let* ((face (read-face-name "Set background pixmap of face: "))
+	  (default (and (face-background-pixmap-instance face)
+			((image-instance-file-name
+			  (face-background-pixmap-instance face)))))
 	  (file (read-file-name
 		 (format "Set background pixmap of face %s to: "
 			 (symbol-name face))
-		 nil (image-instance-file-name
-		      (face-background-pixmap-instance face)) t nil
+		 nil default t nil
 		      'background-pixmap-file-history)))
      (list face (if (equal file "") nil file))))
   (set-face-property face 'background-pixmap file))