No commit message

No commit message

src/ChangeLog

+Tue Mar 11 11:35:35 1997  David Byers  <davby@sen21.ida.liu.se>
+
+	* lyskom-rest.el (lyskom-face-default-p): Skrev s den fungerar i
+ 	XEmacs.
+
+Mon Mar 10 16:42:18 1997  David Byers  <davby@sen21.ida.liu.se>
+
+	* option-edit.el (lyskom-custom-variables): Bytte ut
+ 	lyskom-ding-on-no-subject mot kom-ding-on-no-subject.
+
+	* swedish-strings.el (lyskom-custom-strings): Uppdaterade strngar
+ 	fr customize.
+
+	* vars.el.in (kom-show-author-at-end): Ny variabel.
+	Flyttade om lite definitioner.
+	(lyskom-commands): Lade till kom-customize
+
+Mon Mar 10 16:19:29 1997  David Byers  <davby@sen22.ida.liu.se>
+
+	* view-text.el (lyskom-print-text): Skriv ut frfattaren i slutet
+ 	av texten om kom-show-author-at-end r satt till t.
+
+Sat Mar  8 16:46:54 1997  David Byers  <davby@sen22.ida.liu.se>
+
+	* defvar.el (def-kom-var): Hantera medlemmar i lyskom-global-boolean-a
+
+	* edit-text.el (lyskom-edit-send): Anvnd kom-ding-on-no-subject.
+
+	* vars.el.in (kom-ding-on-no-subject): Bytte namn frn
+ 	lyskom-ding-on-no-subject.
+
 Sat Mar  8 03:55:07 1997  David Kgedal  <davidk@lysator.liu.se>
 
 	* commands2.el (lyskom-list-summary): Gr (sit-for 0).
 
+Fri Mar  7 10:40:35 1997  David Byers  <davby@sen22.ida.liu.se>
+
+	* edit-text.el (lyskom-edit-send-check-recipients): Hackade om
+ 	kommentarskontrollen. Tog bort lyskom-add-comments-list.
+
+	* view-text.el (lyskom-text-read-at-least-once-p): Ny funktion.
+
+Thu Mar  6 13:43:42 1997  David Byers  <davby@sen22.ida.liu.se>
+
+	* edit-text.el (lyskom-edit-send-check-recipients): Kontrollera
+ 	kommenterade texter fr nya kommentarer. Anvnd
+ 	lyskom-symbol-value p rtt stllen.
+	(lyskom-dispatch-edit-text): Hll reda p vilka kommentarer som
+ 	finns till den kommenterade texten.
+	(lyskom-edit-add-comments-list): Ny funktion.
+	(top level): Tog bord lyskom-is-dedicated-edit-window
+
+	* vars.el.in (kom-check-for-new-comments): Ny variabel.
+
+	* english-strings.el, swedish-strings.el (lyskom-message): Lade
+ 	till texter fr kontroll av kommentarer.
+
 Wed Mar  5 17:22:48 1997  David Kgedal  <davidk@lysator.liu.se>
 
 	* commands1.el (lyskom-get-recipients-from-misc-list): Ny
@@ -9,6 +62,13 @@ Wed Mar  5 17:22:48 1997  David K
 	(lyskom-change-pres-or-motd-2): Anvnd samma mottagare som den
  	frra presentationen som default.
 
+Wed Mar  5 15:10:38 1997  David Byers  <davby@sen22.ida.liu.se>
+
+	* edit-text.el (lyskom-dispatch-edit-text): Tog bort
+ 	process-kill-qithout-query.
+
+	* buffers.el (lyskom-quit-query): Ny funktion.
+
 Mon Mar  3 20:43:28 1997  David Kgedal  <kg@infovav.se>
 
 	* compatibility.el (lyskom-gnu-keysym): Anvnd tecken istllet fr
@@ -20,6 +80,10 @@ Sat Mar  1 10:55:04 1997  David K
  	p kom-pop-personal-messages och se till att meddelande-bufferten
  	scrollar till slutet.
 
+Fri Feb 28 14:45:04 1997  David Byers  <davby@sen22.ida.liu.se>
+
+	* utilities.el (functionp): Ny definition.
+
 Sat Feb 22 13:54:02 1997  David Kgedal  <davidk@lysator.liu.se>
 
 	* lyskom-rest.el (lyskom-wait-for-membership): La till (sit-for 0).

src/TODO

@@ -4,10 +4,6 @@ Att g
 
 -------- Buggar
 
-    Trycka C-g medan man loggar in kan göra att man inte kan logga in
-    igen. (Rapporterat av Tommy Persson.) Felmeddelandet blir "Illegal
-    nånting: listp not-yet-gotten"
-
     När man har utplånat sig själv, och tryckt C-g vid loginprompten
     som följer blir vissa kommandon förvirrade. [ÄR MAN SÅ DUM FÅR MAN
     VÄL SKYLLA SIG SJÄLV. JU!]
@@ -78,7 +74,8 @@ Att g
 
 -------- Allmänna förbättringar
 
-Visa i prompten om man är i administratörsläge.
+    Färgläggning av meddelanden baserat på varifrån de kommer, och
+    vart det går. John Olsson efterfrågar.
 
     1385671
 
@@ -106,9 +103,6 @@ Visa i prompten om man
 
     Sortera vilkaslistan efter t.ex. idletid.
     
-    När man skickar in en kommentar borde klienten kolla att inga nya
-    kommentarer till texten har skrivits under tiden.
-
     Inför en membership-cache.
 
     Skriv inte ut stora fonoter på en gång.
@@ -131,6 +125,17 @@ Visa i prompten om man
 
     Reentrant blocking-do
 
+    kom-customize skall nog inte ta med alla variabler, bara sådana
+    som många vill ändra på. Annars blir det svåröverskådligt.
+
+    Det behövs dokumentation: fråmst användarhandledning, men det
+    skulle inte skada med en kortfattad beskrivning av stabila delar
+    av systemet för presumtiva kommandoskribenter.
+
+    Den engelska översättningen behöver ses över. Den är garanterat ur
+    sync, och verktyget för att kolla den fungerar inte längre.
+    Verktyget måste repareras så vi kan kolla att alla strängar finns
+    på plats, men en språkgranskning behövs också.
 
 -------- Fixade saker
 
@@ -242,3 +247,12 @@ Visa i prompten om man
     Läsningen av user-arean buggade i XEmacs av någon anledning. Det
     såg ut som en XEmacs-bug. Jag *tror* jag har gjort en workaround.
 
+    När man skickar in en kommentar borde klienten kolla att inga nya
+    kommentarer till texten har skrivits under tiden. [FIXAT]
+
+    Trycka C-g medan man loggar in kan göra att man inte kan logga in
+    igen. (Rapporterat av Tommy Persson.) Felmeddelandet blir "Illegal
+    nånting: listp not-yet-gotten"
+
+    Visa i prompten om man är i administratörsläge.
+

src/buffers.el

@@ -234,6 +234,21 @@ categories")
                                          'lyskom-associated-buffer-list)))))))
 
 
+(defun lyskom-quit-query ()
+  (if (and (boundp 'lyskom-buffer)
+           (local-variable-p 'lyskom-buffer (current-buffer))
+             (eq lyskom-buffer (current-buffer))
+             (lyskom-buffers-of-category 'write-texts))
+    (unwind-protect
+        (progn
+          (display-buffer (car (lyskom-buffers-of-category 'write-texts)))
+          (lyskom-ja-or-nej-p (lyskom-get-string 'quit-in-spite-of-unsent)))
+      nil)
+    t))
+
+(add-hook 'kill-buffer-query-functions 'lyskom-quit-query)
+(add-hook 'kill-emacs-query-functions 'lyskom-quit-query)
+
 (defun lyskom-get-buffer-create (category name &optional unique)
   "Create a new buffer of category CATEGORY with name generated from NAME. 
 If UNIQUE is non-nil, re-use the first existing buffer of category

src/cus-face.el

+;;; cus-face.el -- XEmacs specific custom support.
+;;
+;; Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+;;
+;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
+;; Keywords: help, faces
+;; Version: 1.61
+;; X-URL: http://www.dina.kvl.dk/~abraham/custom/
+
+;;; Commentary:
+;;
+;; See `custom.el'.
+
+;;; Code:
+
+(require 'custom)
+
+(eval-and-compile (require 'cl))
+
+;;; Compatibility.
+
+(eval-and-compile
+  (unless (fboundp 'frame-property)
+    ;; XEmacs function missing in Emacs 19.34.
+    (defun frame-property (frame property &optional default)
+      "Return FRAME's value for property PROPERTY."
+      (or (cdr (assq property (frame-parameters frame)))
+	  default)))
+
+  (unless (fboundp 'face-doc-string)
+    ;; XEmacs function missing in Emacs.
+    (defun face-doc-string (face)
+      "Get the documentation string for FACE."
+      (get face 'face-doc-string)))
+
+  (unless (fboundp 'set-face-doc-string)
+    ;; XEmacs function missing in Emacs.
+    (defun set-face-doc-string (face string)
+      "Set the documentation string for FACE to STRING."
+      (put face 'face-doc-string string))))
+
+(unless (fboundp 'x-color-values)
+  ;; Emacs function missing in XEmacs 19.14.
+  (defun x-color-values  (color &optional frame)
+    "Return a description of the color named COLOR on frame FRAME.
+The value is a list of integer RGB values--(RED GREEN BLUE).
+These values appear to range from 0 to 65280 or 65535, depending
+on the system; white is (65280 65280 65280) or (65535 65535 65535).
+If FRAME is omitted or nil, use the selected frame."
+    (color-instance-rgb-components (make-color-instance color))))
+
+;; XEmacs and Emacs have different definitions of `facep'.  
+;; The Emacs definition is the useful one, so emulate that. 
+(cond ((not (fboundp 'facep))
+       (defun custom-facep (face) 
+	 "No faces"
+	 nil))
+      ((string-match "XEmacs" emacs-version)
+       (defalias 'custom-facep 'find-face))
+      (t
+       (defalias 'custom-facep 'facep)))
+
+(unless (fboundp 'make-empty-face)
+  ;; This should be moved to `faces.el'.
+  (if (string-match "XEmacs" emacs-version)
+      ;; Give up for old XEmacs pre 19.15/20.1.
+      (defalias 'make-empty-face 'make-face)
+    ;; Define for Emacs pre 19.35.
+    (defun make-empty-face (name)
+      "Define a new FACE on all frames, ignoring X resources."
+      (interactive "SMake face: ")
+      (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)))
+	    ;; add to menu
+	    (if (fboundp 'facemenu-add-new-face)
+		(facemenu-add-new-face name))
+	    face))
+      name)))
+
+(defcustom initialize-face-resources t
+  "If non nil, allow X resources to initialize face properties.
+This only affects faces declared with `defface', and only NT or X11 frames."
+  :group 'customize
+  :type 'boolean)
+
+(cond ((fboundp 'initialize-face-resources)
+       ;; Already bound, do nothing.
+       )
+      ((fboundp 'make-face-x-resource-internal)
+       ;; Emacs or new XEmacs.
+       (defun initialize-face-resources (face &optional frame)
+	 "Initialize face according to the X11 resources.
+This might overwrite existing face properties.
+Does nothing when the variable initialize-face-resources is nil."
+	 (when initialize-face-resources
+	   (make-face-x-resource-internal face frame t))))
+      (t 
+       ;; Too hard to do right on XEmacs.
+       (defalias 'initialize-face-resources 'ignore)))
+
+(if (string-match "XEmacs" emacs-version)
+    ;; Xemacs.
+    (defun custom-invert-face (face &optional frame)
+      "Swap the foreground and background colors of face FACE.
+If the colors are not specified in the face, use the default colors."
+      (interactive (list (read-face-name "Reverse face: ")))
+      (let ((fg (color-name (face-foreground face frame) frame))
+	    (bg (color-name (face-background face frame) frame)))
+	(set-face-foreground face bg frame)
+	(set-face-background face fg frame)))
+  ;; Emacs.
+  (defun custom-invert-face (face &optional frame)
+    "Swap the foreground and background colors of face FACE.
+If the colors are not specified in the face, use the default colors."
+    (interactive (list (read-face-name "Reverse face: ")))
+    (let ((fg (or (face-foreground face frame)
+		  (face-foreground 'default frame)
+		  (frame-property (or frame (selected-frame))
+				  'foreground-color)
+		  "black"))
+	  (bg (or (face-background face frame)
+		  (face-background 'default frame)
+		  (frame-property (or frame (selected-frame))
+				  'background-color)
+		  "white")))
+      (set-face-foreground face bg frame)
+      (set-face-background face fg frame))))
+
+(defcustom custom-background-mode nil
+  "The brightness of the background.
+Set this to the symbol dark if your background color is dark, light if
+your background is light, or nil (default) if you want Emacs to
+examine the brightness for you."
+  :group 'customize
+  :type '(choice (choice-item dark) 
+		 (choice-item light)
+		 (choice-item :tag "default" nil)))
+
+(defun custom-background-mode (frame)
+  "Kludge to detect background mode for FRAME."
+  (let* ((bg-resource 
+	  (condition-case ()
+	      (x-get-resource ".backgroundMode" "BackgroundMode" 'string)
+	    (error nil)))
+	 color
+	 (mode (cond (bg-resource
+		      (intern (downcase bg-resource)))
+		     ((and (setq color (condition-case ()
+					   (or (frame-property
+						frame
+						'background-color)
+					       (color-instance-name
+						(specifier-instance
+						 (face-background 'default))))
+					 (error nil)))
+			   (or (string-match "XEmacs" emacs-version)
+			       window-system)
+			   (< (apply '+ (x-color-values color))
+			      (/ (apply '+ (x-color-values "white"))
+				 3)))
+		      'dark)
+		     (t 'light))))
+    (modify-frame-parameters frame (list (cons 'background-mode mode)))
+    mode))
+
+(eval-and-compile
+  (if (string-match "XEmacs" emacs-version)
+      ;; XEmacs.
+      (defun custom-extract-frame-properties (frame)
+	"Return a plist with the frame properties of FRAME used by custom."
+	(list 'type (device-type (frame-device frame))
+	      'class (device-class (frame-device frame))
+	      'background (or custom-background-mode
+			      (frame-property frame
+					      'background-mode)
+			      (custom-background-mode frame))))
+    ;; Emacs.
+    (defun custom-extract-frame-properties (frame)
+      "Return a plist with the frame properties of FRAME used by custom."
+      (list 'type window-system
+	    'class (frame-property frame 'display-type)
+	    'background (or custom-background-mode
+			    (frame-property frame 'background-mode)
+			    (custom-background-mode frame))))))  
+
+;;; Declaring a face.
+
+;;;###autoload
+(defun custom-declare-face (face spec doc &rest args)
+  "Like `defface', but FACE is evaluated as a normal argument."
+  (when (fboundp 'load-gc)
+    ;; This should be allowed, somehow.
+    (error "Attempt to declare a face during dump"))
+  (unless (get face 'factory-face)
+    (put face 'factory-face spec)
+    (when (fboundp 'facep)
+      (unless (custom-facep face)
+	;; If the user has already created the face, respect that.
+	(let ((value (or (get face 'saved-face) spec))
+	      (frames (custom-relevant-frames))
+	      frame)
+	  ;; Create global face.
+	  (make-empty-face face)
+	  (custom-face-display-set face value)
+	  ;; Create frame local faces
+	  (while frames
+	    (setq frame (car frames)
+		  frames (cdr frames))
+	    (custom-face-display-set face value frame))
+	  (initialize-face-resources face))))
+    (when (and doc (null (face-doc-string face)))
+      (set-face-doc-string face doc))
+    (custom-handle-all-keywords face args 'custom-face)
+    (run-hooks 'custom-define-hook))
+  face)
+
+;;; Font Attributes.
+
+(defconst custom-face-attributes
+  '((:bold (toggle :format "Bold: %[%v%]\n"
+		   :help-echo "Control whether a bold font should be used.")
+	   custom-set-face-bold)
+    (:italic (toggle :format "Italic: %[%v%]\n"
+		     :help-echo "\
+Control whether an italic font should be used.")
+	     custom-set-face-italic)
+    (:underline (toggle :format "Underline: %[%v%]\n"
+			:help-echo "\
+Control whether the text should be underlined.")
+		set-face-underline-p)
+    (:foreground (color :tag "Foreground"
+			:value "black"
+			:help-echo "Set foreground color.")
+		 set-face-foreground)
+    (:background (color :tag "Background"
+			:value "white"
+			:help-echo "Set background color.")
+		 set-face-background)
+    (:invert (const :format "Invert Face\n" 
+		    :sibling-args (:help-echo "\
+Reverse the foreground and background color.
+If you haven't specified them for the face, the default colors will be used.")
+		    t)
+	     (lambda (face value &optional frame)
+	       ;; We don't use VALUE.
+	       (custom-invert-face face frame)))
+    (:stipple (editable-field :format "Stipple: %v"
+			      :help-echo "Name of background bitmap file.")
+	      set-face-stipple))
+  "Alist of face attributes. 
+
+The elements are of the form (KEY TYPE SET) where KEY is a symbol
+identifying the attribute, TYPE is a widget type for editing the
+attibute, SET is a function for setting the attribute value.
+
+The SET function should take three arguments, the face to modify, the
+value of the attribute, and optionally the frame where the face should
+be changed.")
+
+(defun custom-face-attributes-set (face frame &rest atts)
+  "For FACE on FRAME set the attributes [KEYWORD VALUE]....
+Each keyword should be listed in `custom-face-attributes'.
+
+If FRAME is nil, set the default face."
+  (while atts 
+    (let* ((name (nth 0 atts))
+	   (value (nth 1 atts))
+	   (fun (nth 2 (assq name custom-face-attributes))))
+      (setq atts (cdr (cdr atts)))
+      (condition-case nil
+	  (funcall fun face value frame)
+	(error nil)))))
+
+(defun custom-set-face-bold (face value &optional frame)
+  "Set the bold property of FACE to VALUE."
+  (if value
+      (make-face-bold face frame)
+    (make-face-unbold face frame)))
+
+(defun custom-set-face-italic (face value &optional frame)
+  "Set the italic property of FACE to VALUE."
+  (if value
+      (make-face-italic face frame)
+    (make-face-unitalic face frame)))
+
+(when (string-match "XEmacs" emacs-version)
+  ;; Support for special XEmacs font attributes.
+  (autoload 'font-create-object "font" nil)
+
+  (unless (fboundp 'face-font-name)
+    (defun face-font-name (face &rest args)
+      (apply 'face-font face args)))
+
+  (defun custom-set-face-font-size (face size &rest args)
+    "Set the font of FACE to SIZE"
+    (let* ((font (apply 'face-font-name face args))
+	   (fontobj (font-create-object font)))
+      (set-font-size fontobj size)
+      (apply 'set-face-font face fontobj args)))
+
+  (defun custom-set-face-font-family (face family &rest args)
+    "Set the font of FACE to FAMILY"
+    (let* ((font (apply 'face-font-name face args))
+	   (fontobj (font-create-object font)))
+      (set-font-family fontobj family)
+      (apply 'set-face-font face fontobj args)))
+
+  (nconc custom-face-attributes
+	 '((:family (editable-field :format "Font Family: %v"
+				    :help-echo "\
+Name of font family to use (e.g. times).") 
+		    custom-set-face-font-family)
+	   (:size (editable-field :format "Size: %v"
+				  :help-echo "\
+Text size (e.g. 9pt or 2mm).")
+		  custom-set-face-font-size))))
+
+;;; Frames.
+
+(defun custom-face-display-set (face spec &optional frame)
+  "Set FACE to the attributes to the first matching entry in SPEC.
+Iff optional FRAME is non-nil, set it for that frame only.
+See `defface' for information about SPEC."
+  (when (fboundp 'make-face)
+    (while spec 
+      (let* ((entry (car spec))
+	     (display (nth 0 entry))
+	     (atts (nth 1 entry)))
+	(setq spec (cdr spec))
+	(when (custom-display-match-frame display frame)
+	  ;; Avoid creating frame local duplicates of the global face.
+	  (unless (and frame (eq display (get face 'custom-face-display)))
+	    (apply 'custom-face-attributes-set face frame atts))
+	  (unless frame
+	    (put face 'custom-face-display display))
+	  (setq spec nil))))))
+
+(defvar custom-default-frame-properties nil
+  "The frame properties used for the global faces.
+Frames who doesn't match these propertiess should have frame local faces.
+The value should be nil, if uninitialized, or a plist otherwise.  
+See `defface' for a list of valid keys and values for the plist.")
+
+(defun custom-get-frame-properties (&optional frame)
+  "Return a plist with the frame properties of FRAME used by custom.
+If FRAME is nil, return the default frame properties."
+  (cond (frame
+	 ;; Try to get from cache.
+	 (let ((cache (frame-property frame 'custom-properties)))
+	   (unless cache
+	     ;; Oh well, get it then.
+	     (setq cache (custom-extract-frame-properties frame))
+	     ;; and cache it...
+	     (modify-frame-parameters frame 
+				      (list (cons 'custom-properties cache))))
+	   cache))
+	(custom-default-frame-properties)
+	(t
+	 (setq custom-default-frame-properties
+	       (custom-extract-frame-properties (selected-frame))))))
+
+(defun custom-display-match-frame (display frame)
+  "Non-nil iff DISPLAY matches FRAME.
+If FRAME is nil, the current FRAME is used."
+  ;; This is a kludge to get started, we really should use specifiers!
+  (if (eq display t)
+      t
+    (let* ((props (custom-get-frame-properties frame))
+	   (type (plist-get props 'type))
+	   (class (plist-get props 'class))
+	   (background (plist-get props 'background))
+	   (match t)
+	   (entries display)
+	   entry req options)
+      (while (and entries match)
+	(setq entry (car entries)
+	      entries (cdr entries)
+	      req (car entry)
+	      options (cdr entry)
+	      match (cond ((eq req 'type)
+			   (memq type options))
+			  ((eq req 'class)
+			   (memq class options))
+			  ((eq req 'background)
+			   (memq background options))
+			  (t
+			   (error "Unknown req `%S' with options `%S'" 
+				  req options)))))
+      match)))
+
+(defun custom-relevant-frames ()
+  "List of frames whose custom properties differ from the default."
+  (let ((relevant nil)
+	(default (custom-get-frame-properties))
+	(frames (frame-list))
+	frame)
+    (while frames
+      (setq frame (car frames)
+	    frames (cdr frames))
+      (unless (equal default (custom-get-frame-properties frame))
+	(push frame relevant)))
+    relevant))
+
+(defun custom-initialize-faces (&optional frame)
+  "Initialize all custom faces for FRAME.
+If FRAME is nil or omitted, initialize them for all frames."
+  (mapcar (lambda (symbol)
+	    (let ((spec (or (get symbol 'saved-face)
+			    (get symbol 'factory-face))))
+	      (when spec 
+		(custom-face-display-set symbol spec frame)
+		(initialize-face-resources symbol frame))))
+	  (face-list)))
+
+(defun custom-initialize-frame (&optional frame)
+  "Initialize local faces for FRAME if necessary.
+If FRAME is missing or nil, the first member (frame-list) is used."
+  (unless frame
+    (setq frame (car (frame-list))))
+  (unless (equal (custom-get-frame-properties) 
+		 (custom-get-frame-properties frame))
+    (custom-initialize-faces frame)))
+
+;; Enable.  This should go away when bundled with Emacs.
+(unless (string-match "XEmacs" emacs-version)
+  (add-hook 'after-make-frame-hook 'custom-initialize-frame))
+
+;;; Initializing.
+
+(and (fboundp 'make-face)
+     (make-face 'custom-face-empty))
+
+;;;###autoload
+(defun custom-set-faces (&rest args)
+  "Initialize faces according to user preferences.
+The arguments should be a list where each entry has the form:
+
+  (FACE SPEC [NOW])
+
+SPEC will be stored as the saved value for FACE.  If NOW is present
+and non-nil, FACE will also be created according to SPEC.
+
+See `defface' for the format of SPEC."
+  (while args
+    (let ((entry (car args)))
+      (if (listp entry)
+	  (let ((face (nth 0 entry))
+		(spec (nth 1 entry))
+		(now (nth 2 entry)))
+	    (put face 'saved-face spec)
+	    (when now
+	      (put face 'force-face t))
+	    (when (or now (custom-facep face))