X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=filename.el;h=6aa4edd5303d4af52bb64dbd40139e7e382486e4;hb=refs%2Ftags%2Fchise-core-0_23;hp=98b8786c40c1d4d4f54fa7062903a3aeb890b392;hpb=b11a5ce0763e16726c14b849cc94b6a392b30eb8;p=elisp%2Fapel.git

diff --git a/filename.el b/filename.el
index 98b8786..6aa4edd 100644
--- a/filename.el
+++ b/filename.el
@@ -20,8 +20,8 @@
 
 ;; 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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -102,12 +102,11 @@ Moreover, if you want to convert Japanese filename to roman string by kakasi,
 		inc-i '(1+ i))
 	(setq sref 'aref
 	      inc-i '(+ i (char-length chr))))
-      (` (let* ((string (, string))
-		(len (length string))
-		(b 0)(i 0)
-		(dest ""))
+      (` (let ((len (length (, string)))
+	       (b 0)(i 0)
+	       (dest ""))
 	   (while (< i len)
-	     (let ((chr ((, sref) string i))
+	     (let ((chr ((, sref) (, string) i))
 		   (lst filename-replacement-alist)
 		   ret)
 	       (while (and lst (not ret))
@@ -117,12 +116,12 @@ Moreover, if you want to convert Japanese filename to roman string by kakasi,
 		     t			; quit this loop.
 		   (setq lst (cdr lst))))
 	       (if ret
-		   (setq dest (concat dest (substring string b i)
+		   (setq dest (concat dest (substring (, string) b i)
 				      (cdr (car lst)))
 			 i (, inc-i)
 			 b i)
 		 (setq i (, inc-i)))))
-	   (concat dest (substring string b)))))))
+	   (concat dest (substring (, string) b)))))))
 
 (defun filename-special-filter (string)
   (filename-special-filter-1 string))