Permalink
Browse files

update.

  • Loading branch information...
1 parent e713bf4 commit 08fef45c2306857d6deeeaa68104d65abed1ecb0 morioka committed Nov 13, 1998
Showing with 57 additions and 92 deletions.
  1. +1 −28 ChangeLog
  2. +1 −1 Makefile
  3. +1 −1 README.en
  4. +1 −1 README.ja
  5. +0 −2 broken.el
  6. +30 −35 pccl.el
  7. +5 −0 poe-18.el
  8. +17 −23 poe.el
  9. +1 −1 poem-ltn1.el
View
@@ -1,30 +1,3 @@
-1998-11-17 Kazuhiro Ohta <ohta@ele.cst.nihon-u.ac.jp>
-
- * README.en, README.ja: add-latest-path: Fix typo.
-
-1998-11-14 MORIOKA Tomohiko <morioka@jaist.ac.jp>
-
- * APEL: Version 9.11 was released.
-
- * poem-ltn1.el (char-charset): Fix typo.
-
-1998-11-13 Tanaka Akira <akr@jaist.ac.jp>
-
- * broken.el: require 'poe.
-
-1998-11-13 Tanaka Akira <akr@jaist.ac.jp>
-
- * pccl.el: Enclose mule depended process by `unless-broken'.
-
-1998-11-13 MORIOKA Tomohiko <morioka@jaist.ac.jp>
-
- * poe.el (defun-maybe-cond): fixed problem in Emacs 18.
-
- * poe.el (defsubst): Moved from poe-18.el.
-
- * poe-18.el: Move macro `defsubst' to poe.el.
-
-
1998-11-13 MORIOKA Tomohiko <morioka@jaist.ac.jp>
* APEL: Version 9.10 was released.
@@ -1112,7 +1085,7 @@
* APEL: Version 8.4 was released.
- * EMU-ELS: Don't use HIRAGANA LETTER A ($B$"(B) to detect character
+ * EMU-ELS: Don't use HIRAGANA LETTER A ($(B$"(B) to detect character
indexing (Emacs 20.3 or later).
1998-04-20 MORIOKA Tomohiko <morioka@jaist.ac.jp>
View
@@ -2,7 +2,7 @@
# Makefile for APEL.
#
-VERSION = 9.11
+VERSION = 9.10
TAR = tar
RM = /bin/rm -f
View
@@ -228,7 +228,7 @@ Function add-latest-path (PATTERN &optional ALL-PATHS)
and if bbdb-1.51 is newer than bbdb-1.50, and site-lisp is
/usr/local/share/emacs/site-lisp,
- (add-latest-path "bbdb")
+ (add-path "bbdb")
it adds "/usr/local/share/emacs/site-lisp/bbdb-1.51" to top of
`load-path'.
View
@@ -237,7 +237,7 @@ path-util
$B$,(B bbdb-1.50 $B$h$j$b?7$7$/!"(Bsite-lisp $B$,(B
/usr/local/share/emacs/site-lisp $B$G$"$k$H$-$O!"(B
- (add-latest-path "bbdb")
+ (add-path "bbdb")
$B$O(B "/usr/local/share/emacs/site-lisp/bbdb-1.51" $B$r(B `load-path' $B$N@h(B
$BF,$KDI2C$7$^$9!#(B
View
@@ -24,8 +24,6 @@
;;; Code:
-(require 'poe)
-
(eval-and-compile
(defvar notice-non-obvious-broken-facility t
View
65 pccl.el
@@ -24,50 +24,45 @@
;;; Code:
+(require 'ccl)
+(require 'advice)
(require 'broken)
-;; The condition for non-XEmacs mule t may be wrong.
-;; But I don't know exact version which introduce CCL on mule.
+(if (featurep 'mule)
+ (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)))
-(unless-broken ccl-usable
- (require 'ccl)
- (require 'advice)
-
- (if (featurep 'mule)
- (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))))
-
- (defadvice define-ccl-program
- (before accept-long-ccl-program activate)
- "When CCL-PROGRAM is too long, internal buffer is extended automaticaly."
- (let ((try-ccl-compile t)
- (prog (eval (ad-get-arg 1))))
- (ad-set-arg 1 (` '(, prog)))
- (while try-ccl-compile
- (setq try-ccl-compile nil)
- (condition-case sig
- (ccl-compile prog)
- (args-out-of-range
- (if (and (eq (car (cdr sig)) ccl-program-vector)
- (= (car (cdr (cdr sig))) (length ccl-program-vector)))
- (setq ccl-program-vector
- (make-vector (* 2 (length ccl-program-vector)) 0)
- try-ccl-compile t)
- (signal (car sig) (cdr sig))))))))
- )
+(defadvice define-ccl-program
+ (before accept-long-ccl-program activate)
+ "When CCL-PROGRAM is too long, internal buffer is lengthened."
+ (let ((try-ccl-compile t)
+ (prog (eval (ad-get-arg 1))))
+ (ad-set-arg 1 (` '(, prog)))
+ (while try-ccl-compile
+ (setq try-ccl-compile nil)
+ (condition-case sig
+ (ccl-compile prog)
+ (args-out-of-range
+ (if (and (eq (car (cdr sig)) ccl-program-vector)
+ (= (car (cdr (cdr sig))) (length ccl-program-vector)))
+ (setq ccl-program-vector
+ (make-vector (* 2 (length ccl-program-vector)) 0)
+ try-ccl-compile t)
+ (signal (car sig) (cdr sig))))))))
;;; @ end
View
@@ -93,6 +93,11 @@ Associates the function with the current load file, if any.
;;; @ Compilation Features
;;;
+(defmacro-maybe defsubst (name arglist &rest body)
+ "Define an inline function. The syntax is just like that of `defun'."
+ (cons 'defun (cons name (cons arglist body)))
+ )
+
(defmacro-maybe eval-and-compile (&rest body)
"Like `progn', but evaluates the body at compile time and at load time."
;; Remember, it's magic.
View
40 poe.el
@@ -39,28 +39,23 @@
))
)))
-(defmacro defmacro-maybe (name &rest everything-else)
+(defmacro defsubst-maybe (name &rest everything-else)
(or (and (fboundp name)
- (not (get name 'defmacro-maybe)))
+ (not (get name 'defsubst-maybe)))
(` (or (fboundp (quote (, name)))
(progn
- (defmacro (, name) (,@ everything-else))
- (put (quote (, name)) 'defmacro-maybe t)
+ (defsubst (, name) (,@ everything-else))
+ (put (quote (, name)) 'defsubst-maybe t)
))
)))
-(defmacro-maybe defsubst (name arglist &rest body)
- "Define an inline function. The syntax is just like that of `defun'."
- (cons 'defun (cons name (cons arglist body)))
- )
-
-(defmacro defsubst-maybe (name &rest everything-else)
+(defmacro defmacro-maybe (name &rest everything-else)
(or (and (fboundp name)
- (not (get name 'defsubst-maybe)))
+ (not (get name 'defmacro-maybe)))
(` (or (fboundp (quote (, name)))
(progn
- (defsubst (, name) (,@ everything-else))
- (put (quote (, name)) 'defsubst-maybe t)
+ (defmacro (, name) (,@ everything-else))
+ (put (quote (, name)) 'defmacro-maybe t)
))
)))
@@ -108,16 +103,15 @@
(or (and (fboundp name)
(not (get name 'defun-maybe)))
(` (unless (fboundp (quote (, name)))
- (cond (,@ (mapcar (function
- (lambda (case)
- (list (car case)
- (if doc
- (` (defun (, name) (, args)
- (, doc)
- (,@ (cdr case))))
- (` (defun (, name) (, args)
- (,@ (cdr case))))
- ))))
+ (cond (,@ (mapcar (lambda (case)
+ (list (car case)
+ (if doc
+ (` (defun (, name) (, args)
+ (, doc)
+ (,@ (cdr case))))
+ (` (defun (, name) (, args)
+ (,@ (cdr case))))
+ )))
everything-else)))
(put (quote (, name)) 'defun-maybe t)
))))
View
@@ -162,7 +162,7 @@ code conversion will not take place."
(defun char-charset (char)
"Return the character set of char CHAR."
- (if (< char 128)
+ (if (< chr 128)
'ascii
'latin-iso8859-1))

0 comments on commit 08fef45

Please sign in to comment.