]> code.delx.au - gnu-emacs/blobdiff - lisp/faces.el
Update copyright.
[gnu-emacs] / lisp / faces.el
index af7b785157aaf705c01e68219b2beffd48736c05..e3a1acdb8f0baf8afb60c47732d81bb509cd44fb 100644 (file)
@@ -1,6 +1,6 @@
 ;;; faces.el --- Lisp interface to the c "face" structure
 
-;; Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -162,7 +162,7 @@ in that frame; otherwise change each frame."
   (interactive (internal-face-interactive "underline-p" "underlined"))
   (internal-set-face-1 face 'underline underline-p 7 frame))
 \f
-(defun modify-face-read-string (default name alist)
+(defun modify-face-read-string (face default name alist)
   (let ((value
         (completing-read
          (if default
@@ -192,12 +192,15 @@ If called interactively, prompts for a face and face attributes."
                               (apply 'nconc
                                      (mapcar 'directory-files
                                              x-bitmap-file-path))))
-         (foreground  (modify-face-read-string (face-foreground (intern face))
-                                               "foreground" colors))
-         (background  (modify-face-read-string (face-background (intern face))
-                                               "background" colors))
-         (stipple     (modify-face-read-string (face-stipple (intern face))
-                                               "stipple" stipples))
+         (foreground  (modify-face-read-string
+                       face (face-foreground (intern face))
+                       "foreground" colors))
+         (background  (modify-face-read-string
+                       face (face-background (intern face))
+                       "background" colors))
+         (stipple     (modify-face-read-string
+                       face (face-stipple (intern face))
+                       "stipple" stipples))
          (bold-p      (y-or-n-p (concat "Set face " face " bold ")))
          (italic-p    (y-or-n-p (concat "Set face " face " italic ")))
          (underline-p (y-or-n-p (concat "Set face " face " underline "))))