From: ueno <ueno>
Date: Mon, 12 Feb 2001 12:24:59 +0000 (+0000)
Subject: Dealing with Emacs 19.34.
X-Git-Tag: liece-1_4_7~33
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa0581d8b2e961c48161792879521842022cde21;p=elisp%2Fliece.git

Dealing with Emacs 19.34.

* liece-compat.el (liece-read-passwd): Revive.

* liece-clfns.el (liece-clfns-subr-fboundp): Check existence of
the function `symbol-file'.

* liece-q-ccl.el: Require `poem' for char-int.
(liece-quote-ccl-256-table): Simplified.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2aaf195..feb68a0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2001-02-12   Daiki Ueno  <ueno@unixuser.org>
+
+	* liece-compat.el (liece-read-passwd): Revive.
+
+	* liece-clfns.el (liece-clfns-subr-fboundp): Check existence of
+	the function `symbol-file'.
+
+	* liece-q-ccl.el: Require `poem' for char-int.
+	(liece-quote-ccl-256-table): Simplified.
+
 2001-01-02   Daiki Ueno  <ueno@unixuser.org>
 
 	* liece-modules.el: Simplified.
diff --git a/lisp/liece-clfns.el b/lisp/liece-clfns.el
index e3771a5..baf5ace 100644
--- a/lisp/liece-clfns.el
+++ b/lisp/liece-clfns.el
@@ -34,7 +34,8 @@
   "Return t if SYMBOL's function definition is a basic function."
   (and (fboundp symbol)
        (or (subrp (symbol-function symbol))
-	   (string-equal (symbol-file symbol) "subr"))))
+	   (and (fboundp 'symbol-file)
+		(string-equal (symbol-file symbol) "subr")))))
 
 (if (featurep 'xemacs)
     nil
diff --git a/lisp/liece-commands.el b/lisp/liece-commands.el
index 4ccf3ed..755e028 100644
--- a/lisp/liece-commands.el
+++ b/lisp/liece-commands.el
@@ -232,9 +232,8 @@ with specified user."
 	       (if (eq current-prefix-arg '-)
 		   (read-string
 		    (format (_ "Key for channel %s: ") join-channel-var))
-		 (let ((passwd-echo ?*))
-		   (read-passwd
-		    (format (_ "Key for channel %s: ") join-channel-var))))))
+		 (liece-read-passwd
+		  (format (_ "Key for channel %s: ") join-channel-var)))))
      (list join-channel-var key)))
   (let ((real-chnl (liece-channel-real join-channel-var)))
     (if (numberp join-channel-var)
diff --git a/lisp/liece-compat.el b/lisp/liece-compat.el
index 3a01cf0..04771ac 100644
--- a/lisp/liece-compat.el
+++ b/lisp/liece-compat.el
@@ -109,6 +109,17 @@ Otherwise, this function always returns false.
       (sit-for 2)
       (delete-region savemax (point-max)))))
 
+(defvar liece-read-passwd nil)
+(defun liece-read-passwd (prompt)
+  (if (not liece-read-passwd)
+      (if (functionp 'read-passwd)
+	  (setq liece-read-passwd 'read-passwd)
+	(if (load "passwd" t)
+	    (setq liece-read-passwd 'read-passwd)
+	  (autoload 'ange-ftp-read-passwd "ange-ftp")
+	  (setq liece-read-passwd 'ange-ftp-read-passwd))))
+  (funcall liece-read-passwd prompt))
+
 ;; from XEmacs's subr.el
 (defun-maybe replace-in-string (str regexp newtext &optional literal)
   "Replace all matches in STR for REGEXP with NEWTEXT string,
diff --git a/lisp/liece-q-ccl.el b/lisp/liece-q-ccl.el
index 4ac9cba..324bf6e 100644
--- a/lisp/liece-q-ccl.el
+++ b/lisp/liece-q-ccl.el
@@ -31,25 +31,16 @@
 
 (require 'broken)
 (require 'pccl)
+(require 'poem)				;char-int
 
 (eval-and-compile
   (defconst liece-quote-ccl-256-table
-    '(  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
-       16  17  18  19  20  21  22  23  24  25  26  27  28  29  30  31
-       32  33  34  35  36  37  38  39  40  41  42  43  44  45  46  47
-       48  49  50  51  52  53  54  55  56  57  58  59  60  61  62  63
-       64  65  66  67  68  69  70  71  72  73  74  75  76  77  78  79
-       80  81  82  83  84  85  86  87  88  89  90  91  92  93  94  95
-       96  97  98  99 100 101 102 103 104 105 106 107 108 109 110 111
-      112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127
-      128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143
-      144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159
-      160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175
-      176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191
-      192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207
-      208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223
-      224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239
-      240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255)))
+    (let ((i 0)
+	  table)
+      (while (< i 256)
+	(setq table (nconc table (list i))
+	      i (1+ i)))
+      table)))
 
 (broken-facility ccl-cascading-write
   "Emacs CCL write command does not accept more than 2 arguments."
diff --git a/lisp/liece.el b/lisp/liece.el
index 65fedf8..1dee0ef 100644
--- a/lisp/liece.el
+++ b/lisp/liece.el
@@ -447,8 +447,8 @@ If optional argument SERVICE is non-nil, open by the service name."
       (set-process-sentinel liece-server-process 'liece-sentinel)
       (set-process-filter liece-server-process 'liece-filter)
       (if (or liece-ask-for-password liece-reconnect-with-password)
-	  (let ((passwd-echo ?*) password)
-	    (setq password (read-passwd (_ "Server Password: ")))
+	  (let ((password
+		 (liece-read-passwd (_ "Server Password: "))))
 	    (or (string= password "")
 		(setq liece-password password))))
       (if liece-password