From: morioka <morioka>
Date: Tue, 10 Mar 1998 06:03:59 +0000 (+0000)
Subject: tm 7.94.
X-Git-Tag: tm-7_94~1
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84e1e16d90b381cb0ce73c672f6d06063f37847b;p=elisp%2Fapel.git

tm 7.94.
---

diff --git a/ChangeLog b/ChangeLog
index 3f15b90..cb674ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+Sat Nov 16 08:38:57 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+	* tl: Version 7.61.13 was released.
+
+Fri Nov 15 12:10:41 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+	* mk-tl: add "../emu" to load-path.
+
+	* TL-ELS (tl-modules): emu modules were moved to ../emu/.
+
+	* install.el (install-detect-elisp-directory): New optional
+ 	argument `allow-version-specific'.
+
+Thu Nov  7 20:09:49 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+	* bitmap.el (charset-bitmap): Renamed from `lc-bitmap'.
+
+	* bitmap.el: Function `fontset-height' was renamed to
+ 	`fontset-pixel-height' in Emacs/mule.
+
+	* emu-e20.el (fontset-pixel-height): Renamed from
+ 	`fontset-height'.
+
+	* emu-e20.el (fontset-height): fixed.
+
+
 Thu Oct 24 07:56:18 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
 	* tl: Version 7.61.12 was released.
diff --git a/install.el b/install.el
index 6397515..c59bc9a 100644
--- a/install.el
+++ b/install.el
@@ -4,7 +4,7 @@
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; Created: 1996/8/18
-;; Version: $Id: install.el,v 2.1 1996/09/04 13:57:50 morioka Exp $
+;; Version: $Id: install.el,v 3.0 1996/11/15 11:58:36 morioka Exp $
 ;; Keywords: install
 
 ;; This file is part of tl (Tiny Library).
@@ -148,7 +148,8 @@
       "site-lisp"
     "local.lisp"))
 
-(defun install-detect-elisp-directory (&optional prefix elisp-prefix)
+(defun install-detect-elisp-directory (&optional prefix elisp-prefix
+						 allow-version-specific)
   (or prefix
       (setq prefix install-prefix)
       )
@@ -165,11 +166,13 @@
 		      (expand-file-name (concat ".*/" elisp-prefix) prefix)
 		      "$")
 	      dir)
-	     (or (string-match (format "%d\\.%d"
-				       emacs-major-version
-				       emacs-minor-version) dir)
+	     (if (or allow-version-specific
+		     (not (string-match (format "%d\\.%d"
+						emacs-major-version
+						emacs-minor-version) dir))
+		     )
 		 (throw 'tag dir)
-		 ))
+	       ))
 	 (setq rest (cdr rest))
 	 )))
    (expand-file-name (concat