From xemacs-m  Mon Feb 24 13:28:30 1997
Received: from CNRI.Reston.VA.US (CNRI.Reston.VA.US [132.151.1.1])
	by xemacs.org (8.8.5/8.8.5) with SMTP id NAA14982
	for <xemacs-beta@xemacs.org>; Mon, 24 Feb 1997 13:28:28 -0600 (CST)
Received: from newcnri.cnri.reston.va.us by CNRI.Reston.VA.US id aa15219;
          24 Feb 97 12:00 EST
Received: from anthem.CNRI.Reston.Va.US by newcnri.CNRI.Reston.Va.US (SMI-8.6/SMI-SVR4)
	id MAA16887; Mon, 24 Feb 1997 12:00:16 -0500
Received: by anthem.CNRI.Reston.Va.US (SMI-8.6/SMI-SVR4)
	id MAA16615; Mon, 24 Feb 1997 12:00:15 -0500
Date: Mon, 24 Feb 1997 12:00:15 -0500
Message-Id: <199702241700.MAA16615@anthem.CNRI.Reston.Va.US>
From: "Barry A. Warsaw" <bwarsaw@anthem.cnri.reston.va.us>
MIME-Version: 1.0
Content-Type: multipart/mixed;
	boundary="/krroCPKaki1YLc1t1yMbUStqnYpKWIEC0KvNYqg"
Content-Transfer-Encoding: 7bit
To: xemacs-beta@xemacs.org
Subject: xrdb-mode.el 1.21
Reply-To: bwarsaw@python.org
X-Attribution: BAW
X-Oblique-Strategy: Simple subtraction
X-Url: http://www.python.org/~bwarsaw


--/krroCPKaki1YLc1t1yMbUStqnYpKWIEC0KvNYqg
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit


This basically fixes the way the xrdb specific faces are initialized,
using the font-lock-mode-hook hack that seems to work well enough for
shell.el

-Barry


--/krroCPKaki1YLc1t1yMbUStqnYpKWIEC0KvNYqg
Content-Type: text/plain
Content-Disposition: inline;
	filename="patch-9"
Content-Transfer-Encoding: 7bit

*** xrdb-mode.el	1997/02/21 22:28:59	1.17
--- xrdb-mode.el	1997/02/24 03:35:02
***************
*** 4,9 ****
  ;; Maintainer:    tools-help@python.org
  ;; Created:       May 1994
! ;; Version:       1.17
! ;; Last Modified: 1997/02/21 22:28:59
  ;; Keywords:      data languages
  
--- 4,9 ----
  ;; Maintainer:    tools-help@python.org
  ;; Created:       May 1994
! ;; Version:       1.21
! ;; Last Modified: 1997/02/24 03:34:56
  ;; Keywords:      data languages
  
***************
*** 47,51 ****
  ;;  place in paradise.  I promise to be good, Steve.  :-) :-)"
  ;;
! ;; I have fallen from grace.
  
  ;; Code:
--- 47,66 ----
  ;;  place in paradise.  I promise to be good, Steve.  :-) :-)"
  ;;
! ;; I have fallen from grace and have been kicked out of paradise.  So
! ;; has Steve Jobs apparently :-)
! ;;
! ;; To use, put the following in your .emacs:
! ;;
! ;; (autoload 'xrdb-mode "xrdb-mode" "Mode for editing X resource files" t)
! ;;
! ;; You may also want something like:
! ;;
! ;; (setq auto-mode-alist
! ;;       (append '(("\\.Xdefaults$" . xrdb-mode)
! ;;                 ("\\.Xenvironment$" . xrdb-mode)
! ;;                 ("\\.Xresources$" . xrdb-mode)
! ;;                 )
! ;;               auto-mode-alist))
! 
  
  ;; Code:
***************
*** 339,351 ****
  
  ;; faces and font-locking
! (eval-when-compile
!   (require 'font-lock))
  
  (make-face 'xrdb-option-name-face)
  (make-face 'xrdb-option-value-face)
! (or (face-differs-from-default-p 'xrdb-option-name-face)
!     (copy-face 'font-lock-keyword-face 'xrdb-option-name-face))
! (or (face-differs-from-default-p 'xrdb-option-value-face)
!     (copy-face 'font-lock-string-face 'xrdb-option-value-face))
  
  (defvar xrdb-font-lock-keywords
--- 354,372 ----
  
  ;; faces and font-locking
! (defvar xrdb-option-name-face 'xrdb-option-name-face
!   "Face for option name on a line in an X resource db file")
! (defvar xrdb-option-value-face 'xrdb-option-value-face
!   "Face for option value on a line in an X resource db file")
  
  (make-face 'xrdb-option-name-face)
  (make-face 'xrdb-option-value-face)
! 
! (defun xrdb-font-lock-mode-hook ()
!   (or (face-differs-from-default-p 'xrdb-option-name-face)
!       (copy-face 'font-lock-keyword-face 'xrdb-option-name-face))
!   (or (face-differs-from-default-p 'xrdb-option-value-face)
!       (copy-face 'font-lock-string-face 'xrdb-option-value-face))
!   (remove-hook 'font-lock-mode-hook 'xrdb-font-lock-mode-hook))
! (add-hook 'font-lock-mode-hook 'xrdb-font-lock-mode-hook)
  
  (defvar xrdb-font-lock-keywords
***************
*** 353,359 ****
  	  (1 xrdb-option-name-face)
  	  (2 xrdb-option-value-face)))
!   "Additional expressions to highlight in Xrdb mode.")
! 
! (put 'xrdb-mode 'font-lock-defaults '(xrdb-font-lock-keywords nil))
  
  
--- 374,379 ----
  	  (1 xrdb-option-name-face)
  	  (2 xrdb-option-value-face)))
!   "Additional expressions to highlight in X resource db mode.")
! (put 'xrdb-mode 'font-lock-defaults '(xrdb-font-lock-keywords))
  
  
***************
*** 383,387 ****
  ;; submitting bug reports
  
! (defconst xrdb-version "1.17"
    "xrdb-mode version number.")
  
--- 403,407 ----
  ;; submitting bug reports
  
! (defconst xrdb-version "1.21"
    "xrdb-mode version number.")
  

--/krroCPKaki1YLc1t1yMbUStqnYpKWIEC0KvNYqg--

