[Emacs-commit] emacs/lisp/mh-e mh-e.el mh-compat.el ChangeLog

[Bill Wohler]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         
Changes by:     Bill Wohler <address@hidden>    06/04/14 18:49:18

Modified files:
        lisp/mh-e      : mh-e.el mh-compat.el ChangeLog 

Log message:
        * mh-compat.el (mh-font-lock-add-keywords): New alias for
        font-lock-add-keywords. Returns nil on XEmacs.
        
        * mh-e.el: Add MH-E function and variable keywords such as
        mh-defun-compat and mh-defcustom to font-lock-keywords.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/mh-e.el.diff?tr1=1.89&tr2=1.90&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/mh-compat.el.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/ChangeLog.diff?tr1=1.198&tr2=1.199&r1=text&r2=text

Patches:
Index: emacs/lisp/mh-e/ChangeLog
diff -u emacs/lisp/mh-e/ChangeLog:1.198 emacs/lisp/mh-e/ChangeLog:1.199
--- emacs/lisp/mh-e/ChangeLog:1.198     Fri Apr 14 00:47:00 2006
+++ emacs/lisp/mh-e/ChangeLog   Fri Apr 14 18:49:18 2006
@@ -1,3 +1,11 @@
+2006-04-14  Bill Wohler  <address@hidden>
+
+       * mh-compat.el (mh-font-lock-add-keywords): New alias for
+       font-lock-add-keywords. Returns nil on XEmacs.  
+
+       * mh-e.el: Add MH-E function and variable keywords such as
+       mh-defun-compat and mh-defcustom to font-lock-keywords. 
+
 2006-04-13  Bill Wohler  <address@hidden>
 
        * mh-e.el (customize-package-emacs-version-alist)
Index: emacs/lisp/mh-e/mh-compat.el
diff -u emacs/lisp/mh-e/mh-compat.el:1.16 emacs/lisp/mh-e/mh-compat.el:1.17
--- emacs/lisp/mh-e/mh-compat.el:1.16   Sun Mar 19 18:20:31 2006
+++ emacs/lisp/mh-e/mh-compat.el        Fri Apr 14 18:49:18 2006
@@ -40,7 +40,7 @@
 ;; versions of Gnus.
 
 ;; Items are listed alphabetically (except for mh-require which is
-;; needed by a lesser character).
+;; needed sooner it would normally appear).
 
 (require 'mh-acros)
 
@@ -115,6 +115,11 @@
       `(face-background ,face ,frame)
     `(face-background ,face ,frame ,inherit)))
 
+(mh-defun-compat mh-font-lock-add-keywords font-lock-add-keywords
+  (mode keywords &optional how)
+  "XEmacs does not have `image-search-load-path'.
+This function returns nil on that system.")
+
 (mh-defun-compat mh-image-load-path-for-library
   image-load-path-for-library (library image &optional path no-error)
   "Return a suitable search path for images used by LIBRARY.
Index: emacs/lisp/mh-e/mh-e.el
diff -u emacs/lisp/mh-e/mh-e.el:1.89 emacs/lisp/mh-e/mh-e.el:1.90
--- emacs/lisp/mh-e/mh-e.el:1.89        Fri Apr 14 00:47:00 2006
+++ emacs/lisp/mh-e/mh-e.el     Fri Apr 14 18:49:18 2006
@@ -109,6 +109,26 @@
 (require 'mh-buffers)
 (require 'mh-compat)
 
+(mh-font-lock-add-keywords
+ 'emacs-lisp-mode
+ (eval-when-compile
+   `((,(concat "(\\("
+               ;; Function declarations (use font-lock-function-name-face).
+               "\\(mh-def\\(un\\|macro\\)-compat\\)\\|"
+               ;; Variable declarations (use font-lock-variable-name-face).
+               "\\(mh-def\\(custom\\|face\\)\\)\\|"
+               ;; Group declarations (use font-lock-type-face).
+               "\\(mh-defgroup\\)"
+               "\\)\\>"
+               ;; Any whitespace and defined object.
+               "[ \t'\(]*"
+               "\\(setf[ \t]+\\sw+)\\|\\sw+\\)?")
+      (1 font-lock-keyword-face)
+      (7 (cond ((match-beginning 2) font-lock-function-name-face)
+               ((match-beginning 4) font-lock-variable-name-face)
+               (t font-lock-type-face))
+         nil t)))))
+
 
 
 ;;; Global Variables