Move `find-face' from poe-19.el to poe.el; abolish poe-19.el.

diff --git a/EMU-ELS b/EMU-ELS
index 3611d43..4a170cf 100644 (file)
--- a/EMU-ELS
+++ b/EMU-ELS
@@ -21,8 +21,7 @@
               invisible-modules (cons 'inv-xemacs invisible-modules))
         )
        ((>= emacs-major-version 19)
-        (setq poe-modules (cons 'poe-19 poe-modules)
-              invisible-modules (cons 'inv-19 invisible-modules))
+        (setq invisible-modules (cons 'inv-19 invisible-modules))
         )
        (t
         (setq poe-modules (cons 'poe-18 poe-modules)

diff --git a/README.en b/README.en
index 73bb81b..f549557 100644 (file)
--- a/README.en
+++ b/README.en
@@ -9,7 +9,6 @@ What's APEL?
     poe.el --- emulation module mainly for basic functions and special
               forms/macros of latest emacsen
       poe-xemacs.el  --- for XEmacs
-      poe-19.el             --- for Emacs 19
       poe-18.el             --- for Emacs 18/Nemacs
          env.el      --- env.el for Emacs 18
 
@@ -23,6 +22,11 @@ What's APEL?
       poem-e20_3.el  --- for Emacs 20.3
       poem-xm.el     --- for XEmacs-MULE
 
+    invisible.el --- provide features about invisible region
+      inv-18.el     --- for Emacs 18
+      inv-19.el     --- for Emacs 19
+      inv-xemacs.el --- for XEmacs
+
     mcharset.el --- provide MIME charset related features
       mcs-nemacs.el --- for Nemacs
       mcs-ltn1.el   --- for Emacs 19/XEmacs without MULE

diff --git a/poe-19.el b/poe-19.el
deleted file mode 100644 (file)
index 0d9367a..0000000
--- a/poe-19.el
+++ /dev/null
@@ -1,40 +0,0 @@
-;;; poe-19.el --- poe API implementation for Emacs 19.*
-
-;; Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
-
-;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Keywords: emulation, compatibility
-
-;; This file is part of APEL (A Portable Emacs Library).
-
-;; This program 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.
-
-;; This program 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, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
-
-;;; Code:
-
-;;; @ face
-;;;
-
-(defun-maybe find-face (face)
-  (car (memq face (face-list)))
-  )
-
-
-;;; @ end
-;;;
-
-(provide 'poe-19)
-
-;;; poe-19.el ends here

diff --git a/poe.el b/poe.el
index 572c1bc..b06f46a 100644 (file)
--- a/poe.el
+++ b/poe.el
@@ -86,8 +86,8 @@
        (provide 'xemacs)
        (require 'poe-xemacs)
        )
-      ((>= emacs-major-version 20)
-       (require 'poe-19)
+      ((> emacs-major-version 20))
+      ((= emacs-major-version 20)
        (cond ((fboundp 'string)
              ;; Emacs 20.3 or later
              )
@@ -96,9 +96,7 @@
              (defalias 'string 'concat-chars)
              ))
        )
-      ((>= emacs-major-version 19)
-       (require 'poe-19)
-       )
+      ((= emacs-major-version 19))
       (t
        (require 'poe-18)
        ))
@@ -361,6 +359,15 @@ This function does not move point."
 ;;; @ XEmacs emulation
 ;;;
 
+(defun-maybe find-face (face-or-name)
+  "Retrieve the face of the given name.
+If FACE-OR-NAME is a face object, it is simply returned.
+Otherwise, FACE-OR-NAME should be a symbol.  If there is no such face,
+nil is returned.  Otherwise the associated face object is returned.
+\[XEmacs emulating function]"
+  (car (memq face-or-name (face-list)))
+  )
+
 (defun-maybe point-at-bol (&optional n buffer)
   "Return the character position of the first character on the current line.
 With argument N not nil or 1, move forward N - 1 lines first.