* EMU-ELS (pccl-modules): Always install 'pccl.

* broken.el: Use 19.28 style quasi-quote.

* pccl.el: - require 'broken.
- Does not require 'pccl-20 for XEmacs 20.
(ccl-usable): New facility.

diff --git a/ChangeLog b/ChangeLog
index 417d24e..83fdccb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 1998-11-10  Tanaka Akira  <akr@jaist.ac.jp>
 
+       * EMU-ELS (pccl-modules): Always install 'pccl.
+
+       * broken.el: Use 19.28 style quasi-quote.
+
+       * pccl.el: - require 'broken.
+       - Does not require 'pccl-20 for XEmacs 20.
+       (ccl-usable): New facility.
+
+1998-11-10  Tanaka Akira  <akr@jaist.ac.jp>
+
        * README.en, README.ja, pccl-20.el: Note that pccl-20 is not
        for XEmacs 20.
 

diff --git a/EMU-ELS b/EMU-ELS
index 4a170cf..39259c4 100644 (file)
--- a/EMU-ELS
+++ b/EMU-ELS
@@ -15,7 +15,7 @@
       (poem-modules '(poem))
       (mcs-modules '(mcharset))
       (invisible-modules '(invisible))
-      pccl-modules)
+      (pccl-modules '(pccl)))
   (cond ((featurep 'xemacs)
         (setq poe-modules (cons 'poe-xemacs poe-modules)
               invisible-modules (cons 'inv-xemacs invisible-modules))
@@ -33,7 +33,7 @@
                                                        poem-modules))
                      mcs-modules (cons 'mcs-xm (cons 'mcs-20 mcs-modules)))
                (if (>= emacs-major-version 21)
-                   (setq pccl-modules '(pccl-20 pccl))
+                   (setq pccl-modules (cons 'pccl-20 pccl-modules))
                  )
                )
               ((>= emacs-major-version 20)
@@ -41,7 +41,7 @@
                                                         poem-modules))
                      mcs-modules (cons 'mcs-e20 (cons 'mcs-20
                                                       mcs-modules))
-                     pccl-modules '(pccl-20 pccl))
+                     pccl-modules (cons 'pccl-20 pccl-modules))
                (setq poem-modules
                      (cons
                       (if (and
@@ -54,7 +54,7 @@
               (t
                (setq poem-modules (cons 'poem-om poem-modules)
                      mcs-modules (cons 'mcs-om mcs-modules)
-                     pccl-modules '(pccl-om pccl)
+                     pccl-modules (cons 'pccl-om pccl-modules)
                      emu-modules (cons 'emu-mule emu-modules))
                ))
         )

diff --git a/broken.el b/broken.el
index 1531b3a..7486b7e 100644 (file)
--- a/broken.el
+++ b/broken.el
@@ -26,25 +26,25 @@
 
 (eval-and-compile
 
-(defvar notice-non-obvious-broken-facility t
-  "If the value is t, non-obvious broken facility is noticed when
+  (defvar notice-non-obvious-broken-facility t
+    "If the value is t, non-obvious broken facility is noticed when
 `broken-facility' macro is expanded.")
 
-(defun broken-facility-internal (facility &optional docstring assertion)
-  "Declare that FACILITY emulation is broken if ASSERTION is nil."
-  (when docstring
-    (put facility 'broken-docstring docstring))
-  (put facility 'broken (not assertion)))
+  (defun broken-facility-internal (facility &optional docstring assertion)
+    "Declare that FACILITY emulation is broken if ASSERTION is nil."
+    (when docstring
+      (put facility 'broken-docstring docstring))
+    (put facility 'broken (not assertion)))
 
-(defun broken-p (facility)
-  "t if FACILITY emulation is broken."
-  (get facility 'broken))
+  (defun broken-p (facility)
+    "t if FACILITY emulation is broken."
+    (get facility 'broken))
 
-(defun broken-facility-description (facility)
-  "Return description for FACILITY."
-  (get facility 'broken-docstring))
+  (defun broken-facility-description (facility)
+    "Return description for FACILITY."
+    (get facility 'broken-docstring))
 
-)
+  )
 
 (put 'broken-facility 'lisp-indent-function 1)
 (defmacro broken-facility (facility &optional docstring assertion no-notice)
@@ -55,45 +55,47 @@ FACILITY must be symbol.
 
 If ASSERTION is not ommited and evaluated to nil and NO-NOTICE is nil, it is noticed."
   (let ((assertion-value (eval assertion)))
-    (eval `(broken-facility-internal ',facility ,docstring ',assertion-value))
+    (eval (` (broken-facility-internal
+             '(, facility) (, docstring) '(, assertion-value))))
     (when (and assertion (not assertion-value) (not no-notice)
               notice-non-obvious-broken-facility)
       (message "BROKEN FACILITY DETECTED: %s" docstring))
-    `(broken-facility-internal ',facility ,docstring ',assertion-value)))
+    (` (broken-facility-internal
+       '(, facility) (, docstring) '(, assertion-value)))))
 
 (put 'if-broken 'lisp-indent-function 2)
 (defmacro if-broken (facility then &rest else)
   "If FACILITY is broken, expand to THEN, otherwise (progn . ELSE)."
   (if (broken-p facility)
-    then
-    `(progn . ,else)))
+      then
+    (` (progn . (, else)))))
 
 (put 'when-broken 'lisp-indent-function 1)
 (defmacro when-broken (facility &rest body)
   "If FACILITY is broken, expand to (progn . BODY), otherwise nil."
   (when (broken-p facility)
-    `(progn . ,body)))
+    (` (progn . (, body)))))
 
 (put 'unless-broken 'lisp-indent-function 1)
 (defmacro unless-broken (facility &rest body)
   "If FACILITY is not broken, expand to (progn . BODY), otherwise nil."
   (unless (broken-p facility)
-    `(progn . ,body)))
+    (` (progn . (, body)))))
 
 (defmacro check-broken-facility (facility)
   "Check FACILITY is broken or not. If the status is different on
 compile(macro expansion) time and run time, warn it."
-  `(if-broken ,facility
-       (unless (broken-p ',facility)
-        (message "COMPILE TIME ONLY BROKEN FACILITY DETECTED: %s" 
+  (` (if-broken (, facility)
+        (unless (broken-p '(, facility))
+          (message "COMPILE TIME ONLY BROKEN FACILITY DETECTED: %s" 
+                   (or
+                    '(, (broken-facility-description facility))
+                    (broken-facility-description '(, facility)))))
+       (when (broken-p '(, facility))
+        (message "RUN TIME ONLY BROKEN FACILITY DETECTED: %s" 
                  (or
-                  ',(broken-facility-description facility)
-                  (broken-facility-description ',facility))))
-     (when (broken-p ',facility)
-       (message "RUN TIME ONLY BROKEN FACILITY DETECTED: %s" 
-               (or
-                (broken-facility-description ',facility)
-                ',(broken-facility-description facility))))))
+                  (broken-facility-description '(, facility))
+                  '(, (broken-facility-description facility))))))))
 
 
 ;;; @ end

diff --git a/pccl.el b/pccl.el
index eca8323..30e4356 100644 (file)
--- a/pccl.el
+++ b/pccl.el
@@ -24,13 +24,25 @@
 
 ;;; Code:
 
+(require 'broken)
+
 (if (featurep 'mule)
-    (if (>= emacs-major-version 20)
-       ;; for Emacs 20 and XEmacs-mule
-       (require 'pccl-20)
-      ;; for MULE 1.* and 2.*
-      (require 'pccl-om)
-      ))
+    (if (featurep 'xemacs)
+        (if (>= emacs-major-version 21)
+            ;; for XEmacs-21-mule
+            (require 'pccl-20))
+      (if (>= emacs-major-version 20)
+          ;; for Emacs 20
+          (require 'pccl-20)
+        ;; for MULE 1.* and 2.*
+        (require 'pccl-om))))
+
+(broken-facility ccl-usable
+  "Emacs has CCL."
+  (and (featurep 'mule)
+       (if (featurep 'xemacs)
+           (>= emacs-major-version 21)
+         t)))
 
 
 ;;; @ end