# HG changeset patch # User gongo # Date 1219920263 -32400 # Node ID 0f7d2aab0e048ef6c630762301387e8aac7f660e # Parent 5e44d3723fa9d734b2cb62f72812979c3df44eee *** empty log message *** diff -r 5e44d3723fa9 -r 0f7d2aab0e04 ChangeLog --- a/ChangeLog Thu Aug 28 18:23:27 2008 +0900 +++ b/ChangeLog Thu Aug 28 19:44:23 2008 +0900 @@ -1,5 +1,14 @@ 2008-08-28 Wataru MIYAGUNI + * tag v20080828-2 + 現在使ってない関数を抹殺したver + + いずれ必要になるとは思うが、今は見づらくなるので消去。 + 後ほど必要になったらしたの tag で取ってこればおk。 + + * tag v20080828-1 + 現在使ってない関数をコメントで残しているver + * redit-client-sm.el (redit-client-process-filter) (redit-client-exec-insert-line, redit-client-exec-join) (redit-client-exec-put, redit-client-exec-delete-line): fix diff -r 5e44d3723fa9 -r 0f7d2aab0e04 redit-client-sm.el --- a/redit-client-sm.el Thu Aug 28 18:23:27 2008 +0900 +++ b/redit-client-sm.el Thu Aug 28 19:44:23 2008 +0900 @@ -358,36 +358,6 @@ ;; process kill とかしよう ) - -;; obsolete -;;(defun redit-client-open (file) -;; (interactive "P") -;; (if redit-client-process -;; (if (setq file (read-string "Filename: ")) -;; (progn -;; ;; redit-client-process の input に文字列を送信する -;; (process-send-string -;; redit-client-process -;; ;; redit-open-command (01) と file を連結させる -;; (concat redit-open-command file)) -;; ;; redit-client-process から出力を得るまでループ -;; (while (eq nil (accept-process-output redit-client-process))))) -;; (error "redit-client is not running."))) - -;; redit-client-process にreadコマンドとバッファ番号、行番号を送り、 -;; サーバからの出力を得る -;;(defun redit-client-read-line (linenum) -;; (if redit-client-process -;; (save-excursion -;; (progn -;; (process-send-string -;; redit-client-process -;; (format "%10d%10d%10d%10d%10d%10d\n" redit-read-command redit-client-session-id redit-client-editor-id (gen-seqno) linenum 0)) -;; (while (eq nil -;; (accept-process-output redit-client-process))))) -;; (error "redit-client is not running."))) - - ;; linenumで指定された行の編集をサーバへ送る ;; redit-client-process に insert コマンドと ;; バッファ(sid)番号、行番号、行の内容を送り、 Ack を受け取る @@ -455,33 +425,6 @@ )) (error "redit-client is not running."))) -;; redit-client-process へcloseコマンドを送る -;;(defun redit-client-close () -;; "Save File and exit Remote-edit client." -;; (interactive) -;; (let ((line redit-client-previous-line)) -;; (redit-client-insert-line line nil) -;; (process-send-string -;; redit-client-process -;; (concat -;; ;; obsolete send string -;; ;; (format "%10d%10d%10d%10d%10d%10d" (string-to-number redit-close-command) redit-client-session-id redit-client-editor-id (gen-seqno) 0 0) -;; (redit-pack -;; redit-close-command -;; redit-client-session-id -;; redit-client-editor-id -;; (gen-seqno) 0 0) "\n")))) - -;; redit-client-process を終了させる -;;(defun redit-client-kill () -;; "Stop Remote-Edit client process." -;; (interactive) -;; (if redit-client-process -;; (kill-process redit-client-process)) -;; (if redit-client-buffer -;; (kill-buffer redit-client-buffer)) -;; (kill-all-local-variables)) - ;; proc == redit-client-process ;; string == redit-client-process からの output (defun redit-client-process-filter (proc string) @@ -572,41 +515,6 @@ 'redit-client-after-change-function t) ) -;; window-scroll-functions に hook される。 -;; window がスクロールする度に呼ばれる -;;(defun redit-client-update-function (window window-start) -;; (if (equal (window-buffer) redit-client-buffer) -;; (save-excursion -;; (remove-hook 'before-change-functions -;; 'redit-client-before-change-function t) -;; (remove-hook 'after-change-functions -;; 'redit-client-after-change-function t) -;; ;; read part. -;; (while (and (= (point-max) -;; (window-end nil t)) -;; (> redit-client-line-max-in-server -;; (real-count-lines (window-end nil t)))) -;; ;; (count-lines (window-end nil t)))) -;; (redit-client-read-line (real-count-lines (window-end nil t)))) -;; -;; (if (not (= (count-lines (point-min) (window-end nil t)) -;; (real-count-lines (window-end nil t)))) -;; (redit-client-read-line -;; (progn (goto-line redit-client-line-max-in-server) -;; (real-count-lines (point))))) -;; -;; (if (< redit-client-line-max-in-server -;; (real-count-lines (window-end nil t))) -;; (progn (goto-line (window-end nil t)) -;; (delete-region -;; (progn (beginning-of-line) (backward-char) (point)) -;; (progn (forward-char) (end-of-line) (point))))) -;; -;; (add-hook 'before-change-functions -;; 'redit-client-before-change-function t t) -;; (add-hook 'after-change-functions -;; 'redit-client-after-change-function t t)))) - ;; currentp の位置の行数を返す (defun real-count-lines (currentp) (+ (count-lines (point-min) currentp) @@ -614,13 +522,6 @@ 0) 1 0))) -;;(defun limited-save-excursion (&rest exprs) -;; (let ((saved-point (point))) -;; (while exprs -;; (eval (car exprs)) -;; (setq exprs (cdr exprs))) -;; (goto-char saved-point))) - ;; before-change-functions に hook される ;; バッファが変更される直前に呼ばれる。 ;; begin と end には変更前の変更部分の始まりと終わりの point が入る @@ -758,78 +659,6 @@ ) ))) -;; 何用?相手が開いてるファイルを取得するのかな? -;; read みたいなもん? -;; 引き数 string (buf_num + line_num + text_data) -;;(defun redit-client-exec-open-ack (string) -;; (save-excursion -;; (let ((bufnum (redit-get-editor-id-from-pkt string)) -;; (linenum (redit-get-line-number-from-pkt string))) -;; (make-variable-buffer-local 'redit-client-buffer-name) -;; (make-variable-buffer-local 'redit-client-editor-id) -;; (setq redit-client-buffer-name -;; (redit-get-text-from-pkt string)) -;; (setq redit-client-buffer (get-buffer-create redit-client-buffer-name)) -;; ;; プロセスとバッファを関連づける -;; (set-process-buffer redit-client-process redit-client-buffer) -;; (switch-to-buffer redit-client-buffer) ;; windowのバッファを変更する -;; (make-variable-buffer-local 'redit-client-previous-edited-line) -;; (make-variable-buffer-local 'redit-client-after-edited-line) -;; (make-variable-buffer-local 'redit-client-line-max-in-server) -;; (make-variable-buffer-local 'redit-client-previous-line) -;; (setq redit-client-line-max-in-server linenum) -;; (setq redit-client-editor-id bufnum) -;; (setq redit-client-previous-edited-line 1) -;; (setq redit-client-after-edited-line 1) -;; (setq redit-client-previous-line 1) -;; -;; ;;(add-hook 'before-change-functions -;; ;;'redit-client-before-change-function t t) -;; ;;(add-hook 'after-change-functions -;; ;;'redit-client-after-change-function t t) -;; -;; ;; not necessary since Emacs 21.1 -;; ;; (make-local-hook 'window-scroll-functions) -;; -;; ;; window がスクロールする度に呼ばれる関数群 -;; (add-hook 'window-scroll-functions -;; 'redit-client-update-function t t)))) - - -;; string (line_num + text_data) で指定された行に -;; text_data を挿入する -;;(defun redit-client-exec-read-ack (string) -;; (save-excursion -;; (let ((lines (redit-get-line-number-from-pkt string))) -;; ;; redit-client-buffer をカレントバッファにする -;; (set-buffer redit-client-buffer) -;; (goto-line lines) -;; (beginning-of-line) ;; 行の始めへ移動 -;; ;; (delete-region (progn (beginning-of-line) (point)) -;; ;; (progn (end-of-line) (point))) -;; (insert (redit-get-text-from-pkt string))))) ;; テキストデータを挿入 - -;; redit-client-line-max-in-server に行番号を入れてる(だけ) -;;(defun redit-client-exec-insert-ack (string) -;; (save-excursion -;; (set-buffer redit-client-buffer) -;; (let ((linenum (redit-get-line-number-from-pkt string ))) -;; (setq redit-client-line-max-in-server linenum)))) -;; -;;(defun redit-client-exec-delete-line-ack (string) -;; (save-excursion -;; (set-buffer redit-client-buffer) -;; (let ((linenum (redit-get-line-number-from-pkt string))) -;; (setq redit-client-line-max-in-server linenum)))) - -;; プロセスとバッファ、ローカル変数を削除する -;;(defun redit-client-exec-close-ack (string) -;; (if redit-client-process -;; (kill-process redit-client-process)) -;; (if redit-client-buffer -;; (kill-buffer redit-client-buffer)) -;; (kill-all-local-variables)) - ;; 引き数で与えられた string から Editor IDを取得する (defun redit-client-exec-join (filename sid eid) (let ((bufname) (sinfo)) @@ -893,137 +722,6 @@ (setq redit-client-seqno (+ redit-client-seqno 1))) -;;(defun redit-line-translate-out (cque rque) -;; "redit line translate for output" -;; (let ((cc) (rc) (xcc) (xrc) (ccc) (crc) (cignore 0) (rignore 0)) -;; (setq xcc 0) -;; (setq xrc 0) -;; (setq cignore 0) -;; (setq rignore 0) -;; (while cque -;; (setq cc (car cque)) -;; (while rque -;; (setq rc (car rque)) -;; ;; -------- translation ------------ -;; -;; (if (< (+ (redit-get-line-from-queue cc) xcc) (+ (redit-get-line-from-queue rc) xrc)) -;; (if (= (redit-get-command-from-queue cc) redit-insert-command) (setq xrc (- xrc 1))) -;; (if (= (redit-get-command-from-queue cc) redit-delete-line-command) (setq xrc (- xrc 1)))) -;; -;; (if (> (+ (redit-get-line-from-queue cc) xcc) (+ (redit-get-line-from-queue rc) xrc)) -;; (if (= (redit-get-command-from-queue rc) redit-insert-command) (setq xcc (+ xcc 1))) -;; (if (= (redit-get-command-from-queue rc) redit-delete-line-command) (setq xcc (- xcc 1)))) -;; -;; (if (= (+ (redit-get-line-from-queue cc) xcc) (+ (redit-get-line-from-queue rc) xrc)) -;; (if (= (redit-get-command-from-queue rc) redit-insert-command) (setq xcc (+ xcc 1))) -;; (if (= (redit-get-command-from-queue rc) redit-replace-command) -;; (if (= (redit-get-command-from-queue cc) redit-insert-command) (setq xrc (+ xrc 1))) -;; (if (= (redit-get-command-from-queue cc) redit-replace-command) (setq cignore 1)) -;; (if (= (redit-get-command-from-queue cc) redit-delete-line-command) (setq crc redit-insert-command) (setq cignore 1)))) -;; -;; (if (= (redit-get-command-from-queue rc) redit-delete-line-command) -;; (if (= (redit-get-command-from-queue cc) redit-insert-command) (setq xrc (+ (redit-get-line-from-queue rc) 1))) -;; (if (= (redit-get-command-from-queue cc) redit-replace-command) (setq cignore 1)) -;; (if (= (redit-get-command-from-queue cc) redit-delete-line-command) (setq cignore 1) (setq rignore 1))) -;; -;; ;; -------- translation ------------ -;; -;; (setq rque (cdr rque))) ;; while rque -;; -;; ;; ignore -;; (if (= cignore 1) -;; ;; xxx -;; (setq cignore 0)) -;; (if (= rignore 1) -;; ;; xxx -;; (setq cignore 0)) -;; -;; ;; -------- add after que ------------ -;; (enqueue after-CQ (concat (format "%2d%2d%9d" (redit-get-command-from-queue cc) (redit-get-uid-from-queue cc) (+ (redit-get-line-from-queue cc) xcc)) (redit-get-text-from-queue cc))) -;; ;; -------- add after que ------------ -;; -;; (setq cque (cdr cque))) ;; while cque -;; ) ;; let -;; ) ;; defun -;; -;;(defun redit-line-translate-in (cque rque) -;; "redit line translate for input" -;; (let ((cc) (rc) (xcc) (xrc) (ccc) (crc) (cignore 0) (rignore 0)) -;; (setq xcc 0) -;; (setq xrc 0) -;; (setq cignore 0) -;; (setq rignore 0) -;; (while rque -;; (setq rc (car rque)) -;; (setq cignore 0) -;; (setq rignore 0) -;; (while cque -;; (setq cc (car cque)) -;; ;; -------- translation ------------ -;; -;; (if (and (= cignore 1) (= rignore 1)) -;; (if (< (+ (redit-get-line-from-queue rc) xrc) (+ (redit-get-line-from-queue cc) xcc)) -;; (if (= (redit-get-command-from-queue rc) redit-insert-command) (setq xcc (+ xcc 1))) -;; (if (= (redit-get-command-from-queue rc) redit-delete-line-command) (setq xcc (- xcc 1)))) -;; -;; (if (> (+ (redit-get-line-from-queue rc) xrc) (+ (redit-get-line-from-queue cc) xcc)) -;; (if (= (redit-get-command-from-queue cc) redit-insert-command) (setq xrc (- xrc 1))) -;; (if (= (redit-get-command-from-queue cc) redit-delete-line-command) (setq xrc (+ xrc 1)))) -;; -;; (if (= (+ (redit-get-line-from-queue rc) xrc) (+ (redit-get-line-from-queue cc) xcc)) -;; (if (= (redit-get-command-from-queue cc) redit-insert-command) (setq xcc (+ xcc 1))) -;; (if (= (redit-get-command-from-queue cc) redit-replace-command) -;; (if (= (redit-get-command-from-queue rc) redit-insert-command) (setq xcc (+ xcc 1))) -;; (if (= (redit-get-command-from-queue rc) redit-replace-command) (setq cignore 1)) -;; (if (= (redit-get-command-from-queue rc) redit-delete-line-command) (setq crc redit-insert-command) (setq cignore 1)))) -;; (if (= (redit-get-command-from-queue cc) redit-delete-line-command) -;; (if (= (redit-get-command-from-queue rc) redit-insert-command) (setq xcc (+ (redit-get-line-from-queue cc) 1))) -;; (if (= (redit-get-command-from-queue rc) redit-replace-command) (setq crc redit-insert-command) (setq cignore 1)) -;; (if (= (redit-get-command-from-queue rc) redit-delete-line-command) (setq cignore 1) (setq rignore 1)))) -;; -;; ;; -------- translation ------------ -;; -;; (setq cque (cdr cque))) ;; while rque -;; -;; ;; ignore -;; (if (= cignore 1) -;; ;; xxx -;; (setq cignore 0)) -;; (if (= rignore 1) -;; ;; xxx -;; (setq rignore 0)) -;; -;; ;; -------- add after que ------------ -;; (enqueue after-RQ (concat (format "%2d%2d%9d" (redit-get-command-from-queue rc) (redit-get-uid-from-queue rc) (+ (redit-get-line-from-queue rc) xrc)) (redit-get-text-from-queue rc))) -;; ;; -------- add after que ------------ -;; -;; (setq rque (cdr rque))) ;; while cque -;; ) ;; let -;; ) ;; defun - -;; for debug -;;(defun redit-client-print-command-queue () -;; "Print command queue." -;; (interactive) -;; ;;(message redit-client-command-queue)) -;; (let (queue) -;; (setq queue redit-client-command-queue) -;; (while (Queue-front queue) -;; (message (Queue-front queue)) -;; (setq queue (cdr (Queue-rear queue))) -;; ))) -;; -;;(defun redit-client-print-recive-queue () -;; "Print command queue." -;; (interactive) -;; (print redit-client-receive-queue)) -;; -;;(defun redit-client-print-send-queue () -;; "Print command queue." -;; (interactive) -;; (print redit-client-send-queue)) -;; - (defun is-value-in-range (min value max) (if (and (<= min value) (<= value max)) t nil)) \ No newline at end of file