master 8673c0e256: Make XEmacs compat alias face-background-pixmap obsolete

[Stefan Kangas]

branch: master
commit 8673c0e256c3bf75b20a3a7a221b9240e7dc874a
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>

    Make XEmacs compat alias face-background-pixmap obsolete
    
    * lisp/faces.el (face-background-pixmap)
    (set-face-background-pixmap): Make XEmacs compat aliases obsolete in
    favor of 'face-stipple' and 'set-face-stipple'.  Update callers.
    
    * lisp/emacs-lisp/gv.el (face-background-pixmap): Make XEmacs
    alias obsolete as a generalized variable.
    (face-stipple): New generalized variable.
    * doc/misc/cl.texi (Setf Extensions): Refer to above new generalized
    variable instead of the obsolete one.
---
 doc/misc/cl.texi         |  6 +++---
 lisp/emacs-lisp/chart.el |  2 +-
 lisp/emacs-lisp/gv.el    |  5 ++++-
 lisp/faces.el            | 11 ++++-------
 lisp/play/gamegrid.el    |  4 ++--
 lisp/vc/ediff-init.el    |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi
index a7548bb1f8..b2f43ad051 100644
--- a/doc/misc/cl.texi
+++ b/doc/misc/cl.texi
@@ -938,9 +938,9 @@ current-window-configuration       read-mouse-position
 default-file-modes                 screen-height
 documentation-property             screen-width
 face-background                    selected-window
-face-background-pixmap             selected-screen
-face-font                          selected-frame
-face-foreground                    standard-case-table
+face-font                          selected-screen
+face-foreground                    selected-frame
+face-stipple                       standard-case-table
 face-underline-p                   syntax-table
 file-modes                         visited-file-modtime
 frame-height                       window-height
diff --git a/lisp/emacs-lisp/chart.el b/lisp/emacs-lisp/chart.el
index 6d1821504c..9ff893b75b 100644
--- a/lisp/emacs-lisp/chart.el
+++ b/lisp/emacs-lisp/chart.el
@@ -112,7 +112,7 @@ too much in text characters anyways.")
        (set-face-foreground nf "black")
        (if (and chart-face-use-pixmaps pl)
            (condition-case nil
-               (set-face-background-pixmap nf (car pl))
+               (set-face-stipple nf (car pl))
              (error (message "Cannot set background pixmap %s" (car pl)))))
        (push nf faces)
        (setq cl (cdr cl)
diff --git a/lisp/emacs-lisp/gv.el b/lisp/emacs-lisp/gv.el
index 6ed3b7f85a..abb20b8434 100644
--- a/lisp/emacs-lisp/gv.el
+++ b/lisp/emacs-lisp/gv.el
@@ -685,7 +685,10 @@ REF must have been previously obtained with `gv-ref'."
 (gv-define-setter face-background (x f &optional s)
   `(set-face-background ,f ,x ,s))
 (gv-define-setter face-background-pixmap (x f &optional s)
-  `(set-face-background-pixmap ,f ,x ,s))
+  `(set-face-stipple ,f ,x ,s))
+(make-obsolete-generalized-variable 'face-background-pixmap 'face-stipple 
"29.1")
+(gv-define-setter face-stipple (x f &optional s)
+  `(set-face-stipple ,f ,x ,s))
 (gv-define-setter face-font (x f &optional s) `(set-face-font ,f ,x ,s))
 (gv-define-setter face-foreground (x f &optional s)
   `(set-face-foreground ,f ,x ,s))
diff --git a/lisp/faces.el b/lisp/faces.el
index 390ddbf606..0246e038dd 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1,6 +1,6 @@
 ;;; faces.el --- Lisp faces -*- lexical-binding: t -*-
 
-;; Copyright (C) 1992-1996, 1998-2022 Free Software Foundation, Inc.
+;; Copyright (C) 1992-2022 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
@@ -583,9 +583,6 @@ with the `default' face (which is always completely 
specified)."
                               nil))
 
 
-(defalias 'face-background-pixmap 'face-stipple)
-
-
 (defun face-underline-p (face &optional frame inherit)
  "Return non-nil if FACE specifies a non-nil underlining.
 If the optional argument FRAME is given, report on face FACE in that frame.
@@ -1053,9 +1050,6 @@ Use `set-face-attribute' to \"unspecify\" underlining."
   (set-face-attribute face frame :extend extend-p))
 
 
-(defalias 'set-face-background-pixmap 'set-face-stipple)
-
-
 (defun invert-face (face &optional frame)
   "Swap the foreground and background colors of FACE.
 If FRAME is omitted or nil, it means change face on all frames.
@@ -3179,6 +3173,9 @@ also the same size as FACE on FRAME, or fail."
   :group 'display)
 (make-obsolete-variable 'font-list-limit nil "24.3")
 
+(define-obsolete-function-alias 'face-background-pixmap #'face-stipple "29.1")
+(define-obsolete-function-alias 'set-face-background-pixmap #'set-face-stipple 
"29.1")
+
 (provide 'faces)
 
 ;;; faces.el ends here
diff --git a/lisp/play/gamegrid.el b/lisp/play/gamegrid.el
index bdc056e1dd..8da4205af5 100644
--- a/lisp/play/gamegrid.el
+++ b/lisp/play/gamegrid.el
@@ -1,6 +1,6 @@
 ;;; gamegrid.el --- library for implementing grid-based games on Emacs  -*- 
lexical-binding:t -*-
 
-;; Copyright (C) 1997-1998, 2001-2022 Free Software Foundation, Inc.
+;; Copyright (C) 1997-2022 Free Software Foundation, Inc.
 
 ;; Author: Glynn Clements <glynn@sensei.co.uk>
 ;; Old-Version: 1.02
@@ -263,7 +263,7 @@ format."
   (set-face-foreground face color)
   (set-face-background face color)
   (gamegrid-set-font face)
-  (set-face-background-pixmap face nil))
+  (set-face-stipple face nil))
 
 (defun gamegrid-make-mono-tty-face ()
   (let ((face (make-face 'gamegrid-mono-tty-face)))
diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el
index a3e77200dd..c956cdd2ee 100644
--- a/lisp/vc/ediff-init.el
+++ b/lisp/vc/ediff-init.el
@@ -765,7 +765,7 @@ Ediff needs to find fine differences."
   "Set stipple pixmap of FACE to PIXMAP on a monochrome display."
   (if (and (display-graphic-p) (not (display-color-p)))
       (condition-case nil
-         (set-face-background-pixmap face pixmap)
+          (set-face-stipple face pixmap)
        (error
         (message "Pixmap not found for %S: %s" (face-name face) pixmap)
         (sit-for 1)))))