[xyzzy:09158] 細かい所をいろいろと

[southly <southly@xxxxxxxxxxxx>]

こんにちは、NANRIです。

大勢には影響が無いtypo等のストックがたまったのでご報告。
概要は以下のような感じです。

定義の重複
　<window.l>: toggle-cursor-line
　<filer.l>: filer-send-to

builtin.lでの定義がない : sort

引数のtypo?
　<builtin.l>: rename-file
　<builtin.l>: copy-file
　<builtin.l>: directory-name-dialog
　<builtin.l>: file-name-dialog
　<builtin.l>: make-iso2022-encoding
　<builtin.l>: make-utf16-encoding
　<builtin.l>: make-utf8-encoding
　<builtin.l>: make-utf7-encoding
　<builtin.l>: make-utf5-encoding
　<builtin.l>: parse-char-encoding-string
　<builtin.l>: char-before

packageがbuiltin.lではeditor <=> 実際はsystemとなっている?
　<builtin.l>: dump-image-path

typo?
　encoding.l : provide
　css-mode.l : provide
　timestmp.l : コメント部分

以上よろしくお願いします。

-----
NANRI
southly@xxxxxxxxxxxx


以下差分

diff -wur lisp/builtin.l .netinst/lisp/builtin.l
--- lisp/builtin.l	Mon Mar 14 22:41:56 2005
+++ .netinst/lisp/builtin.l	Sun Jul 24 03:09:38 2005
@@ -173,6 +173,7 @@
 (si::defun-builtin position (item sequence &key :from-end :test :test-not :start :end :key))
 (si::defun-builtin position-if (predicate sequence &key :from-end :start :end :key))
 (si::defun-builtin position-if-not (predicate sequence &key :from-end :start :end :key))
+(si::defun-builtin sort (sequence predicate &key :key))
 (si::defun-builtin stable-sort (sequence predicate &key :key))
 (si::defun-builtin aref (array &rest subscripts))
 (si::defun-builtin array-has-fill-pointer-p (array))
@@ -336,8 +337,8 @@
 (si::defun-builtin user-homedir-pathname ())
 (si::defun-builtin compile-file-pathname (pathname))
 (si::defun-builtin delete-file (file &key :if-does-not-exist :if-access-denied :recycle))
-(si::defun-builtin rename-file (file new-name :if-exists :if-access-denied))
-(si::defun-builtin copy-file (file new-file :if-exists :copy-attributes :if-access-denied))
+(si::defun-builtin rename-file (file new-name &key :if-exists :if-access-denied))
+(si::defun-builtin copy-file (file new-file &key :if-exists :copy-attributes :if-access-denied))
 (si::defun-builtin create-directory (dirname &key :if-exists))
 (si::defun-builtin delete-directory (dirname &key :if-does-not-exist :if-access-denied))
 (si::defun-builtin directory (pathname &key :absolute :recursive :wild :depth :file-only :show-dots :count :directory-only :callback :file-info))
@@ -622,7 +623,7 @@
 (si::defun-builtin read-registry (section key &optional root))
 (si::defun-builtin list-registry-key (section &optional root))
 (si::defun-builtin user-config-path ())
-(si::defun-builtin dump-image-path ())
+(si::defun-builtin dump-image-path ()) ; system package ?
 (si::defun-builtin user-name ())
 (si::defun-builtin machine-name ())
 (si::defun-builtin os-major-version ())
@@ -812,7 +813,7 @@
 (si::defun-builtin bobp ())
 (si::defun-builtin eobp ())
 (si::defun-builtin char-after (point &optional not-used))
-(si::defun-builtin char-before (&optional not-used))
+(si::defun-builtin char-before (point &optional not-used))
 (si::defun-builtin following-char ())
 (si::defun-builtin preceding-char ())
 (si::defun-builtin current-column ())
@@ -1120,8 +1121,8 @@
 (si::defun-builtin dialog-box (dialog initializers handlers))
 (si::defun-builtin property-sheet (pages &optional caption start-page))
 (si::defun-builtin buffer-selector ())
-(si::defun-builtin file-name-dialog (:char-encoding :eol-code :filter :filter-index :title :default :extension :save :multiple :must-exist :explorer :hide-read-only :initial-directory))
-(si::defun-builtin directory-name-dialog (:title :default))
+(si::defun-builtin file-name-dialog (&key :char-encoding :eol-code :filter :filter-index :title :default :extension :save :multiple :must-exist :explorer :hide-read-only :initial-directory))
+(si::defun-builtin directory-name-dialog (&key :title :default))
 (si::defun-builtin drive-dialog (&optional drive))
 (si::defun-builtin *run-winhelp (help-filename &optional topic))
 (si::defun-builtin *kill-winhelp (help-filename))
@@ -1209,17 +1210,17 @@
 (si::defun-builtin make-sjis-encoding (name display-name))
 (si::defun-builtin make-big5-encoding (name display-name))
 (si::defun-builtin make-binary-encoding (name display-name))
-(si::defun-builtin make-iso2022-encoding (name display-name :g0 :g1 :g2 :g3 :ascii-eol :ascii-control :7bits :locking-shift :short-form :no-escape :cjk :use-cns11643 :vender))
+(si::defun-builtin make-iso2022-encoding (name display-name &key :g0 :g1 :g2 :g3 :ascii-eol :ascii-control :7bits :locking-shift :short-form :no-escape :cjk :use-cns11643 :vender))
 (si::defun-builtin make-iso8859-encoding (name display-name ccs))
 (si::defun-builtin make-windows-codepage-encoding (name display-name codepage))
-(si::defun-builtin make-utf16-encoding (name display-name :signature :byte-order :windows :cjk))
-(si::defun-builtin make-utf8-encoding (name display-name :signature :windows :cjk))
-(si::defun-builtin make-utf7-encoding (name display-name :windows :imap4 :white :set-o :cjk))
-(si::defun-builtin make-utf5-encoding (name display-name :windows :imap4 :white :set-o :cjk))
+(si::defun-builtin make-utf16-encoding (name display-name &key :signature :byte-order :windows :cjk))
+(si::defun-builtin make-utf8-encoding (name display-name &key :signature :windows :cjk))
+(si::defun-builtin make-utf7-encoding (name display-name &key :windows :imap4 :white :set-o :cjk))
+(si::defun-builtin make-utf5-encoding (name display-name &key :windows :imap4 :white :set-o :cjk))
 (si::defun-builtin char-encoding-name (char-encoding))
 (si::defun-builtin char-encoding-display-name (char-encoding))
 (si::defun-builtin parse-char-encoding-region (accept-char-encoding from to))
-(si::defun-builtin parse-char-encoding-string (accept-char-encoding string :start :end))
+(si::defun-builtin parse-char-encoding-string (accept-char-encoding string &key :start :end))
 (si::defun-builtin run-hooks (&rest hooks))
 (si::defun-builtin run-hook-with-args (hook &rest args))
 (si::defun-builtin run-hook-with-args-while-success (hook &rest args))
diff -wur lisp/css-mode.l .netinst/lisp/css-mode.l
--- lisp/css-mode.l	Sun Sep 23 05:19:02 2001
+++ .netinst/lisp/css-mode.l	Mon Jul  4 01:30:24 2005
@@ -5,7 +5,7 @@
 
 ;;; Author: 逸見さん(henmi@xxxxxxxxxxxxx)
 
-(provide "cssmode")
+(provide "css-mode")
 
 (in-package "editor")
 
diff -wur lisp/encoding.l .netinst/lisp/encoding.l
--- lisp/encoding.l	Mon Jul 23 02:41:44 2001
+++ .netinst/lisp/encoding.l	Mon Jul  4 01:29:20 2005
@@ -3,7 +3,7 @@
 ;;; This file is part of xyzzy.
 ;;;
 
-(provide "abbrev")
+(provide "encoding")
 
 (in-package "editor")
 
diff -wur lisp/filer.l .netinst/lisp/filer.l
--- lisp/filer.l	Wed Oct 15 23:36:50 2003
+++ .netinst/lisp/filer.l	Mon Jul  4 02:04:40 2005
@@ -1310,39 +1310,6 @@
       (or (filer-modal-p)
 	  (si:*activate-toplevel)))))
 
-(defun filer-send-to ()
-  (unless (zerop (filer-count-marks))
-    (let* ((send-to (get-special-folder-location :send-to))
-	   (dests (nconc (sort (directory send-to :file-only t :recursive t) #'string-lessp)
-			 *filer-send-to-list*)))
-      (multiple-value-bind (result data)
-	  (dialog-box '(dialog 0 0 184 107
-			(:caption "送っちゃうよ")
-			(:font 9 "MS UI Gothic")
-			(:control
-			 (:listbox list nil #x50b10001 2 3 118 103)
-			 (:button IDOK "送る" #x50030001 128 7 52 14)
-			 (:button IDCANCEL "送らない" #x50030000 128 27 52 14)))
-		      (list (cons 'list (mapcar #'(lambda (x)
-						    (if (consp x)
-							(car x)
-						      (substitute-string x "\\.\\(lnk\\|pif\\)$" "")))
-						dests))
-			    '(list . 0))
-		      '((list :index t :must-match t :enable (IDOK))))
-	(when result
-	  (let* ((selected (nth (cdr (assoc 'list data)) dests))
-		 (dest (if (consp selected)
-			   (cdr selected)
-			 (merge-pathnames selected send-to)))
-		 (link (truename (filer-read-link dest))))
-	    (if (file-directory-p link)
-		(filer-copy (append-trail-slash link))
-	      (shell-execute dest nil
-			     (format nil "~{\"~a\"~^ ~}"
-				     (mapcar #'map-slash-to-backslash
-					     (filer-get-mark-files)))))))))))
-
 (defun filer-send-to-target ()
   (let* ((send-to (get-special-folder-location :send-to))
 	 (dests (nconc (sort (directory send-to :file-only t :recursive t)
diff -wur lisp/timestmp.l .netinst/lisp/timestmp.l
--- lisp/timestmp.l	Sun Jun  8 03:02:58 2003
+++ .netinst/lisp/timestmp.l	Sat Jul  9 03:02:02 2005
@@ -10,7 +10,7 @@
 ;;; A: 長い形式の曜日
 ;;; b: 短い形式の月
 ;;; B: 長い形式の月
-;;; d: 日(00〜59)                 # (0〜59)
+;;; d: 日(00〜31)                 # (0〜31)
 ;;; e: 和暦の年(01〜)             # (1〜)
 ;;; E: 和暦の年(元, 02〜)         # (元, 2〜)
 ;;; g: 元号(明治,大正,昭和,平成)  # (明,大,昭,平)
diff -wur lisp/window.l .netinst/lisp/window.l
--- lisp/window.l	Sat Jun  9 01:43:52 2001
+++ .netinst/lisp/window.l	Mon Jul  4 01:03:20 2005
@@ -215,10 +215,6 @@
   (interactive "p")
   (toggle-window-flag *window-flag-mode-line* arg sv))
 
-(defun toggle-cursor-line (&optional (arg nil sv))
-  (interactive "p")
-  (toggle-window-flag *window-flag-cursor-line* arg sv))
-
 (defun toggle-function-bar (&optional (arg nil sv))
   (interactive "p")
   (toggle-window-flag *window-flag-function-bar* arg sv))