Initial revision

2 files changed, 848 insertions, 0 deletions

diff --git a/lisp/faces.el b/lisp/faces.el
new file mode 100644
index 00000000000..0766894f488
--- /dev/null
+++ b/lisp/faces.el
@@ -0,0 +1,740 @@
+;;; faces.el --- Lisp interface to the c "face" structure
+
+;; Copyright (C) 1992, 1993 Free Software Foundation, Inc.
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to
+;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+
+;;; Commentary:
+
+;; Mostly derived from Lucid.
+
+;;; Code:
+
+(defsubst internal-facep (x)
+  (and (vectorp x) (= (length x) 8) (eq (aref x 0) 'face)))
+
+(defmacro internal-check-face (face)
+  (` (while (not (internal-facep (, face)))
+       (setq (, face) (signal 'wrong-type-argument (list 'internal-facep (, face)))))))
+
+
+(defvar global-face-data nil "do not use this")
+
+(defun face-list ()
+  "Returns a list of all defined face names."
+  (mapcar 'car global-face-data))
+
+(defun internal-find-face (name &optional frame)
+  "Retrieve the face named NAME.  Return nil if there is no such face.
+If the optional argument FRAME is given, this gets the face NAME for
+that frame; otherwise, it uses the selected frame.
+If FRAME is the symbol t, then the global, non-frame face is returned.
+If NAME is already a face, it is simply returned."
+  (if (and (eq frame t) (not (symbolp name)))
+      (setq name (face-name name)))
+  (if (symbolp name)
+      (cdr (assq name
+                 (if (eq frame t)
+                     global-face-data
+                   (frame-face-alist (or frame (selected-frame))))))
+    (internal-check-face name)
+    name))
+
+(defun internal-get-face (name &optional frame)
+  "Retrieve the face named NAME; error if there is none.
+If the optional argument FRAME is given, this gets the face NAME for
+that frame; otherwise, it uses the selected frame.
+If FRAME is the symbol t, then the global, non-frame face is returned.
+If NAME is already a face, it is simply returned."
+  (or (internal-find-face name frame)
+      (internal-check-face name)))
+
+(defsubst face-name (face)
+  "Return the name of face FACE."
+  (aref (internal-get-face face) 1))
+
+(defsubst face-id (face)
+  "Return the internal ID number of face FACE."
+  (aref (internal-get-face face) 2))
+
+(defsubst face-font (face &optional frame)
+  "Return the font name of face FACE, or nil if it is unspecified.
+If the optional argument FRAME is given, report on face FACE in that frame.
+Otherwise report on the defaults for face FACE (for new frames)."
+  (aref (internal-get-face face frame) 3))
+
+(defsubst face-foreground (face &optional frame)
+  "Return the foreground color name of face FACE, or nil if unspecified.
+If the optional argument FRAME is given, report on face FACE in that frame.
+Otherwise report on the defaults for face FACE (for new frames)."
+  (aref (internal-get-face face frame) 4))
+
+(defsubst face-background (face &optional frame)
+  "Return the background color name of face FACE, or nil if unspecified.
+If the optional argument FRAME is given, report on face FACE in that frame.
+Otherwise report on the defaults for face FACE (for new frames)."
+  (aref (internal-get-face face frame) 5))
+
+(defsubst face-background-pixmap (face &optional frame)
+ "Return the background pixmap name of face FACE, or nil if unspecified.
+If the optional argument FRAME is given, report on face FACE in that frame.
+Otherwise report on the defaults for face FACE (for new frames)."
+ (aref (internal-get-face face frame) 6))
+
+(defsubst face-underline-p (face &optional frame)
+ "Return t if face FACE is underlined.
+If the optional argument FRAME is given, report on face FACE in that frame.
+Otherwise report on the defaults for face FACE (for new frames)."
+ (aref (internal-get-face face frame) 7))
+
+
+(defun internat-set-face-1 (face name value index frame)
+  (let ((inhibit-quit t))
+    (if (null frame)
+        (let ((frames (frame-list)))
+          (while frames
+            (internat-set-face-1 (face-name face) name value index (car frames))
+            (setq frames (cdr frames)))
+          (aset (internal-get-face (if (symbolp face) face (face-name face)) t)
+                index value)
+          value)
+      (or (eq frame t)
+          (set-face-attribute-internal (face-id face) name value frame))
+      (aset (internal-get-face face frame) index value))))
+
+
+(defun read-face-name (prompt)
+  (let (face)
+    (while (= (length face) 0)
+      (setq face (completing-read prompt
+                                  (mapcar '(lambda (x) (list (symbol-name x)))
+                                          (list-faces))
+                                  nil t)))
+    (intern face)))
+
+(defun internal-face-interactive (what &optional bool)
+  (let* ((fn (intern (concat "face-" what)))
+         (prompt (concat "Set " what " of face"))
+         (face (read-face-name (concat prompt ": ")))
+         (default (if (fboundp fn)
+                      (or (funcall fn face (selected-frame))
+                          (funcall fn 'default (selected-frame)))))
+         (value (if bool
+                    (y-or-n-p (concat "Should face " (symbol-name face)
+                                      " be " bool "? "))
+                  (read-string (concat prompt " " (symbol-name face) " to: ")
+                               default))))
+    (list face (if (equal value "") nil value))))
+
+
+(defsubst set-face-font (face font &optional frame)
+  "Change the font of face FACE to FONT (a string).
+If the optional FRAME argument is provided, change only
+in that frame; otherwise change each frame."
+  (interactive (internal-face-interactive "font"))
+  (internat-set-face-1 face 'font font 3 frame))
+
+(defsubst set-face-foreground (face color &optional frame)
+  "Change the foreground color of face FACE to COLOR (a string).
+If the optional FRAME argument is provided, change only
+in that frame; otherwise change each frame."
+  (interactive (internal-face-interactive "foreground"))
+  (internat-set-face-1 face 'foreground color 4 frame))
+
+(defsubst set-face-background (face color &optional frame)
+  "Change the background color of face FACE to COLOR (a string).
+If the optional FRAME argument is provided, change only
+in that frame; otherwise change each frame."
+  (interactive (internal-face-interactive "background"))
+  (internat-set-face-1 face 'background color 5 frame))
+
+(defsubst set-face-background-pixmap (face name &optional frame)
+  "Change the background pixmap of face FACE to PIXMAP.
+PIXMAP should be a string, the name of a file of pixmap data.
+The directories listed in the `x-bitmap-file-path' variable are searched.
+
+Alternatively, PIXMAP may be a list of the form (WIDTH HEIGHT DATA)
+where WIDTH and HEIGHT are the size in pixels,
+and DATA is a string, containing the raw bits of the bitmap.  
+
+If the optional FRAME argument is provided, change only
+in that frame; otherwise change each frame."
+  (interactive (internal-face-interactive "background-pixmap"))
+  (internat-set-face-1 face 'background-pixmap name 6 frame))
+
+(defsubst set-face-underline-p (face underline-p &optional frame)
+  "Specify whether face FACE is underlined.  (Yes if UNDERLINE-P is non-nil.)
+If the optional FRAME argument is provided, change only
+in that frame; otherwise change each frame."
+  (interactive (internal-face-interactive "underline-p" "underlined"))
+  (internat-set-face-1 face 'underline underline-p 7 frame))
+
+
+(defun make-face (name)
+  "Define a new FACE on all frames.  
+You can modify the font, color, etc of this face with the set-face- functions.
+If the face already exists, it is unmodified."
+  (or (internal-find-face name)
+      (let ((face (make-vector 8 nil)))
+        (aset face 0 'face)
+        (aset face 1 name)
+        (let* ((frames (frame-list))
+               (inhibit-quit t)
+               (id (internal-next-face-id)))
+          (make-face-internal id)
+          (aset face 2 id)
+          (while frames
+            (set-frame-face-alist (car frames)
+                                  (cons (cons name (copy-sequence face))
+                                        (frame-face-alist (car frames))))
+            (setq frames (cdr frames)))
+          (setq global-face-data (cons (cons name face) global-face-data)))
+        ;; when making a face after frames already exist
+        (if (eq window-system 'x)
+            (make-face-x-resource-internal face))
+        face)))
+
+;; Fill in a face by default based on X resources, for all existing frames.
+;; This has to be done when a new face is made.
+(defun make-face-x-resource-internal (face &optional frame set-anyway)
+  (cond ((null frame)
+         (let ((frames (frame-list)))
+           (while frames
+             (make-face-x-resource-internal (face-name face)
+                                            (car frames) set-anyway)
+             (setq frames (cdr frames)))))
+        (t
+         (setq face (internal-get-face (face-name face) frame))
+         ;;
+         ;; These are things like "attributeForeground" instead of simply
+         ;; "foreground" because people tend to do things like "*foreground",
+         ;; which would cause all faces to be fully qualified, making faces
+         ;; inherit attributes in a non-useful way.  So we've made them slightly
+         ;; less obvious to specify in order to make them work correctly in
+         ;; more random environments.
+         ;;
+         ;; I think these should be called "face.faceForeground" instead of
+         ;; "face.attributeForeground", but they're the way they are for
+         ;; hysterical reasons.
+         ;; 
+         (let* ((name (symbol-name (face-name face)))
+                (fn  (or (x-get-resource (concat name ".attributeFont")
+                                         "Face.AttributeFont")
+                         (and set-anyway (face-font face))))
+                (fg  (or (x-get-resource (concat name ".attributeForeground")
+                                         "Face.AttributeForeground")
+                         (and set-anyway (face-foreground face))))
+                (bg  (or (x-get-resource (concat name ".attributeBackground")
+                                         "Face.AttributeBackground")
+                         (and set-anyway (face-background face))))
+;;              (bgp (or (x-get-resource (concat name ".attributeBackgroundPixmap")
+;;                                       "Face.AttributeBackgroundPixmap")
+;;                       (and set-anyway (face-background-pixmap face))))
+                (ulp (or (x-get-resource (concat name ".attributeUnderline")
+                                         "Face.AttributeUnderline")
+                         (and set-anyway (face-underline-p face))))
+                )
+           (if fn
+               (condition-case ()
+                   (set-face-font face fn frame)
+                 (error (message "font `%s' not found for face `%s'" fn name))))
+           (if fg
+               (condition-case ()
+                   (set-face-foreground face fg frame)
+                 (error (message "color `%s' not allocated for face `%s'" fg name))))
+           (if bg
+               (condition-case ()
+                   (set-face-background face bg frame)
+                 (error (message "color `%s' not allocated for face `%s'" bg name))))
+;;         (if bgp
+;;             (condition-case ()
+;;                 (set-face-background-pixmap face bgp frame)
+;;               (error (message "pixmap `%s' not found for face `%s'" bgp name))))
+           (if (or ulp set-anyway)
+               (set-face-underline-p face ulp frame))
+           )))
+  face)
+
+(defun copy-face (old-face new-name &optional frame)
+  "Define a face just like OLD-FACE, with name NEW-NAME.
+If NEW-NAME already exists as a face, it is modified to be like OLD-FACE.
+If the optional argument FRAME is given, this applies only to that frame.
+Otherwise it applies to each frame separately."
+  (setq old-face (internal-get-face old-face frame))
+  (let* ((inhibit-quit t)
+         (new-face (or (internal-find-face new-name frame)
+                       (make-face new-name))))
+    (if (null frame)
+        (let ((frames (frame-list)))
+          (while frames
+            (copy-face old-face new-name (car frames))
+            (setq frames (cdr frames)))
+          (copy-face old-face new-name t))
+      (set-face-font new-face (face-font old-face frame) frame)
+      (set-face-foreground new-face (face-foreground old-face frame) frame)
+      (set-face-background new-face (face-background old-face frame) frame)
+      (set-face-background-pixmap
+       new-face (face-background-pixmap old-face frame) frame)
+      (set-face-underline-p new-face (face-underline-p old-face frame)
+                            frame))
+    new-face))
+
+(defun face-equal (face1 face2 &optional frame)
+  "True if the faces FACE1 and FACE2 display in the the same way."
+  (setq face1 (internal-get-face face1 frame)
+        face2 (internal-get-face face2 frame))
+  (and (equal (face-foreground face1 frame) (face-foreground face2 frame))
+       (equal (face-background face1 frame) (face-background face2 frame))
+       (equal (face-font face1 frame) (face-font face2 frame))
+       (equal (face-background-pixmap face1 frame)
+              (face-background-pixmap face2 frame))))
+
+(defun face-differs-from-default-p (face &optional frame)
+  "True if face FACE displays differently from the default face, on FRAME.
+A face is considered to be ``the same'' as the default face if it is 
+actually specified in the same way (equivalent fonts, etc) or if it is 
+fully unspecified, and thus inherits the attributes of any face it 
+is displayed on top of."
+  (let ((default (internal-get-face 'default frame)))
+    (setq face (internal-get-face face frame))
+    (not (and (or (equal (face-foreground default frame)
+                         (face-foreground face frame))
+                  (null (face-foreground face frame)))
+              (or (equal (face-background default frame)
+                         (face-background face frame))
+                  (null (face-background face frame)))
+              (or (equal (face-font default frame) (face-font face frame))
+                  (null (face-font face frame)))
+              (or (equal (face-background-pixmap default frame)
+                         (face-background-pixmap face frame))
+                  (null (face-background-pixmap face frame)))
+              (equal (face-underline-p default frame)
+                     (face-underline-p face frame))
+              ))))
+
+
+(defun invert-face (face &optional frame)
+  "Swap the foreground and background colors of face FACE.
+If the face doesn't specify both foreground and background, then
+its foreground and background are set to the background and
+foreground of the default face."
+  (interactive (list (read-face-name "Invert face: ")))
+  (setq face (internal-get-face face frame))
+  (let ((fg (face-foreground face frame))
+        (bg (face-background face frame)))
+    (if (or fg bg)
+        (progn
+          (set-face-foreground face bg frame)
+          (set-face-background face fg frame))
+      (set-face-foreground face (face-background 'default frame) frame)
+      (set-face-background face (face-foreground 'default frame) frame)))
+  face)
+
+
+(defun internal-try-face-font (face font &optional frame)
+  "Like set-face-font, but returns nil on failure instead of an error."
+  (condition-case ()
+      (set-face-font face font frame)
+    (error nil)))
+
+
+(defun set-default-font (font)
+  "Sets the font used for normal text and the modeline to FONT in all frames.
+For finer-grained control, use set-face-font."
+  (interactive (list (read-string "Set default font: "
+                                  (face-font 'default (selected-frame)))))
+  (set-face-font 'default font)
+  (set-face-font 'modeline font))
+
+;; Manipulating font names.
+
+(defconst x-font-regexp nil)
+(defconst x-font-regexp-head nil)
+(defconst x-font-regexp-weight nil)
+(defconst x-font-regexp-slant nil)
+
+;;; Regexps matching font names in "Host Portable Character Representation."
+;;;
+(let ((-                "[-?]")
+      (foundry          "[^-]+")
+      (family           "[^-]+")
+      (weight           "\\(bold\\|demibold\\|medium\\)")               ; 1
+;     (weight\?         "\\(\\*\\|bold\\|demibold\\|medium\\|\\)")      ; 1
+      (weight\?         "\\([^-]*\\)")                                  ; 1
+      (slant            "\\([ior]\\)")                                  ; 2
+;     (slant\?          "\\([ior?*]?\\)")                               ; 2
+      (slant\?          "\\([^-]?\\)")                                  ; 2
+;     (swidth           "\\(\\*\\|normal\\|semicondensed\\|\\)")        ; 3
+      (swidth           "\\([^-]*\\)")                                  ; 3
+;     (adstyle          "\\(\\*\\|sans\\|\\)")                          ; 4
+      (adstyle          "[^-]*")                                        ; 4
+      (pixelsize        "[0-9]+")
+      (pointsize        "[0-9][0-9]+")
+      (resx             "[0-9][0-9]+")
+      (resy             "[0-9][0-9]+")
+      (spacing          "[cmp?*]")
+      (avgwidth         "[0-9]+")
+      (registry         "[^-]+")
+      (encoding         "[^-]+")
+      )
+  (setq x-font-regexp
+        (concat "\\`\\*?[-?*]"
+                foundry - family - weight\? - slant\? - swidth - adstyle -
+                pixelsize - pointsize - resx - resy - spacing - registry -
+                encoding "[-?*]\\*?\\'"
+                ))
+  (setq x-font-regexp-head
+        (concat "\\`[-?*]" foundry - family - weight\? - slant\?
+                "\\([-*?]\\|\\'\\)"))
+  (setq x-font-regexp-slant (concat - slant -))
+  (setq x-font-regexp-weight (concat - weight -))
+  nil)      
+
+(defun x-frob-font-weight (font which)
+  (if (or (string-match x-font-regexp font)
+          (string-match x-font-regexp-head font)
+          (string-match x-font-regexp-weight font))
+      (concat (substring font 0 (match-beginning 1)) which
+              (substring font (match-end 1)))
+    nil))
+
+(defun x-frob-font-slant (font which)
+  (cond ((or (string-match x-font-regexp font)
+             (string-match x-font-regexp-head font))
+         (concat (substring font 0 (match-beginning 2)) which
+                 (substring font (match-end 2))))
+        ((string-match x-font-regexp-slant font)
+         (concat (substring font 0 (match-beginning 1)) which
+                 (substring font (match-end 1))))
+        (t nil)))
+
+
+(defun x-make-font-bold (font)
+  "Given an X font specification, this attempts to make a `bold' version
+of it.  If it fails, it returns nil."
+  (x-frob-font-weight font "bold"))
+
+(defun x-make-font-demibold (font)
+  "Given an X font specification, this attempts to make a `demibold' version
+of it.  If it fails, it returns nil."
+  (x-frob-font-weight font "demibold"))
+
+(defun x-make-font-unbold (font)
+  "Given an X font specification, this attempts to make a non-bold version
+of it.  If it fails, it returns nil."
+  (x-frob-font-weight font "medium"))
+
+(defun x-make-font-italic (font)
+  "Given an X font specification, this attempts to make an `italic' version
+of it.  If it fails, it returns nil."
+  (x-frob-font-slant font "i"))
+
+(defun x-make-font-oblique (font) ; you say tomayto...
+  "Given an X font specification, this attempts to make an `italic' version
+of it.  If it fails, it returns nil."
+  (x-frob-font-slant font "o"))
+
+(defun x-make-font-unitalic (font)
+  "Given an X font specification, this attempts to make a non-italic version
+of it.  If it fails, it returns nil."
+  (x-frob-font-slant font "r"))
+
+
+;;; non-X-specific interface
+
+(defun make-face-bold (face &optional frame)
+  "Make the font of the given face be bold, if possible.  
+Returns nil on failure."
+  (interactive (list (read-face-name "Make which face bold: ")))
+  (let ((ofont (face-font face frame)))
+    (if (null frame)
+        (let ((frames (frame-list)))
+          (while frames
+            (make-face-bold face (car frames))
+            (setq frames (cdr frames))))
+      (setq face (internal-get-face face frame))
+      (let ((font (or (face-font face frame)
+                      (face-font face t)
+                      (face-font 'default frame)))
+            f2)
+        (or (and (setq f2 (x-make-font-bold font))
+                 (try-face-font face f2))
+            (and (setq f2 (x-make-font-demibold font))
+                 (try-face-font face f2)))))
+    (not (equal ofont (face-font face)))))
+
+(defun make-face-italic (face &optional frame)
+  "Make the font of the given face be italic, if possible.  
+Returns nil on failure."
+  (interactive (list (read-face-name "Make which face italic: ")))
+  (let ((ofont (face-font face frame)))
+    (if (null frame)
+        (let ((frames (frame-list)))
+          (while frames
+            (make-face-italic face (car frames))
+            (setq frames (cdr frames))))
+      (setq face (internal-get-face face frame))
+      (let ((font (or (face-font face frame)
+                      (face-font face t)
+                      (face-font 'default frame)))
+            f2)
+        (or (and (setq f2 (x-make-font-italic font))
+                 (try-face-font face f2))
+            (and (setq f2 (x-make-font-oblique font))
+                 (try-face-font face f2)))))
+    (not (equal ofont (face-font face)))))
+
+(defun make-face-bold-italic (face &optional frame)
+  "Make the font of the given face be bold and italic, if possible.  
+Returns nil on failure."
+  (interactive (list (read-face-name "Make which face bold-italic: ")))
+  (let ((ofont (face-font face frame)))
+    (if (null frame)
+        (let ((frames (frame-list)))
+          (while frames
+            (make-face-bold-italic face (car frames))
+            (setq frames (cdr frames))))
+      (setq face (internal-get-face face frame))
+      (let ((font (or (face-font face frame)
+                      (face-font face t)
+                      (face-font 'default frame)))
+            f2 f3)
+        (or (and (setq f2 (x-make-font-italic font))
+                 (not (equal font f2))
+                 (setq f3 (x-make-font-bold f2))
+                 (not (equal f2 f3))
+                 (try-face-font face f3))
+            (and (setq f2 (x-make-font-oblique font))
+                 (not (equal font f2))
+                 (setq f3 (x-make-font-bold f2))
+                 (not (equal f2 f3))
+                 (try-face-font face f3))
+            (and (setq f2 (x-make-font-italic font))
+                 (not (equal font f2))
+                 (setq f3 (x-make-font-demibold f2))
+                 (not (equal f2 f3))
+                 (try-face-font face f3))
+            (and (setq f2 (x-make-font-oblique font))
+                 (not (equal font f2))
+                 (setq f3 (x-make-font-demibold f2))
+                 (not (equal f2 f3))
+                 (try-face-font face f3)))))
+    (not (equal ofont (face-font face frame)))))
+
+(defun make-face-unbold (face &optional frame)
+  "Make the font of the given face be non-bold, if possible.  
+Returns nil on failure."
+  (interactive (list (read-face-name "Make which face non-bold: ")))
+  (let ((ofont (face-font face frame)))
+    (if (null frame)
+        (let ((frames (frame-list)))
+          (while frames
+            (make-face-unbold face (car frames))
+            (setq frames (cdr frames))))
+      (setq face (internal-get-face face frame))
+      (let ((font (x-make-font-unbold
+                   (or (face-font face frame)
+                       (face-font face t)
+                       (face-font 'default frame)))))
+        (if font (try-face-font face font))))
+    (not (equal ofont (face-font face frame)))))
+
+(defun make-face-unitalic (face &optional frame)
+  "Make the font of the given face be non-italic, if possible.  
+Returns nil on failure."
+  (interactive (list (read-face-name "Make which face non-italic: ")))
+  (let ((ofont (face-font face frame)))
+    (if (null frame)
+        (let ((frames (frame-list)))
+          (while frames
+            (make-face-unitalic face (car frames))
+            (setq frames (cdr frames))))
+      (setq face (internal-get-face face frame))
+      (let ((font (x-make-font-unitalic
+                   (or (face-font face frame)
+                       (face-font face t)
+                       (face-font 'default frame)))))
+        (if font (try-face-font face font))))
+    (not (equal ofont (face-font face frame)))))
+
+
+
+
+;;; Make the builtin faces; the C code knows these as faces 0, 1, and 2,
+;;; respectively, so they must be the first three faces made.
+
+(if (internal-find-face 'default)
+    nil
+  (make-face 'default)
+  (make-face 'modeline)
+  (make-face 'highlight)
+  ;;
+  ;; These aren't really special in any way, but they're nice to have around.
+  ;; The X-specific code is clever at them.
+  ;;
+  (make-face 'bold)
+  (make-face 'italic)
+  (make-face 'bold-italic)
+  (make-face 'primary-selection)
+  (make-face 'secondary-selection))
+
+;;; This really belongs in setting a frame's own font.
+;;;     ;;
+;;;     ;; No font specified in the resource database; try to cope.
+;;;     ;;
+;;;     (internal-try-face-font default "-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*"
+;;;                          frame)
+;;;     (internal-try-face-font default "-*-courier-*-r-*-*-*-120-*-*-*-*-iso8859-*"
+;;;                          frame)
+;;;     (internal-try-face-font default "-*-*-medium-r-*-*-*-120-*-*-m-*-iso8859-*" frame)
+;;;     (internal-try-face-font default "-*-*-medium-r-*-*-*-120-*-*-c-*-iso8859-*" frame)
+;;;     (internal-try-face-font default "-*-*-*-r-*-*-*-120-*-*-m-*-iso8859-*" frame)
+;;;     (internal-try-face-font default "-*-*-*-r-*-*-*-120-*-*-c-*-iso8859-*" frame)
+;;;     (internal-try-face-font default "-*-*-*-r-*-*-*-120-*-*-*-*-iso8859-*" frame)
+
+
+;;; This is called from make-screen-initial-faces to make sure that the
+;;; "default" and "modeline" faces for this screen have enough attributes
+;;; specified for emacs to be able to display anything on it.  This had
+;;; better not signal an error.
+;;;
+(defun x-initialize-frame-faces (frame)
+  (or (face-differs-from-default-p 'bold frame)
+      (make-face-bold 'bold frame)
+      ;; if default font is bold, then make the `bold' face be unbold.
+      (make-face-unbold 'bold frame)
+      ;; otherwise the luser specified one of the bogus font names
+      (internal-x-complain-about-font 'bold)
+      )
+
+  (or (face-differs-from-default-p 'italic frame)
+      (make-face-italic 'italic frame)
+      (progn
+        (make-face-bold 'italic frame)
+        (internal-x-complain-about-font 'italic))
+      )
+
+  (or (face-differs-from-default-p 'bold-italic frame)
+      (make-face-bold-italic 'bold-italic frame)
+      ;; if we couldn't get a bold-italic version, try just bold.
+      (make-face-bold 'bold-italic frame)
+      ;; if we couldn't get bold or bold-italic, then that's probably because
+      ;; the default font is bold, so make the `bold-italic' face be unbold.
+      (and (make-face-unbold 'bold-italic frame)
+           (make-face-italic 'bold-italic frame))
+      ;; if that didn't work, try italic (can this ever happen? what the hell.)
+      (progn
+        (make-face-italic 'bold-italic frame)
+        ;; then bitch and moan.
+        (internal-x-complain-about-font 'bold-italic))
+      )
+
+  (or (face-differs-from-default-p 'highlight frame)
+      (condition-case ()
+          (if (x-display-color-p)
+              (condition-case ()
+                  (set-face-background 'highlight "darkseagreen2" frame)
+                (error (set-face-background 'highlight "green" frame)))
+            (set-face-background-pixmap 'highlight "gray1" frame)
+            )
+        (error (invert-face 'highlight frame))))
+
+  (or (face-differs-from-default-p 'primary-selection frame)
+      (condition-case ()
+          (if (x-display-color-p)
+              (set-face-background 'primary-selection "gray" frame)
+            (set-face-background-pixmap 'primary-selection "gray3" frame)
+            )
+        (error (invert-face 'primary-selection frame))))
+
+  (or (face-differs-from-default-p 'secondary-selection frame)
+      (condition-case ()
+          (if (x-display-color-p)
+              (condition-case ()
+                  ;; some older X servers don't have this one.
+                  (set-face-background 'secondary-selection "paleturquoise"
+                                       frame)
+                (error
+                 (set-face-background 'secondary-selection "green" frame)))
+            (set-face-background-pixmap 'secondary-selection "gray1" frame)
+            )
+        (error (invert-face 'secondary-selection frame))))
+
+  (or (face-differs-from-default-p 'isearch frame)
+      (if (x-display-color-p)
+          (condition-case ()
+              (set-face-background 'isearch "paleturquoise" frame)
+            (error
+             (condition-case ()
+                 (set-face-background 'isearch "green" frame)
+               (error nil))))
+        nil)
+      (make-face-bold 'isearch frame)
+      ;; if default font is bold, then make the `isearch' face be unbold.
+      (make-face-unbold 'isearch frame))
+  ))
+
+(defun internal-x-complain-about-font (face)
+  (if (symbolp face) (setq face (symbol-name face)))
+  (message "%s: couldn't deduce %s %s version of %S\n"
+           invocation-name
+           (if (string-match "\\`[aeiouAEIOU]" face) "an" "a")
+           face
+           (face-font 'default))
+  (sit-for 1))
+
+;; Like x-create-frame but also set up the faces.
+
+(defun x-create-frame-with-faces (&optional parameters)
+  (let* ((frame (x-create-frame parameters))
+         (faces (copy-alist global-face-data))
+         (rest faces)
+         default modeline)
+    (set-frame-face-alist frame faces)
+
+    ;; Copy the vectors that represent the faces.
+    ;; Also fill them in from X resources.
+    (while rest
+      (setcdr (car rest) (copy-sequence (cdr (car rest))))
+      (make-face-x-resource-intenal (cdr (car rest)) frame t)
+      (setq rest (cdr rest)))
+
+    (setq default (internal-get-face 'default frame)
+          modeline (internal-get-face 'modeline frame))
+        
+    (x-initialize-frame-faces frame)
+
+    ;; Make sure the modeline face is fully qualified.
+    (if (and (not (face-font modeline frame)) (face-font default frame))
+        (set-face-font modeline (face-font default frame) frame))
+    (if (and (not (face-background modeline frame))
+             (face-background default frame))
+        (set-face-background modeline (face-background default frame) frame))
+    (if (and (not (face-foreground modeline frame))
+             (face-foreground default frame))
+        (set-face-foreground modeline (face-foreground default frame) frame))
+    frame))
+
+(setq frame-creation-function 'x-create-frame-with-faces)
+
+;; Set up the faces of all existing frames.
+(let ((frames (frame-list)))
+  (while frames
+    (x-initialize-frame-faces (car frames))
+    (setq frames (cdr frames))))
+
+;;; faces.el ends here
diff --git a/lisp/help-macro.el b/lisp/help-macro.el
new file mode 100644
index 00000000000..fa8bf07e62e
--- /dev/null
+++ b/lisp/help-macro.el
@@ -0,0 +1,108 @@
+;;; help-screen.el --- Makes command line help such as help-for-help
+
+;; Copyright (C) 1993 Free Software Foundation, Inc.
+
+;; Author: Lynn Slater <lrs@indetech.com>
+;; Created: : Mon Oct  1 11:42:39 1990
+;; Adapted-By: ESR
+;; Last Modified By: Lynn Slater x2048
+;; Last Modified On: Mon Sep 23 14:40:19 1991
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to
+;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+
+;;; Commentary:
+;;
+;;      This file supplies the macro make-help-screen which constructs
+;; single character dispatching with browsable help such as that provided
+;; by help-for-help. This can be used to make many modes easier to use; for
+;; example, the Gnu Emacs Empire Tool uses this for every "nested" mode map
+;; called from the main mode map.
+
+;;-> ***********************  Example of use *********************************
+
+;;->(make-help-screen help-for-empire-redistribute-map
+;;->              "c:civ m:mil p:population f:food ?"
+;;->              "You have discovered the GEET redistribution commands
+;;->   From here, you can use the following options:
+;;->
+;;->c   Redistribute civs from overfull sectors into connected underfull ones
+;;->      The functions typically named by empire-ideal-civ-fcn control
+;;->          based in part on empire-sector-civ-threshold  
+;;->m   Redistribute military using levels given by empire-ideal-mil-fcn
+;;->p   Redistribute excess population to highways for max pop growth
+;;->      Excess is any sector so full babies will not be born.
+;;->f   Even out food on highways to highway min and leave levels
+;;->      This is good to pump max food to all warehouses/dist pts
+;;->
+;;->
+;;->Use \\[help-for-empire-redistribute-map] for help on redistribution.
+;;->Use \\[help-for-empire-extract-map] for help on data extraction.
+;;->Please use \\[describe-key] to find out more about any of the other keys."
+;;->              empire-shell-redistribute-map)
+
+;;->  (define-key c-mp "\C-h" 'help-for-empire-redistribute-map)
+;;->  (define-key c-mp help-character 'help-for-empire-redistribute-map)
+
+;;; Change Log:
+;;
+;; 22-Jan-1991          Lynn Slater x2048       
+;;    Last Modified: Mon Oct  1 11:43:52 1990 #3 (Lynn Slater)
+;;    documented better
+
+;;; Code:
+
+(provide 'help-screen)
+(require 'backquote)
+
+(defmacro make-help-screen (fname help-line help-text helped-map)
+  "Constructs function FNAME that when invoked shows HELP-LINE and if a help
+character is requested, shows HELP-TEXT. The user is prompted for a character
+from the HELPED-MAP and the corresponding interactive function is executed."
+  (` (defun (, fname) ()
+           (, help-text)
+           (interactive)
+           (let ((line-prompt
+                  (substitute-command-keys (, help-line))))
+             (message line-prompt)
+             (let ((char (read-char)))
+               (if (or (= char ??) (= char help-char))
+                   (save-window-excursion
+                     (switch-to-buffer-other-window "*Help*")
+                     (erase-buffer)
+                     (insert (documentation (quote (, fname))))
+                     (goto-char (point-min))
+                     (while (memq char (cons help-char '(?? ?\C-v ?\ ?\177 ?\M-v)))
+                       (if (memq char '(?\C-v ?\ ))
+                           (scroll-up))
+                       (if (memq char '(?\177 ?\M-v))
+                           (scroll-down))
+                       (message "%s%s: "
+                                line-prompt
+                                (if (pos-visible-in-window-p (point-max))
+                                    "" " or Space to scroll"))
+                       (let ((cursor-in-echo-area t))
+                         (setq char (read-char))))))
+               (let ((defn (cdr (assq (downcase char) (, helped-map)))))
+                 (if defn
+                     (if (keymapp defn)
+                         (error "sorry, this command cannot be run from the help screen. Start over.")
+                       (call-interactively defn))
+                   (ding))))))
+     ))
+
+;;; help-screen.el
+