• R/O
  • HTTP
  • SSH
  • HTTPS

tamago-tsunagi: コミット

Tamago-tsunagiのGitリポジトリです。


コミットメタ情報

リビジョンbcfcdde2943a610d1abdeceb42abf211cc45d752 (tree)
日時2015-02-02 16:30:52
作者Mitsutoshi NAKANO <bkbin005@rink...>
コミッターMitsutoshi NAKANO

ログメッセージ

patched to FreeBSD's tamago-emacs24-4.0.6.0.20041122.19_12

On branch FreeBSDbase
Changes to be committed:

modified: Makefile.in
modified: egg-com.el
modified: egg.el
modified: egg/anthy.el
modified: egg/anthyipc.el
modified: egg/canna.el
modified: egg/cannarpc.el
modified: egg/sj3.el
modified: egg/sj3rpc.el
modified: egg/wnn.el
modified: egg/wnnrpc.el
modified: menudiag.el

変更サマリ

差分

--- a/Makefile.in
+++ b/Makefile.in
@@ -54,8 +54,7 @@ TOPSRCS = \
5454 egg-sim.el \
5555 menudiag.el \
5656 its.el \
57- its-keydef.el \
58- leim-list.el \
57+ its-keydef.el
5958
6059 #
6160 EGGSRCS = \
@@ -115,7 +114,7 @@ install: install-site
115114
116115 install-site: all
117116 echo "Egg system will be installed in ${lispdir}/egg...."; \
118- if [ -d -p ${DESTDIR}${lispdir}/egg ]; then \
117+ if [ -d ${DESTDIR}${lispdir}/egg ]; then \
119118 echo "Clean up the previsous installation...."; \
120119 rm -rf ${DESTDIR}${lispdir}/egg/*; \
121120 else \
@@ -123,20 +122,20 @@ install-site: all
123122 mkdir -p ${DESTDIR}${lispdir}/egg; \
124123 fi; \
125124 #
126- for FILE in ${TOPSRCS} ${TOPELCS} ${INITELS}; \
125+ for FILE in ${TOPELCS} ${INITELS}; \
127126 do \
128127 ${INSTALL_DATA} $${FILE} ${DESTDIR}${lispdir}/egg/; \
129128 done; \
130129 #
131130 mkdir -p ${DESTDIR}${lispdir}/egg/egg ; \
132- for FILE in ${EGGSRCS} ${EGGELCS} ; \
131+ for FILE in ${EGGELCS} ; \
133132 do \
134133 ${INSTALL_DATA} $${FILE} ${DESTDIR}${lispdir}/egg/egg; \
135134 done; \
136135 touch ${DESTDIR}${lispdir}/egg/egg/.nosearch; \
137136 #
138137 mkdir -p ${DESTDIR}${lispdir}/egg/its ; \
139- for FILE in ${ITSSRCS} ${ITSELCS} ; \
138+ for FILE in ${ITSELCS} ; \
140139 do \
141140 ${INSTALL_DATA} $${FILE} ${DESTDIR}${lispdir}/egg/its ; \
142141 done; \
--- a/egg-com.el
+++ b/egg-com.el
@@ -598,8 +598,7 @@
598598 (set-buffer work)
599599 (erase-buffer)
600600 (if (null (stringp from))
601- (save-excursion
602- (set-buffer buf)
601+ (with-current-buffer buf
603602 (setq from (buffer-substring from to))))
604603 (insert (string-as-multibyte from))
605604 (encode-fixed-euc-china-region 1 (point-max) type)
@@ -989,8 +988,7 @@ See `comm-format' for FORMAT."
989988 ,@vlist)
990989 (if (and (memq (process-status proc) '(open run))
991990 (buffer-live-p buffer))
992- (save-excursion
993- (set-buffer buffer)
991+ (with-current-buffer buffer
994992 (let ,euc-select
995993 (erase-buffer)
996994 ,send-expr
--- a/egg.el
+++ b/egg.el
@@ -120,10 +120,10 @@
120120
121121 (defun egg-activate-keymap-after-command ()
122122 (while egg-change-major-mode-buffer
123- (save-excursion
124- (when (buffer-live-p (car egg-change-major-mode-buffer))
125- (set-buffer (car egg-change-major-mode-buffer))
126- (egg-activate-keymap))
123+ (let ((buf (car egg-change-major-mode-buffer)))
124+ (if (buffer-live-p buf)
125+ (with-current-buffer buf
126+ (egg-activate-keymap)))
127127 (setq egg-change-major-mode-buffer (cdr egg-change-major-mode-buffer))))
128128 (remove-hook 'post-command-hook 'egg-activate-keymap-after-command))
129129
@@ -167,7 +167,7 @@
167167 (setq egg-modefull-mode t)
168168 (its-define-select-keys egg-modefull-map))
169169 (setq egg-modeless-mode t))
170- (set (if (boundp 'deactivate-current-input-method-function)
170+ (set (if (fboundp 'deactivate-current-input-method-function)
171171 'deactivate-current-input-method-function
172172 'inactivate-current-input-method-function)
173173 'egg-mode)
@@ -180,7 +180,7 @@
180180 (run-hooks 'egg-mode-hook)))
181181
182182 (defun egg-exit-from-minibuffer ()
183- (if (boundp 'deactivate-input-method)
183+ (if (fboundp 'deactivate-input-method)
184184 (deactivate-input-method)
185185 (inactivate-input-method))
186186 (if (<= (minibuffer-depth) 1)
--- a/egg/anthy.el
+++ b/egg/anthy.el
@@ -150,8 +150,7 @@
150150 (set-process-coding-system anthy-egg-proc cs cs)
151151 (set-process-sentinel anthy-egg-proc 'anthy-egg-proc-sentinel)
152152 (set-marker-insertion-type (process-mark anthy-egg-proc) t)
153- (save-excursion
154- (set-buffer buf)
153+ (with-current-buffer buf
155154 (erase-buffer)
156155 (buffer-disable-undo))
157156 (anthyipc-get-greeting anthy-egg-proc)))
@@ -404,8 +403,7 @@ Return the list of bunsetsu."
404403 (let ((buf (get-buffer-create anthy-egg-dic-buffer-name))
405404 (cs (if anthy-egg-use-utf8 'utf-8-unix 'euc-japan-unix))
406405 proc)
407- (save-excursion
408- (set-buffer buf)
406+ (with-current-buffer buf
409407 (setq proc (apply 'start-process "anthy-egg-dic" buf
410408 anthy-egg-dic-util-command
411409 (if anthy-egg-use-utf8
--- a/egg/anthyipc.el
+++ b/egg/anthyipc.el
@@ -46,8 +46,7 @@
4646 ,@vlist)
4747 (if (and (eq (process-status proc) 'run)
4848 (buffer-live-p buffer))
49- (save-excursion
50- (set-buffer buffer)
49+ (with-current-buffer buffer
5150 (erase-buffer)
5251 ,send-expr
5352 (goto-char (point-max))
--- a/egg/canna.el
+++ b/egg/canna.el
@@ -134,7 +134,7 @@
134134 (defun canna-make-backend (lang env &optional source-lang converted-lang)
135135 (let ((finalize (canna-backend-func-name "canna-finalize-backend" lang))
136136 (backend (canna-backend-func-name "canna-backend" lang env)))
137- (if (null (fboundp finalize))
137+ (if (null (fboundp 'finalize))
138138 (progn
139139 (fset finalize (function (lambda () (canna-finalize-backend))))
140140 (egg-set-finalize-backend (list finalize))))
@@ -319,8 +319,7 @@ katakana to candidates list. NOSTUDY specifies not study."
319319 (unwind-protect
320320 (progn
321321 (setq buf (generate-new-buffer " *CANNA*"))
322- (save-excursion
323- (set-buffer buf)
322+ (with-current-buffer buf
324323 (erase-buffer)
325324 (buffer-disable-undo)
326325 (set-buffer-multibyte nil)
--- a/egg/cannarpc.el
+++ b/egg/cannarpc.el
@@ -79,8 +79,7 @@
7979 (list
8080 'let v
8181 (append
82- `(save-excursion
83- (set-buffer (process-buffer proc))
82+ `(with-current-buffer (process-buffer proc)
8483 (erase-buffer)
8584 ,send-expr
8685 (process-send-region proc (point-min) (point-max))
--- a/egg/sj3.el
+++ b/egg/sj3.el
@@ -149,8 +149,7 @@ Don't specify the optional arguments in normal use."
149149 (set-process-query-on-exit-flag proc nil)
150150 (set-process-coding-system proc 'binary 'binary)
151151 (set-marker-insertion-type (process-mark proc) t)
152- (save-excursion
153- (set-buffer buf)
152+ (with-current-buffer buf
154153 (erase-buffer)
155154 (buffer-disable-undo)
156155 (set-buffer-multibyte nil))
@@ -177,8 +176,7 @@ Don't specify the optional arguments in normal use."
177176 ;; (let* ((buf (generate-new-buffer " *SJ3*"))
178177 ;; (msg-form "SJ3: connecting to sj3serv at %s...")
179178 ;; hostname proc result msg)
180-;; (save-excursion
181-;; (set-buffer buf)
179+;; (with-current-buffer buf
182180 ;; (erase-buffer)
183181 ;; (buffer-disable-undo)
184182 ;; (setq enable-multibyte-characters nil))
--- a/egg/sj3rpc.el
+++ b/egg/sj3rpc.el
@@ -86,8 +86,7 @@ SJ3 server. Valid coding systems are depend on the server spec.")
8686 (list
8787 'let v
8888 (append
89- `(save-excursion
90- (set-buffer (process-buffer proc))
89+ `(with-current-buffer (process-buffer proc)
9190 (erase-buffer)
9291 ,send-expr
9392 (process-send-region proc (point-min) (point-max))
--- a/egg/wnn.el
+++ b/egg/wnn.el
@@ -142,7 +142,7 @@ by ':' and digit N."
142142 (defun wnn-make-backend (lang env &optional source-lang converted-lang)
143143 (let ((finalize (wnn-backend-func-name "wnn-finalize-backend" lang))
144144 (backend (wnn-backend-func-name "wnn-backend" lang env)))
145- (if (null (fboundp finalize))
145+ (if (null (fboundp 'finalize))
146146 (progn
147147 (fset finalize `(lambda () (wnn-finalize-backend ',lang)))
148148 (egg-set-finalize-backend (list finalize))))
@@ -1235,8 +1235,7 @@ Return the list of bunsetsu."
12351235 (unwind-protect
12361236 (progn
12371237 (setq buf (generate-new-buffer (wnn-server-buffer-name server-info)))
1238- (save-excursion
1239- (set-buffer buf)
1238+ (with-current-buffer buf
12401239 (erase-buffer)
12411240 (buffer-disable-undo)
12421241 (set-buffer-multibyte nil)
--- a/egg/wnnrpc.el
+++ b/egg/wnnrpc.el
@@ -1722,8 +1722,7 @@ HINSHI and FUZOKUGO are information of preceding bunsetsu."
17221722 (insert contents)
17231723 (if (= result 2)
17241724 (insert-file-contents local-filename nil (1- (point))))
1725- (save-excursion
1726- (set-buffer (process-buffer proc))
1725+ (with-current-buffer (process-buffer proc)
17271726 (wnnrpc-get-result)))))))))
17281727 ((quit error)
17291728 (wnnrpc-call-with-environment env ()
--- a/menudiag.el
+++ b/menudiag.el
@@ -630,8 +630,7 @@
630630 (defun menudiag-selection-goto-internal ()
631631 (let* ((list menudiag-goto-number-list)
632632 (n (menudiag-selection-item-number list))
633- (len (save-excursion
634- (set-buffer menudiag-selection-main-buffer)
633+ (len (with-current-buffer menudiag-selection-main-buffer
635634 (length menudiag-current-items))))
636635 (setq this-command 'menudiag-selection-goto)
637636 (if (>= n len)
旧リポジトリブラウザで表示