CVS update by viteno packages ...
18 years, 7 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/10/06 19:36:45
Modified: packages ChangeLog
Log:
Package release
Revision Changes Path
1.568 +4 -0 XEmacs/packages/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/ChangeLog,v
retrieving revision 1.567
retrieving revision 1.568
diff -u -p -r1.567 -r1.568
--- ChangeLog 2005/09/26 06:15:34 1.567
+++ ChangeLog 2005/10/06 17:36:44 1.568
＠＠ -1,3 +1,7 ＠＠
+2005-10-06 Norbert Koch <viteno(a)xemacs.org>
+
+ * Packages released: ediff net-utils viper.
+
2005-09-26 Norbert Koch <viteno(a)xemacs.org>
* Packages released: ecrypto mail-lib.
- 1 participants
- 0 comments
CVS update by michaelk packages/xemacs-packages/viper, viper-cmd.el ...
18 years, 7 months
CVS Monitor
CVS Monitor
User: michaelk
Date: 05/10/06 02:22:02
Modified: packages/xemacs-packages/viper viper.el viper-init.el
viper-cmd.el ChangeLog
Log:
* viper-cmd.el (viper-normalize-minor-mode-map-alist,
viper-refresh-mode-line): use make-local-variable to localize some vars
instead of make-variable-buffer-local. Suggested by Stefan Monnier.
* viper-init.el (viper-make-variable-buffer-local): delete alias.
(viper-restore-cursor-type,viper-set-insert-cursor-type): use
make-local-variable instead of make-variable-buffer-local. Suggested by
Stefan Monnier.
* viper.el (viper-mode): don't use viper-make-variable-buffer-local.
(viper-comint-mode-hook): use make-local-variable on
require-final-newline.
(viper-non-hook-settings): don't use make-variable-buffer-local.
Revision Changes Path
1.33 +7 -23 XEmacs/packages/xemacs-packages/viper/viper.el
Index: viper.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/viper/viper.el,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- viper.el 2005/09/20 17:58:30 1.32
+++ viper.el 2005/10/06 00:22:01 1.33
＠＠ -9,7 +9,7 ＠＠
;; Author: Michael Kifer <kifer(a)cs.stonybrook.edu>
;; Keywords: emulations
-(defconst viper-version "3.11.5 of September 19, 2005"
+(defconst viper-version "3.11.5 of October 5, 2005"
"The current version of Viper")
;; This file is part of GNU Emacs.
＠＠ -605,8 +605,6 ＠＠ This startup message appears whenever yo
))
(viper-set-expert-level 'dont-change-unless)))
- (if viper-xemacs-p
- (viper-make-variable-buffer-local 'bar-cursor))
(if (eq major-mode 'viper-mode)
(setq major-mode 'fundamental-mode))
＠＠ -627,8 +625,8 ＠＠ This startup message appears whenever yo
;; This hook designed to enable Vi-style editing in comint-based modes."
(defun viper-comint-mode-hook ()
- (setq require-final-newline nil
- viper-ex-style-editing nil
+ (set (make-local-variable 'require-final-newline) nil)
+ (setq viper-ex-style-editing nil
viper-ex-style-motion nil)
(viper-change-state-to-insert))
＠＠ -1000,17 +998,6 ＠＠ It also can't undo some Viper settings."
;; these are primarily advices and Vi-ish variable settings
(defun viper-non-hook-settings ()
- ;; This var is not local in Emacs, so we make it local. It must be local
- ;; because although the stack of minor modes can be the same for all buffers,
- ;; the associated *keymaps* can be different. In Viper,
- ;; viper-vi-local-user-map, viper-insert-local-user-map, and others can have
- ;; different keymaps for different buffers. Also, the keymaps associated
- ;; with viper-vi/insert-state-modifier-minor-mode can be different.
- ;; ***This is needed only in case emulation-mode-map-alists is not defined
- (unless
- (and (fboundp 'add-to-ordered-list) (boundp 'emulation-mode-map-alists))
- (viper-make-variable-buffer-local 'minor-mode-map-alist))
-
;; Viper changes the default mode-line-buffer-identification
(setq-default mode-line-buffer-identification '(" %b"))
＠＠ -1018,8 +1005,6 ＠＠ It also can't undo some Viper settings."
(setq next-line-add-newlines nil
require-final-newline t)
- (viper-make-variable-buffer-local 'require-final-newline)
-
;; don't bark when mark is inactive
(if viper-emacs-p
(setq mark-even-if-inactive t))
＠＠ -1027,7 +1012,6 ＠＠ It also can't undo some Viper settings."
(setq scroll-step 1)
;; Variable displaying the current Viper state in the mode line.
- (viper-deflocalvar viper-mode-string viper-emacs-state-id)
(or (memq 'viper-mode-string global-mode-string)
(setq global-mode-string
(append '("" viper-mode-string) (cdr global-mode-string))))
＠＠ -1336,9 +1320,9 ＠＠ These two lines must come in the order g
(provide 'viper)
-;;; Local Variables:
-;;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun)
-;;; End:
+;; Local Variables:
+;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun)
+;; End:
-;;; arch-tag: 5f3e844c-c4e6-4bbd-9b73-63bdc14e7d79
+;; arch-tag: 5f3e844c-c4e6-4bbd-9b73-63bdc14e7d79
;;; viper.el ends here
1.20 +6 -11 XEmacs/packages/xemacs-packages/viper/viper-init.el
Index: viper-init.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/viper/viper-init.el,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- viper-init.el 2005/09/20 17:58:30 1.19
+++ viper-init.el 2005/10/06 00:22:01 1.20
＠＠ -115,11 +115,6 ＠＠ In all likelihood, you don't need to bot
;;; Macros
-;; Fool the compiler to avoid warnings.
-;; Viper calls make-variable-buffer-local from within other functions, which
-;; triggers compiler warnings.
-(defalias 'viper-make-variable-buffer-local 'make-variable-buffer-local)
-
(defmacro viper-deflocalvar (var default-value &optional documentation)
`(progn
(defvar ,var ,default-value
＠＠ -1019,19 +1014,19 ＠＠ Should be set in `~/.viper' file."
(defun viper-restore-cursor-type ()
(condition-case nil
(if viper-xemacs-p
- (setq bar-cursor nil)
+ (set (make-local-variable 'bar-cursor) nil)
(setq cursor-type default-cursor-type))
(error nil)))
(defun viper-set-insert-cursor-type ()
(if viper-xemacs-p
- (setq bar-cursor 2)
+ (set (make-local-variable 'bar-cursor) 2)
(setq cursor-type '(bar . 2))))
-;;; Local Variables:
-;;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun)
-;;; End:
+;; Local Variables:
+;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun)
+;; End:
-;;; arch-tag: 4efa2416-1fcb-4690-be10-1a2a0248d250
+;; arch-tag: 4efa2416-1fcb-4690-be10-1a2a0248d250
;;; viper-init.el ends here
1.31 +16 -9 XEmacs/packages/xemacs-packages/viper/viper-cmd.el
Index: viper-cmd.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/viper/viper-cmd.el,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- viper-cmd.el 2005/09/20 17:58:30 1.30
+++ viper-cmd.el 2005/10/06 00:22:01 1.31
＠＠ -494,13 +494,20 ＠＠
viper-empty-keymap))
))
- ;; in emacs with emulation-mode-map-alists, nothing needs to be done
+ ;; This var is not local in Emacs, so we make it local. It must be local
+ ;; because although the stack of minor modes can be the same for all buffers,
+ ;; the associated *keymaps* can be different. In Viper,
+ ;; viper-vi-local-user-map, viper-insert-local-user-map, and others can have
+ ;; different keymaps for different buffers. Also, the keymaps associated
+ ;; with viper-vi/insert-state-modifier-minor-mode can be different.
+ ;; ***This is needed only in case emulation-mode-map-alists is not defined.
+ ;; In emacs with emulation-mode-map-alists, nothing needs to be done
(unless
(and (fboundp 'add-to-ordered-list) (boundp 'emulation-mode-map-alists))
- (setq minor-mode-map-alist
- (viper-append-filter-alist
- (append viper--intercept-key-maps viper--key-maps)
- minor-mode-map-alist)))
+ (set (make-local-variable 'minor-mode-map-alist)
+ (viper-append-filter-alist
+ (append viper--intercept-key-maps viper--key-maps)
+ minor-mode-map-alist)))
)
＠＠ -509,7 +516,7 ＠＠
;; Modifies mode-line-buffer-identification.
(defun viper-refresh-mode-line ()
- (setq viper-mode-string
+ (set (make-local-variable 'viper-mode-string)
(cond ((eq viper-current-state 'emacs-state) viper-emacs-state-id)
((eq viper-current-state 'vi-state) viper-vi-state-id)
((eq viper-current-state 'replace-state) viper-replace-state-id)
＠＠ -2160,7 +2167,7 ＠＠ problems."
(setq keymap (or keymap minibuffer-local-map)
initial (or initial "")
temp-msg (if default
- (format "(default: %s) " default)
+ (format "(default %s) " default)
""))
(setq viper-incomplete-ex-cmd nil)
＠＠ -4781,7 +4788,7 ＠＠ sensitive for VI-style look-and-feel."
level-changed t)
(insert "
Please specify your level of familiarity with the venomous VI PERil
-(and the VI Plan for Emacs Rescue).
+\(and the VI Plan for Emacs Rescue).
You can change it at any time by typing `M-x viper-set-expert-level RET'
1 -- BEGINNER: Almost all Emacs features are suppressed.
＠＠ -5000,5 +5007,5 ＠＠ Mail anyway (y or n)? ")
-;;; arch-tag: 739a6450-5fda-44d0-88b0-325053d888c2
+;; arch-tag: 739a6450-5fda-44d0-88b0-325053d888c2
;;; viper-cmd.el ends here
1.64 +16 -0 XEmacs/packages/xemacs-packages/viper/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/viper/ChangeLog,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- ChangeLog 2005/09/21 07:16:16 1.63
+++ ChangeLog 2005/10/06 00:22:01 1.64
＠＠ -1,3 +1,19 ＠＠
+2005-10-05 Michael Kifer <kifer(a)cs.stonybrook.edu>
+
+ * viper-cmd.el (viper-normalize-minor-mode-map-alist,
+ viper-refresh-mode-line): use make-local-variable to localize some vars
+ instead of make-variable-buffer-local. Suggested by Stefan Monnier.
+
+ * viper-init.el (viper-make-variable-buffer-local): delete alias.
+ (viper-restore-cursor-type,viper-set-insert-cursor-type): use
+ make-local-variable instead of make-variable-buffer-local. Suggested by
+ Stefan Monnier.
+
+ * viper.el (viper-mode): don't use viper-make-variable-buffer-local.
+ (viper-comint-mode-hook): use make-local-variable on
+ require-final-newline.
+ (viper-non-hook-settings): don't use make-variable-buffer-local.
+
2005-09-21 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.43 released.
- 1 participants
- 0 comments
CVS update by michaelk packages/xemacs-packages/ediff, ediff-wind.el, ediff-mult.el ...
18 years, 7 months
CVS Monitor
CVS Monitor
User: michaelk
Date: 05/10/06 02:17:46
Modified: packages/xemacs-packages/ediff ediff.texi ediff.el
ediff-wind.el ediff-util.el ediff-ptch.el
ediff-mult.el ediff-merg.el ChangeLog
Log:
* ediff-merge.el (ediff-merge-region-is-non-clash): new defsubst.
(ediff-merge-region-is-non-clash-to-skip): previouslu called
ediff-merge-region-is-non-clash.
* ediff-mult.el (ediff-append-custom-diff,ediff-meta-show-patch): use
insert-buffer-substring.
* ediff-ptch.el (ediff-fixup-patch-map): use better heuristics for
selecting files to patch. Also bug fixes.
* ediff-util.el (ediff-setup): bug fix.
(ediff-next-difference): Never skip clashes that differ in white space
only.
* ediff-wind.el (ediff-setup-control-frame,ediff-destroy-control-frame):
check the menubar feature.
Revision Changes Path
1.33 +1 -0 XEmacs/packages/xemacs-packages/ediff/ediff.texi
Index: ediff.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ediff.texi,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- ediff.texi 2005/09/20 17:54:28 1.32
+++ ediff.texi 2005/10/06 00:17:44 1.33
＠＠ -2416,6 +2416,7 ＠＠ Aaron Gross (aaron＠(a)bfr.co.il),
Thorbjoern Hansen (thorbjoern.hansen＠(a)mchp.siemens.de),
Marcus Harnisch (marcus_harnisch＠(a)mint-tech.com),
Steven E. Harris (seh＠(a)panix.com),
+Aaron S. Hawley (Aaron.Hawley＠(a)uvm.edu),
Xiaoli Huang (hxl＠(a)epic.com),
Andreas Jaeger (aj＠(a)suse.de),
Lars Magne Ingebrigtsen (larsi＠(a)ifi.uio.no),
1.31 +8 -8 XEmacs/packages/xemacs-packages/ediff/ediff.el
Index: ediff.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ediff.el,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- ediff.el 2005/09/20 17:54:28 1.30
+++ ediff.el 2005/10/06 00:17:44 1.31
＠＠ -8,7 +8,7 ＠＠
;; Keywords: comparing, merging, patching, tools, unix
(defconst ediff-version "2.80.1" "The current version of Ediff")
-(defconst ediff-date "September 19, 2005" "Date of last update")
+(defconst ediff-date "October 5, 2005" "Date of last update")
;; This file is part of GNU Emacs.
＠＠ -1261,13 +1261,13 ＠＠ buffer."
(setq rev1
(read-string
(format
- "Version 1 to merge (default: %s's working version): "
+ "Version 1 to merge (default %s's working version): "
(if (stringp file)
(file-name-nondirectory file) "current buffer")))
rev2
(read-string
(format
- "Version 2 to merge (default: %s): "
+ "Version 2 to merge (default %s): "
(if (stringp file)
(file-name-nondirectory file) "current buffer"))))
(ediff-load-version-control)
＠＠ -1293,19 +1293,19 ＠＠ buffer."
(setq rev1
(read-string
(format
- "Version 1 to merge (default: %s's working version): "
+ "Version 1 to merge (default %s's working version): "
(if (stringp file)
(file-name-nondirectory file) "current buffer")))
rev2
(read-string
(format
- "Version 2 to merge (default: %s): "
+ "Version 2 to merge (default %s): "
(if (stringp file)
(file-name-nondirectory file) "current buffer")))
ancestor-rev
(read-string
(format
- "Ancestor version (default: %s's base revision): "
+ "Ancestor version (default %s's base revision): "
(if (stringp file)
(file-name-nondirectory file) "current buffer"))))
(ediff-load-version-control)
＠＠ -1411,11 +1411,11 ＠＠ Uses `vc.el' or `rcs.el' depending on `e
(let (rev1 rev2)
(setq rev1
(read-string
- (format "Revision 1 to compare (default: %s's latest revision): "
+ (format "Revision 1 to compare (default %s's latest revision): "
(file-name-nondirectory file)))
rev2
(read-string
- (format "Revision 2 to compare (default: %s's current state): "
+ (format "Revision 2 to compare (default %s's current state): "
(file-name-nondirectory file))))
(ediff-load-version-control)
(funcall
1.20 +3 -2 XEmacs/packages/xemacs-packages/ediff/ediff-wind.el
Index: ediff-wind.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ediff-wind.el,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- ediff-wind.el 2005/09/20 17:54:29 1.19
+++ ediff-wind.el 2005/10/06 00:17:44 1.20
＠＠ -900,7 +900,7 ＠＠ into icons, regardless of the window man
(ediff-with-current-buffer ctl-buffer
(ediff-cond-compile-for-xemacs-or-emacs
- (set-buffer-menubar nil) ; xemacs
+ (when (featurep 'menubar) (set-buffer-menubar nil)) ; xemacs
nil ; emacs
)
;;(setq user-grabbed-mouse (ediff-user-grabbed-mouse))
＠＠ -1054,7 +1054,8 ＠＠ into icons, regardless of the window man
(if (and (ediff-window-display-p) (frame-live-p ediff-control-frame))
(let ((ctl-frame ediff-control-frame))
(ediff-cond-compile-for-xemacs-or-emacs
- (set-buffer-menubar default-menubar) ; xemacs
+ (when (featurep 'menubar)
+ (set-buffer-menubar default-menubar)) ; xemacs
nil ; emacs
)
(setq ediff-control-frame nil)
1.29 +14 -12 XEmacs/packages/xemacs-packages/ediff/ediff-util.el
Index: ediff-util.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ediff-util.el,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- ediff-util.el 2005/09/20 17:54:29 1.28
+++ ediff-util.el 2005/10/06 00:17:44 1.29
＠＠ -329,7 +329,7 ＠＠ to invocation.")
ediff-word-mode-job (ediff-word-mode-job))
;; Don't delete variants in case of ediff-buffer-* jobs without asking.
- ;; This is because u may loose work---dangerous.
+ ;; This is because one may loose work---dangerous.
(if (string-match "buffer" (symbol-name ediff-job-name))
(setq ediff-keep-variants t))
＠＠ -368,6 +368,7 ＠＠ to invocation.")
(save-excursion
(set-buffer buffer-C)
(insert-buffer-substring buf)
+ (goto-char (point-min))
(funcall (ediff-with-current-buffer buf major-mode))
(widen) ; merge buffer is always widened
(add-hook 'local-write-file-hooks 'ediff-set-merge-mode nil t)
＠＠ -1729,7 +1730,7 ＠＠ With a prefix argument, go forward that
(or (>= n ediff-number-of-differences)
(setq regexp-skip (funcall ediff-skip-diff-region-function n))
;; this won't exec if regexp-skip is t
- (setq non-clash-skip (ediff-merge-region-is-non-clash n)
+ (setq non-clash-skip (ediff-merge-region-is-non-clash-to-skip n)
skip-changed
(ediff-skip-merge-region-if-changed-from-default-p n))
(ediff-install-fine-diff-if-necessary n))
＠＠ -1744,6 +1745,7 ＠＠ With a prefix argument, go forward that
skip-changed
;; skip difference regions that differ in white space
(and ediff-ignore-similar-regions
+ (ediff-merge-region-is-non-clash n)
(or (eq (ediff-no-fine-diffs-p n) t)
(and (ediff-merge-job)
(eq (ediff-no-fine-diffs-p n) 'C)))
＠＠ -1754,7 +1756,7 ＠＠ With a prefix argument, go forward that
(or (>= n ediff-number-of-differences)
(setq regexp-skip (funcall ediff-skip-diff-region-function n))
;; this won't exec if regexp-skip is t
- (setq non-clash-skip (ediff-merge-region-is-non-clash n)
+ (setq non-clash-skip (ediff-merge-region-is-non-clash-to-skip n)
skip-changed
(ediff-skip-merge-region-if-changed-from-default-p n))
(ediff-install-fine-diff-if-necessary n))
＠＠ -1778,7 +1780,7 ＠＠ With a prefix argument, go back that man
(or (< n 0)
(setq regexp-skip (funcall ediff-skip-diff-region-function n))
;; this won't exec if regexp-skip is t
- (setq non-clash-skip (ediff-merge-region-is-non-clash n)
+ (setq non-clash-skip (ediff-merge-region-is-non-clash-to-skip n)
skip-changed
(ediff-skip-merge-region-if-changed-from-default-p n))
(ediff-install-fine-diff-if-necessary n))
＠＠ -1802,7 +1804,7 ＠＠ With a prefix argument, go back that man
(or (< n 0)
(setq regexp-skip (funcall ediff-skip-diff-region-function n))
;; this won't exec if regexp-skip is t
- (setq non-clash-skip (ediff-merge-region-is-non-clash n)
+ (setq non-clash-skip (ediff-merge-region-is-non-clash-to-skip n)
skip-changed
(ediff-skip-merge-region-if-changed-from-default-p n))
(ediff-install-fine-diff-if-necessary n))
＠＠ -2111,7 +2113,7 ＠＠ ARG is a prefix argument. If nil, copy
(if this-buf-n-th-diff-saved
(if (yes-or-no-p
(format
- "You've previously copied diff region %d to buffer %S. Confirm "
+ "You've previously copied diff region %d to buffer %S. Confirm? "
(1+ n) buf-type))
t
(error "Quit"))
＠＠ -2219,18 +2221,18 ＠＠ a regular expression typed in by the use
regexp-A
(read-string
(format
- "Ignore A-regions matching this regexp (default \"%s\"): "
+ "Ignore A-regions matching this regexp (default %s): "
ediff-regexp-hide-A))
regexp-B
(read-string
(format
- "Ignore B-regions matching this regexp (default \"%s\"): "
+ "Ignore B-regions matching this regexp (default %s): "
ediff-regexp-hide-B)))
(if ediff-3way-comparison-job
(setq regexp-C
(read-string
(format
- "Ignore C-regions matching this regexp (default \"%s\"): "
+ "Ignore C-regions matching this regexp (default %s): "
ediff-regexp-hide-C))))
(if (eq ediff-hide-regexp-connective 'and)
(setq msg-connective "BOTH"
＠＠ -2258,18 +2260,18 ＠＠ a regular expression typed in by the use
regexp-A
(read-string
(format
- "Focus on A-regions matching this regexp (default \"%s\"): "
+ "Focus on A-regions matching this regexp (default %s): "
ediff-regexp-focus-A))
regexp-B
(read-string
(format
- "Focus on B-regions matching this regexp (default \"%s\"): "
+ "Focus on B-regions matching this regexp (default %s): "
ediff-regexp-focus-B)))
(if ediff-3way-comparison-job
(setq regexp-C
(read-string
(format
- "Focus on C-regions matching this regexp (default \"%s\"): "
+ "Focus on C-regions matching this regexp (default %s): "
ediff-regexp-focus-C))))
(if (eq ediff-focus-regexp-connective 'and)
(setq msg-connective "BOTH"
1.16 +14 -7 XEmacs/packages/xemacs-packages/ediff/ediff-ptch.el
Index: ediff-ptch.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ediff-ptch.el,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ediff-ptch.el 2005/09/20 17:54:29 1.15
+++ ediff-ptch.el 2005/10/06 00:17:44 1.16
＠＠ -297,16 +297,23 ＠＠ program."
;; (file1 . file2). Get it using ediff-get-session-objA.
(ediff-get-session-objA-name session-info))
;; base-dir1 is the dir part of the 1st file in the patch
- (base-dir1 (file-name-directory (car proposed-file-names)))
+ (base-dir1
+ (or (file-name-directory (car proposed-file-names))
+ ""))
;; directory part of the 2nd file in the patch
- (base-dir2 (file-name-directory (cdr proposed-file-names)))
+ (base-dir2
+ (or (file-name-directory (cdr proposed-file-names))
+ ""))
)
- ;; If both base-dir1 and base-dir2 are relative, assume that
+ ;; If both base-dir1 and base-dir2 are relative and exist,
+ ;; assume that
;; these dirs lead to the actual files starting at the present
;; directory. So, we don't strip these relative dirs from the
;; file names. This is a heuristic intended to improve guessing
(unless (or (file-name-absolute-p base-dir1)
- (file-name-absolute-p base-dir2))
+ (file-name-absolute-p base-dir2)
+ (not (file-exists-p base-dir1))
+ (not (file-exists-p base-dir2)))
(setq base-dir1 ""
base-dir2 ""))
(or (string= (car proposed-file-names) "/dev/null")
＠＠ -377,8 +384,8 ＠＠ other files, enter /dev/null
(concat actual-dir (cdr proposed-file-names)))))
))
ediff-patch-map)
- ;; check for the shorter existing file in each pair and discard the other
- ;; one
+ ;; Check for the existing files in each pair and discard the nonexisting
+ ;; ones. If both exist, ask the user.
(mapcar (lambda (session-info)
(let* ((file1 (car (ediff-get-session-objA-name session-info)))
(file2 (cdr (ediff-get-session-objA-name session-info)))
＠＠ -485,7 +492,7 ＠＠ are two possible targets for this patch.
patch-file-name)
(setq patch-file-name
(read-file-name
- (format "Patch is in file:%s "
+ (format "Patch is in file%s: "
(cond ((and buffer-file-name
(equal (expand-file-name dir)
(file-name-directory buffer-file-name)))
1.24 +5 -4 XEmacs/packages/xemacs-packages/ediff/ediff-mult.el
Index: ediff-mult.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ediff-mult.el,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- ediff-mult.el 2005/09/20 17:54:29 1.23
+++ ediff-mult.el 2005/10/06 00:17:44 1.24
＠＠ -1314,7 +1314,7 ＠＠ Useful commands:
(if otherfile
(or (file-exists-p otherfile)
(if (y-or-n-p
- (format "Copy %s to %s ? " file-abs otherfile))
+ (format "Copy %s to %s? " file-abs otherfile))
(let* ((file-diff-record (assoc file-tail dir-diff-list))
(new-mem-code
(* (cdr file-diff-record) file-mem-code)))
＠＠ -1624,7 +1624,7 ＠＠ Useful commands:
(save-excursion
(set-buffer meta-diff-buff)
(goto-char (point-max))
- (insert-buffer custom-diff-buf)
+ (insert-buffer-substring custom-diff-buf)
(insert "\n")))
;; if ediff session is not live, run diff directly on the files
((memq metajob '(ediff-directories
＠＠ -1643,7 +1643,7 ＠＠ Useful commands:
(save-excursion
(set-buffer meta-diff-buff)
(goto-char (point-max))
- (insert-buffer tmp-buf)
+ (insert-buffer-substring tmp-buf)
(insert "\n")))
(t
(ediff-kill-buffer-carefully meta-diff-buff)
＠＠ -1691,7 +1691,8 ＠＠ all marked sessions must be active."
(ediff-get-session-objC-name info)))
(set-buffer (get-buffer-create ediff-tmp-buffer))
(erase-buffer)
- (insert-buffer patchbuffer)
+ (insert-buffer-substring patchbuffer)
+ (goto-char (point-min))
(display-buffer ediff-tmp-buffer 'not-this-window)
))
(error "The patch buffer wasn't found"))))
1.12 +6 -2 XEmacs/packages/xemacs-packages/ediff/ediff-merg.el
Index: ediff-merg.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ediff-merg.el,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ediff-merg.el 2005/09/20 17:54:29 1.11
+++ ediff-merg.el 2005/10/06 00:17:44 1.12
＠＠ -103,11 +103,15 ＠＠ Buffer B."
)
(make-variable-buffer-local 'ediff-skip-merge-regions-that-differ-from-default)
+;; check if there is no clash between the ancestor and one of the variants.
+(defsubst ediff-merge-region-is-non-clash (n)
+ (string-match "prefer" (or (ediff-get-state-of-merge n) "")))
+
;; If ediff-show-clashes-only, check if there is no clash between the ancestor
;; and one of the variants.
-(defsubst ediff-merge-region-is-non-clash (n)
+(defsubst ediff-merge-region-is-non-clash-to-skip (n)
(and ediff-show-clashes-only
- (string-match "prefer" (or (ediff-get-state-of-merge n) ""))))
+ (ediff-merge-region-is-non-clash n)))
;; If ediff-skip-changed-regions, check if the merge region differs from
;; the current default. If a region is different from the default, it means
1.90 +19 -0 XEmacs/packages/xemacs-packages/ediff/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ChangeLog,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- ChangeLog 2005/09/21 07:15:00 1.89
+++ ChangeLog 2005/10/06 00:17:45 1.90
＠＠ -1,3 +1,22 ＠＠
+2005-10-05 Michael Kifer <kifer(a)cs.stonybrook.edu>
+
+ * ediff-merge.el (ediff-merge-region-is-non-clash): new defsubst.
+ (ediff-merge-region-is-non-clash-to-skip): previouslu called
+ ediff-merge-region-is-non-clash.
+
+ * ediff-mult.el (ediff-append-custom-diff,ediff-meta-show-patch): use
+ insert-buffer-substring.
+
+ * ediff-ptch.el (ediff-fixup-patch-map): use better heuristics for
+ selecting files to patch. Also bug fixes.
+
+ * ediff-util.el (ediff-setup): bug fix.
+ (ediff-next-difference): Never skip clashes that differ in white space
+ only.
+
+ * ediff-wind.el (ediff-setup-control-frame,ediff-destroy-control-frame):
+ check the menubar feature.
+
2005-09-21 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.55 released.
- 1 participants
- 0 comments
CVS update by viteno xemacs ...
18 years, 7 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/10/05 23:51:08
Modified: xemacs version.sh
Log:
Update xemacs_extra_name.
Revision Changes Path
1.1303 +1 -1 XEmacs/xemacs/version.sh
Index: version.sh
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v
retrieving revision 1.1302
retrieving revision 1.1303
diff -u -p -r1.1302 -r1.1303
--- version.sh 2005/10/04 21:51:19 1.1302
+++ version.sh 2005/10/05 21:51:07 1.1303
＠＠ -8,5 +8,5 ＠＠ emacs_kit_version=
infodock_major_version=4
infodock_minor_version=0
infodock_build_version=8
-xemacs_extra_name="(+CVS-20051004)"
+xemacs_extra_name="(+CVS-20051005)"
xemacs_release_date="2005-02-18"
- 1 participants
- 0 comments
CVS update by stephent xemacs ...
18 years, 7 months
CVS Monitor
CVS Monitor
User: stephent
Date: 05/10/05 06:38:07
Modified: xemacs configure
Log:
Update configure for Canna as module.
Revision Changes Path
1.254 +16 -4 XEmacs/xemacs/configure
Index: configure
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -p -r1.253 -r1.254
--- configure 2005/09/18 13:01:03 1.253
+++ configure 2005/10/05 04:37:54 1.254
＠＠ -356,7 +356,7 ＠＠ ac_includes_default="\
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS inststaticdir statedir LN_S blddir build build_cpu build_vendor build_os configuration CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP start_flags ld_switch_shared start_files ld lib_gcc RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA YACC SET_MAKE GTK_CONFIG X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS install_pp libs_xauth dnd_objs LIBSTDCPP dll_ld dll_cflags dll_ldflags dll_post dll_ldo ld_dynamic_link_flags with_modules MOD_CC MODARCHDIR MAKE_DOCFILE MODCFLAGS INSTALLPATH MOD_INSTALL_PROGRAM OBJECT_TO_BUILD ldap_libs postgresql_libs lwlib_objs ALLOCA have_esd_config SRC_SUBDIR_DEPS INSTALL_ARCH_DEP_SUBDIR MA!
KE_SUBDIR SUBDIR_MAKEFILES PROGNAME version instvardir srcdir extra_includes PREFIX_USER_DEFINED PREFIX EXEC_PREFIX_USER_DEFINED EXEC_PREFIX INFODIR_USER_DEFINED INFODIR infopath INFOPATH_USER_DEFINED INFOPATH package_path PACKAGE_PATH_USER_DEFINED PACKAGE_PATH lispdir LISPDIR_USER_DEFINED LISPDIR moduledir MODULEDIR_USER_DEFINED MODULEDIR sitelispdir SITELISPDIR_USER_DEFINED SITELISPDIR sitemoduledir SITEMODULEDIR_USER_DEFINED SITEMODULEDIR etcdir ETCDIR_USER_DEFINED ETCDIR archlibdir ARCHLIBDIR_USER_DEFINED ARCHLIBDIR docdir DOCDIR_USER_DEFINED DOCDIR bitmapdir extra_objs machfile opsysfile c_switch_general c_switch_window_system c_switch_all ld_switch_general ld_switch_window_system ld_switch_all ld_libs_general ld_libs_window_system ld_libs_all RECURSIVE_MAKE_ARGS native_sound_lib sound_cflags dynodump_arch XEMACS_CC XE_CFLAGS internal_makefile_list LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS inststaticdir statedir LN_S blddir build build_cpu build_vendor build_os configuration CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP start_flags ld_switch_shared start_files ld lib_gcc RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA YACC SET_MAKE GTK_CONFIG X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS install_pp libs_xauth dnd_objs LIBSTDCPP dll_ld dll_cflags dll_ldflags dll_post dll_ldo ld_dynamic_link_flags with_modules MOD_CC MODARCHDIR MAKE_DOCFILE MODCFLAGS INSTALLPATH MOD_INSTALL_PROGRAM OBJECT_TO_BUILD ldap_libs postgresql_libs lwlib_objs canna_libs ALLOCA have_esd_config SRC_SUBDIR_DEPS INSTALL_ARCH_DE!
P_SUBDIR MAKE_SUBDIR SUBDIR_MAKEFILES PROGNAME version instvardir srcdir extra_includes PREFIX_USER_DEFINED PREFIX EXEC_PREFIX_USER_DEFINED EXEC_PREFIX INFODIR_USER_DEFINED INFODIR infopath INFOPATH_USER_DEFINED INFOPATH package_path PACKAGE_PATH_USER_DEFINED PACKAGE_PATH lispdir LISPDIR_USER_DEFINED LISPDIR moduledir MODULEDIR_USER_DEFINED MODULEDIR sitelispdir SITELISPDIR_USER_DEFINED SITELISPDIR sitemoduledir SITEMODULEDIR_USER_DEFINED SITEMODULEDIR etcdir ETCDIR_USER_DEFINED ETCDIR archlibdir ARCHLIBDIR_USER_DEFINED ARCHLIBDIR docdir DOCDIR_USER_DEFINED DOCDIR bitmapdir extra_objs machfile opsysfile c_switch_general c_switch_window_system c_switch_all ld_switch_general ld_switch_window_system ld_switch_all ld_libs_general ld_libs_window_system ld_libs_all RECURSIVE_MAKE_ARGS native_sound_lib sound_cflags dynodump_arch XEMACS_CC XE_CFLAGS internal_makefile_list LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
＠＠ -21554,6 +21554,7 ＠＠ echo "$as_me: checking for graphics libr
xpm_problem=""
if test -z "$with_xpm"; then
CFLAGS=""$incpath_xpm" $CFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi
+ XE_CFLAGS=""$incpath_xpm" $XE_CFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$XE_CFLAGS"; fi
LDFLAGS=""$libpath_xpm" $LDFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \""$libpath_xpm"\" to \$LDFLAGS"; fi
echo "$as_me:$LINENO: checking for Xpm - no older than 3.4f" >&5
echo $ECHO_N "checking for Xpm - no older than 3.4f... $ECHO_C" >&6
＠＠ -21629,6 +21630,7 ＠＠ _ACEOF
LDFLAGS=""$libpath_xpm" $LDFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \""$libpath_xpm"\" to \$LDFLAGS"; fi
libs_x="-lXpm $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lXpm\" to \$libs_x"; fi
CFLAGS=""$incpath_xpm" $CFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi
+ XE_CFLAGS=""$incpath_xpm" $XE_CFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$XE_CFLAGS"; fi
echo "$as_me:$LINENO: checking for \"FOR_MSW\" xpm" >&5
echo $ECHO_N "checking for \"FOR_MSW\" xpm... $ECHO_C" >&6
xe_check_libs=-lXpm
＠＠ -25146,6 +25148,9 ＠＠ _ACEOF
fi
+canna_libs=
+wnn_libs=
+
if test "$enable_mule" = "yes" ; then
{ echo "$as_me:$LINENO: checking for Mule-related features..." >&5
echo "$as_me: checking for Mule-related features..." >&6;}
＠＠ -26469,7 +26474,7 ＠＠ _ACEOF
fi
fi
- canna_includes_found=no
+ canna_includes_found=no
if test "$with_canna" != "no"; then
if test "${ac_cv_header_canna_jrkanji_h+set}" = set; then
echo "$as_me:$LINENO: checking for canna/jrkanji.h" >&5
＠＠ -27056,9 +27061,15 ＠＠ fi
#define HAVE_CANNA 1
_ACEOF
- libs_x="-lcanna -lRKC $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lcanna -lRKC\" to \$libs_x"; fi
+ MAKE_SUBDIR="$MAKE_SUBDIR modules/canna" && if test "$verbose" = "yes"; then echo " Appending \"modules/canna\" to \$MAKE_SUBDIR"; fi
+ need_modules_common=yes
+ if test "$with_modules" = "yes"; then
+ INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR modules/canna" && if test "$verbose" = "yes"; then echo " Appending \"modules/canna\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi
+ fi
+ canna_libs="-lcanna -lRKC $canna_libs" && if test "$verbose" = "yes"; then echo " Prepending \"-lcanna -lRKC\" to \$canna_libs"; fi
fi
+
else for feature in xim canna wnn; do
if eval "test -n \"\$with_${feature}\" -a \"\$with_${feature}\" != no" ; then
{ echo "$as_me:$LINENO: WARNING: --with-${feature} ignored: Not valid without Mule support" >&5
＠＠ -35891,7 +35902,7 ＠＠ if test "$enable_modules" = "yes"; then
else
T=""
-for W in $ldap_libs $postgresql_libs; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done
+for W in $ldap_libs $postgresql_libs $canna_libs; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done
ld_libs_module="$T"
fi
＠＠ -37338,6 +37349,7 ＠＠ s,＠OBJECT_TO_BUILD＠,$OBJECT_TO_BUILD,;t
s,＠ldap_libs＠,$ldap_libs,;t t
s,＠postgresql_libs＠,$postgresql_libs,;t t
s,＠lwlib_objs＠,$lwlib_objs,;t t
+s,＠canna_libs＠,$canna_libs,;t t
s,＠ALLOCA＠,$ALLOCA,;t t
s,＠have_esd_config＠,$have_esd_config,;t t
s,＠SRC_SUBDIR_DEPS＠,$SRC_SUBDIR_DEPS,;t t
- 1 participants
- 0 comments
CVS update by stephent xemacs/lisp ...
18 years, 7 months
CVS Monitor
CVS Monitor
User: stephent
Date: 05/10/05 06:32:47
Modified: xemacs/lisp ChangeLog simple.el
Log:
Aidan, I'm sick of yer naggin'! :-)
<87achotwly.fsf(a)tleepslib.sk.tsukuba.ac.jp>
Revision Changes Path
1.679 +4 -0 XEmacs/xemacs/lisp/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.678
retrieving revision 1.679
diff -u -p -r1.678 -r1.679
--- ChangeLog 2005/10/05 04:11:24 1.678
+++ ChangeLog 2005/10/05 04:32:44 1.679
＠＠ -1,3 +1,7 ＠＠
+2005-10-04 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * simple.el (xemacs-default-composefunc): Don't warn when batch.
+
2005-10-04 Stephen J. Turnbull <stephen(a)xemacs.org>
* build-report.el: Synch to Adrian's packaged version.
1.52 +3 -3 XEmacs/xemacs/lisp/simple.el
Index: simple.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/simple.el,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- simple.el 2005/05/10 17:35:58 1.51
+++ simple.el 2005/10/05 04:32:45 1.52
＠＠ -3417,7 +3417,8 ＠＠ The properties used on SYMBOL are `compo
(defun xemacs-default-composefunc (&rest args)
"Warn that the default mail-reading package is heinously underfeatured;
compose a mail using it, all the same. "
- (warn "
+ (unless (noninteractive)
+ (warn "
Defaulting to the GNU Emacs-derived `sendmail.el' mail client. This facility,
while part of base XEmacs, is heinously underfeatured, and not going to get
＠＠ -3431,11 +3432,10 ＠＠ To choose a package from those installed
list. Gnus and VM are full-featured and have active user communities.
To disable this warning and stick with the old behavior, you can explicitly
-initialize `mail-user-agent' to 'sendmail-user-agent . ")
+initialize `mail-user-agent' to 'sendmail-user-agent . "))
(setq mail-user-agent 'sendmail-user-agent)
(apply (get 'sendmail-user-agent 'composefunc) args))
-
(defun xemacs-default-sendfunc (&rest args)
"Set `mail-user-agent' to `sendmail-user-agent'; call the send function
associated with that package, passing it the supplied arguments. "
- 1 participants
- 0 comments
CVS update by stephent xemacs/lisp ...
18 years, 7 months
CVS Monitor
CVS Monitor
User: stephent
Date: 05/10/05 06:11:27
Modified: xemacs/lisp ChangeLog build-report.el
Log:
Synch build-report.el to build package version
<87ek70txjo.fsf(a)tleepslib.sk.tsukuba.ac.jp>
Revision Changes Path
1.678 +4 -0 XEmacs/xemacs/lisp/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.677
retrieving revision 1.678
diff -u -p -r1.677 -r1.678
--- ChangeLog 2005/10/04 17:51:19 1.677
+++ ChangeLog 2005/10/05 04:11:24 1.678
＠＠ -1,3 +1,7 ＠＠
+2005-10-04 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * build-report.el: Synch to Adrian's packaged version.
+
2005-10-04 Stephen J. Turnbull <stephen(a)xemacs.org>
* mule/canna-leim.el: Rename canna_api to canna-api.
1.12 +31 -19 XEmacs/xemacs/lisp/build-report.el
Index: build-report.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/build-report.el,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- build-report.el 2002/08/28 05:36:31 1.11
+++ build-report.el 2005/10/05 04:11:25 1.12
＠＠ -1,8 +1,10 ＠＠
;;; build-report.el --- Automatically formatted build reports for XEmacs
-;; Copyright (C) 1997-2001 Adrian Aichner
+;; Copyright (C) 1997-2003 Adrian Aichner
;; Author: Adrian Aichner <adrian(a)xemacs.org>
+;; Date: $Date: 2005/10/05 04:11:25 $
+;; Version: $Revision: 1.12 $
;; Keywords: internal
;; This file is part of XEmacs.
＠＠ -66,8 +68,8 ＠＠
"emacs_major_version\\s-*=\\s-*\\([0-9]+\\)
emacs_minor_version\\s-*=\\s-*\\([0-9]+\\)
emacs_beta_version\\s-*=\\s-*\\([0-9]+\\)?
-xemacs_codename\\s-*=\\s-*\"\\([^\"]+\\)\"
-xemacs_extra_name\\s-*=\\s-*\"\\([^\"]+\\)\""
+xemacs_codename\\s-*=\\s-*\"\\([^\"]+\\)\"\\(
+xemacs_extra_name\\s-*=\\s-*\"\\([^\"]+\\)\"\\)?"
"*REGEXP matching XEmacs Beta Version variable assignments in
`build-report-version-file' file. This variable is used by
`build-report-version-file-data'.")
＠＠ -113,7 +115,11 ＠＠ go to."
"^Note:"
"Installing"
"[Ff]ile(s) copied"
- "\\s-+tests\\s-+")
+ "\\s-+tests\\s-+"
+ "^[A-Z] [^ ]+$"
+ "^Wrong number of arguments:"
+ "^ \\*\\* "
+ "^\\(FAIL\\|SKIP\\):")
"*Regexp of make process output lines to keep in the report."
:type '(repeat
:custom-show t
＠＠ -125,6 +131,8 ＠＠ go to."
(list
"confl.*with.*auto-inlining"
"^Formatting:"
+ "^\\s-*0 .*\\(failure\\|error\\)s?"
+ "^PASS:"
"(100%) tests successful")
"*Regexp of make process output lines to delete from the report."
:type '(repeat
＠＠ -198,6 +206,8 ＠＠ under csh, so that you get beta.err when
(defcustom build-report-subject
(concat "[%s] " emacs-version " on " system-configuration)
+ ;; #### this should allow variable names which will be evalled and
+ ;; formatted using %s, see `build-report-prompts'
"*XEmacs Build Report Subject Line. %s-sequences will be substituted
with user input through `build-report' according to
`build-report-prompts' using `format'."
＠＠ -208,6 +218,8 ＠＠ under csh, so that you get beta.err when
(defcustom build-report-prompts
(quote (("Status?: " ("Success" "Failure"))))
+ ;; #### this should allow variable names which will be evalled and
+ ;; formatted using %s, see `build-report-prompts'
"*XEmacs Build Report Prompt(s). This is a list of prompt-string
lists used by `build-report' in conjunction with
`build-report-subject'. Each list consists of a prompt string
＠＠ -248,7 +260,7 ＠＠ under csh, so that you get beta.err when
'mime-editor/insert-binary-file)))
(defun build-report-make-output-get ()
- "Returns the filename the XEmacs make output is saved in."
+ "Return the filename the XEmacs make output is saved in."
(interactive)
(if (or (string-equal build-report-make-output-dir "")
(null build-report-make-output-dir))
＠＠ -312,13 +324,13 ＠＠ See also `mail-user-agent', `build-repor
(major minor beta codename extraname configuration)
(build-report-installation-data build-report-installation-file)
(setq build-report-subject
- (format "[%%s] XEmacs %s.%s%s \"%s\" %s %s"
+ (format "[%%s] XEmacs %s.%s%s \"%s\" %s%s"
major minor beta codename extraname configuration)))
(multiple-value-bind
(major minor beta codename extraname)
(build-report-version-file-data build-report-version-file)
(setq build-report-subject
- (format "[%%s] XEmacs %s.%s%s \"%s\" %s %s"
+ (format "[%%s] XEmacs %s.%s%s \"%s\" %s%s"
major minor beta codename extraname system-configuration))))
(compose-mail
;; `build-report-destination' used to be a single string, so
＠＠ -501,15 +513,15 ＠＠ which defaults to `build-report-installa
(cond
((looking-at build-report-installation-version-regexp)
(goto-char (match-end 0))
- (setq major (match-string 1))
- (setq minor (match-string 2))
- (setq beta (match-string 3))
- (setq codename (match-string 6))
- (setq extraname (match-string 7))
- (setq configuration (match-string 8)))
+ (setq major (or (match-string 1) ""))
+ (setq minor (or (match-string 2) ""))
+ (setq beta (or (match-string 3) ""))
+ (setq codename (or (match-string 6) ""))
+ (setq extraname (or (match-string 7) ""))
+ (setq configuration (or (match-string 8) "")))
((looking-at build-report-installation-srcdir-regexp)
(goto-char (match-end 0))
- (setq srcdir (match-string 1)))
+ (setq srcdir (or (match-string 1) "")))
;; We avoid matching a potentially zero-length string to avoid
;; infinite looping.
((looking-at
＠＠ -535,11 +547,11 ＠＠ defaults to `build-report-version-file'.
(cond
((looking-at build-report-version-file-regexp)
(goto-char (match-end 0))
- (setq major (match-string 1))
- (setq minor (match-string 2))
- (setq beta (match-string 3))
- (setq codename (match-string 4))
- (setq extraname (match-string 5)))
+ (setq major (or (match-string 1) ""))
+ (setq minor (or (match-string 2) ""))
+ (setq beta (or (match-string 3) ""))
+ (setq codename (or (match-string 4) ""))
+ (setq extraname (or (match-string 6) "")))
;; We avoid matching a potentially zero-length string to avoid
;; infinite looping.
((looking-at
- 1 participants
- 0 comments
CVS update by viteno xemacs/src ...
18 years, 7 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/10/04 23:51:36
Modified: xemacs/src depend
Log:
Update src depends
Revision Changes Path
1.58 +0 -1 XEmacs/xemacs/src/depend
Index: depend
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/depend,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- depend 2005/07/04 21:51:08 1.57
+++ depend 2005/10/04 21:51:35 1.58
＠＠ -91,7 +91,6 ＠＠ ui-gtk.o: $(LISP_H) buffer.h bufslots.h
database.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h database.h sysfile.h
#endif
#if defined(MULE)
-mule-canna.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h coding-system-slots.h file-coding.h
mule-ccl.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h coding-system-slots.h file-coding.h mule-ccl.h
mule-charset.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h console.h device.h elhash.h faces.h lstream.h mule-ccl.h objects.h
mule-coding.o: $(LISP_H) charset.h coding-system-slots.h file-coding.h mule-ccl.h
- 1 participants
- 0 comments
CVS update by viteno xemacs ...
18 years, 7 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/10/04 23:51:19
Modified: xemacs version.sh
Log:
Update xemacs_extra_name.
Revision Changes Path
1.1302 +1 -1 XEmacs/xemacs/version.sh
Index: version.sh
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v
retrieving revision 1.1301
retrieving revision 1.1302
diff -u -p -r1.1301 -r1.1302
--- version.sh 2005/10/03 21:51:15 1.1301
+++ version.sh 2005/10/04 21:51:19 1.1302
＠＠ -8,5 +8,5 ＠＠ emacs_kit_version=
infodock_major_version=4
infodock_minor_version=0
infodock_build_version=8
-xemacs_extra_name="(+CVS-20051003)"
+xemacs_extra_name="(+CVS-20051004)"
xemacs_release_date="2005-02-18"
- 1 participants
- 0 comments
CVS update by stephent xemacs/modules/canna Makefile.in.in canna-api.c configure.ac xemacs/src mule-canna.c
18 years, 7 months
CVS Monitor
CVS Monitor
User: stephent
Date: 05/10/04 19:51:33
Added: xemacs/modules/canna Makefile.in.in canna-api.c configure.ac
install-sh
Removed: xemacs/src mule-canna.c
Log:
Modularize Canna <87wtkttbvp.fsf(a)tleepslib.sk.tsukuba.ac.jp>
Revision Changes Path
1.26 +2 -1 XEmacs/xemacs/Makefile.in.in
Index: Makefile.in.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/Makefile.in.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- Makefile.in.in 2005/04/08 23:10:02 1.25
+++ Makefile.in.in 2005/10/04 17:51:13 1.26
＠＠ -313,7 +313,8 ＠＠ ${SUBDIR}: ${SUBDIR_MAKEFILES} ${GENERAT
cd ./$＠ && $(MAKE) $(RECURSIVE_MAKE_ARGS) all
## Building modules depends on ellcc, found in lib-src.
-modules/sample modules/ldap modules/zlib modules/base64 modules/postgresql: lib-src
+modules/sample modules/ldap modules/zlib modules/base64: lib-src
+modules/postgresql modules/canna: lib-src
Makefile: ${srcdir}/Makefile.in.in config.status
./config.status
1.14 +13 -2 XEmacs/xemacs/configure.ac
Index: configure.ac
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- configure.ac 2005/09/19 00:36:02 1.13
+++ configure.ac 2005/10/04 17:51:13 1.14
＠＠ -4201,6 +4201,10 ＠＠ if test "$enable_default_eol_detection"
AC_DEFINE(HAVE_DEFAULT_EOL_DETECTION)
fi
+dnl initialize _libs variables for possible modules at top level
+canna_libs=
+wnn_libs=
+
if test "$enable_mule" = "yes" ; then
AC_CHECKING([for Mule-related features])
AC_DEFINE(MULE)
＠＠ -4277,6 +4281,7 ＠＠ if test "$enable_mule" = "yes" ; then
fi
dnl Autodetect canna
+ dnl canna_libs variable is initialized at toplevel
canna_includes_found=no
if test "$with_canna" != "no"; then
AC_CHECK_HEADER(canna/jrkanji.h,canna_includes_found=yes)
＠＠ -4298,8 +4303,14 ＠＠ if test "$enable_mule" = "yes" ; then
test -z "$with_canna" && with_canna=yes
if test "$with_canna" = "yes"; then
AC_DEFINE(HAVE_CANNA)
- XE_PREPEND(-lcanna -lRKC, libs_x)
+ XE_APPEND(modules/canna, MAKE_SUBDIR)
+ need_modules_common=yes
+ if test "$with_modules" = "yes"; then
+ XE_APPEND(modules/canna, INSTALL_ARCH_DEP_SUBDIR)
+ fi
+ XE_PREPEND(-lcanna -lRKC, canna_libs)
fi
+AC_SUBST(canna_libs)
else dnl "$enable_mule" = "no"
for feature in xim canna wnn; do
＠＠ -5150,7 +5161,7 ＠＠ dnl Use XE_SPACE instead of plain assign
if test "$enable_modules" = "yes"; then
ld_libs_module=
else
- XE_SPACE(ld_libs_module, $ldap_libs $postgresql_libs)
+ XE_SPACE(ld_libs_module, $ldap_libs $postgresql_libs $canna_libs)
fi
XE_SPACE(CFLAGS, $CFLAGS)
1.460 +6 -0 XEmacs/xemacs/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v
retrieving revision 1.459
retrieving revision 1.460
diff -u -p -r1.459 -r1.460
--- ChangeLog 2005/09/19 00:36:01 1.459
+++ ChangeLog 2005/10/04 17:51:13 1.460
＠＠ -1,3 +1,9 ＠＠
+2005-09-22 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * configure.ac (Canna): Configure as module if appropriate.
+
+ * Makefile.in.in (modules/canna): Add dependency on lib-src (ellcc).
+
2005-09-18 Mike Alexander <mta(a)arbortext.com>
* configure.ac: Fix the cygwin, non-X build by adding XPM header
1.677 +17 -0 XEmacs/xemacs/lisp/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.676
retrieving revision 1.677
diff -u -p -r1.676 -r1.677
--- ChangeLog 2005/10/04 16:43:34 1.676
+++ ChangeLog 2005/10/04 17:51:19 1.677
＠＠ -1,3 +1,20 ＠＠
+2005-10-04 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * mule/canna-leim.el: Rename canna_api to canna-api.
+
+2005-09-30 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * mule/canna-leim.el (canna-activate): Fix typo in error symbol.
+ Improve docstring.
+
+2005-09-22 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * mule/canna-leim.el: Add comment on autoloading strategy.
+ (canna-activate): Handle CANNA in ELL.
+
+ * dumped-lisp.el (preloaded-file-list): Remove dependency of
+ canna-leim on CANNA. Canna may be an ELL.
+
2005-09-21 Stephen J. Turnbull <stephen(a)xemacs.org>
* mule/mule-cmds.el (input-method-alist, register-input-method):
1.56 +1 -1 XEmacs/xemacs/lisp/dumped-lisp.el
Index: dumped-lisp.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/dumped-lisp.el,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- dumped-lisp.el 2005/06/26 18:04:49 1.55
+++ dumped-lisp.el 2005/10/04 17:51:20 1.56
＠＠ -218,7 +218,7 ＠＠ in dumped-lisp.el and is not itself list
))
;; Specialized language support
- (when (featurep '(and mule CANNA)) "mule/canna-leim")
+ (when (featurep 'mule) "mule/canna-leim")
;; Egg/Its is now a package
; (when (featurep '(and mule wnn))
; '("egg-leim" "egg-kwnn-leim" "egg-cwnn-leim"))
1.866 +16 -0 XEmacs/xemacs/src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.865
retrieving revision 1.866
diff -u -p -r1.865 -r1.866
--- ChangeLog 2005/09/30 02:15:06 1.865
+++ ChangeLog 2005/10/04 17:51:22 1.866
＠＠ -1,3 +1,19 ＠＠
+2005-10-04 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * Makefile.in.in (mule_canna_objs): Use correct name of .o.
+
+2005-09-22 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * Makefile.in.in (HAVE_CANNA): Handle Canna as a module.
+
+ * emacs.c (main_1): Update Canna initializers to *_canna_api names.
+
+ * mule-canna.c: Moved to modules/canna/canna_api.c.
+
+ * symsinit.h (syms_of_mule_canna):
+ (vars_of_mule_canna):
+ Rename to *_of_canna_api.
+
2005-09-29 Ben Wing <ben(a)xemacs.org>
* alloca.c (xemacs_c_alloca):
1.118 +2 -2 XEmacs/xemacs/src/Makefile.in.in
Index: Makefile.in.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Makefile.in.in,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- Makefile.in.in 2005/09/27 05:35:26 1.117
+++ Makefile.in.in 2005/10/04 17:51:24 1.118
＠＠ -196,8 +196,8 ＠＠ ldap_objs=$(BLDMODULES)/ldap/eldap.o
mule_objs=mule-ccl.o mule-charset.o mule-coding.o
#endif
-#ifdef HAVE_CANNA
-mule_canna_objs=mule-canna.o
+#if defined(HAVE_CANNA) && !defined(HAVE_SHLIB)
+mule_canna_objs=$(BLDMODULES)/canna/canna-api.o
#endif
#ifdef HAVE_WNN
1.53 +2 -2 XEmacs/xemacs/src/symsinit.h
Index: symsinit.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/symsinit.h,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- symsinit.h 2005/04/08 23:11:33 1.52
+++ symsinit.h 2005/10/04 17:51:24 1.53
＠＠ -149,7 +149,7 ＠＠ void syms_of_menubar_mswindows (void);
void syms_of_menubar_x (void);
void syms_of_minibuf (void);
void syms_of_module (void);
-void syms_of_mule_canna (void);
+void syms_of_canna_api (void);
void syms_of_mule_ccl (void);
void syms_of_mule_charset (void);
void syms_of_mule_coding (void);
＠＠ -387,7 +387,7 ＠＠ void vars_of_minibuf (void);
void reinit_vars_of_minibuf (void);
void vars_of_module (void);
void reinit_vars_of_module (void);
-void vars_of_mule_canna (void);
+void vars_of_canna_api (void);
void vars_of_mule_ccl(void);
void vars_of_mule_charset (void);
void vars_of_mule_coding (void);
1.158 +4 -4 XEmacs/xemacs/src/emacs.c
Index: emacs.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/emacs.c,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -p -r1.157 -r1.158
--- emacs.c 2005/04/10 00:47:57 1.157
+++ emacs.c 2005/10/04 17:51:24 1.158
＠＠ -1641,8 +1641,8 ＠＠ main_1 (int argc, Wexttext **argv, Wextt
#ifdef HAVE_WNN
syms_of_mule_wnn ();
#endif
-#ifdef HAVE_CANNA
- syms_of_mule_canna ();
+#if defined(HAVE_CANNA) && !defined (HAVE_SHLIB)
+ syms_of_canna_api ();
#endif /* HAVE_CANNA */
#endif /* MULE */
＠＠ -2210,8 +2210,8 ＠＠ main_1 (int argc, Wexttext **argv, Wextt
#ifdef HAVE_WNN
vars_of_mule_wnn ();
#endif
-#ifdef HAVE_CANNA
- vars_of_mule_canna ();
+#if defined(HAVE_CANNA) && !defined (HAVE_SHLIB)
+ vars_of_canna_api ();
#endif /* HAVE_CANNA */
#endif /* MULE */
1.8 +15 -3 XEmacs/xemacs/lisp/mule/canna-leim.el
Index: canna-leim.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/mule/canna-leim.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- canna-leim.el 2002/03/16 10:39:05 1.7
+++ canna-leim.el 2005/10/04 17:51:29 1.8
＠＠ -35,10 +35,22 ＠＠
(globally-declare-boundp 'canna:*japanese-mode*)
(globally-declare-fboundp '(canna canna-toggle-japanese-mode))
+;; use (locate-file "canna/canna-api" module-load-path module-extensions)
+;; to locate the module without loading it.
+;; then we could autoload canna-activate and dump and/or autoload:
+;; (and (locate-file "canna/canna-api" module-load-path module-extensions)
+;; (locate-library "canna")
+;; (register-input-method 'japanese-canna "Japanese" 'canna-activate nil
+;; "Canna - a kana to kanji conversion program"))
+
(defun canna-activate (&optional name)
- (if (featurep 'CANNA)
- (require 'canna)
- (error "Canna is not built into this XEmacs"))
+ ;; XEmacs 21.5.10 and later have 3-argument require.
+ (unless (require 'CANNA "canna/canna-api" 'no-error)
+ (error 'file-error
+ "No Canna API support!? See M-x describe-installation & C-h v module-load-path."))
+ (unless (require 'canna nil 'no-error)
+ (error 'file-error
+ "Canna LISP support not found. Is the mule-base package missing?"))
(setq inactivate-current-input-method-function 'canna-inactivate)
(unless (featurep 'leim-canna-initialized)
(canna)
1.43 +21 -0 XEmacs/xemacs/modules/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/ChangeLog,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- ChangeLog 2005/09/14 05:30:08 1.42
+++ ChangeLog 2005/10/04 17:51:31 1.43
＠＠ -1,3 +1,24 ＠＠
+2005-10-04 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * canna/Makefile.in.in (MODVER): Bump to 0.5.
+
+ * canna/canna-api.c:
+ * canna/Makefile.in.in (MODNAME,SRCS):
+ Rename module from canna_api to canna-api.
+
+2005-09-22 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * canna: New module.
+
+ * canna/canna_api.c: Move from $srcdir/src/mule-canna.c. Add module
+ initialization function and some boilerplate. Change name to
+ canna_api to reflect changed role.
+
+ * canna/configure.ac:
+ * canna/Makefile.in.in:
+ * canna/install-sh:
+ Standard module boilerplate, adapted to Canna.
+
2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org>
* XEmacs 21.5.22 "cucumber" is released.
1.2 +36 -0 XEmacs/xemacs/modules/canna/Makefile.in.in
Index: Makefile.in.in
===================================================================
RCS file: Makefile.in.in
diff -N Makefile.in.in
--- /dev/null Tue Oct 4 19:51:05 2005
+++ /tmp/cvsAAAFNaGNE Tue Oct 4 19:51:33 2005
＠＠ -0,0 +1,36 ＠＠
+## Makefile for the sample module in XEmacs.
+## Copyright (C) 2002 Jerry James.
+
+## This file is part of XEmacs.
+
+## XEmacs is free software; you can redistribute it and/or modify it
+## under the terms of the GNU General Public License as published by the
+## Free Software Foundation; either version 2, or (at your option) any
+## later version.
+
+## XEmacs is distributed in the hope that it will be useful, but WITHOUT
+## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+## for more details.
+
+## You should have received a copy of the GNU General Public License
+## along with XEmacs; see the file COPYING. If not, write to
+## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+## Boston, MA 02111-1307, USA.
+
+## Synched up with: Not synched with FSF.
+
+## This is more complicated than would normally be the case, as this makefile
+## has been tailored to work both inside and independently of the XEmacs
+## source tree, and to support both module and non-module building inside the
+## source tree.
+
+### Specialize this part for your module
+MODNAME=canna-api
+MODVER=0.5.0
+MODTITLE="Module wrapping Canna libraries for XEmacs"
+CFLAGS=＠CFLAGS＠
+LDFLAGS=＠LDFLAGS＠ ＠ld_switch_all＠ ＠canna_libs＠
+SRCS=canna-api.c
+
+## Note: modules/common/Makefile.common will be appended by configure
1.1 XEmacs/xemacs/modules/canna/canna-api.c
Index: canna-api.c
===================================================================
/* CANNA interface -*- coding: euc-jp -*-
Copyright (C) 1995 Free Software Foundation, Inc.
Copyright (C) 1995 Sun Microsystems, Inc.
This file is part of XEmacs.
XEmacs is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
Free Software Foundation; either version 2, or (at your option) any
later version.
XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
along with XEmacs; see the file COPYING. If not, write to
the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
/* Synched up with: Mule 2.3. Not in FSF. */
/* Japanese comments were translated 2000-12-06 by Stephen Turnbull
<stephen(a)xemacs.org>. I haven't verified that the Japanese comments
were correct. YMMV, NO WARRANTY, not even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. (^^;;; as the
Japanese say. */
/*
Authors: Akira Kon (kon(a)uxd.fc.nec.co.jp)
Ichiro Hirakura (hirakura(a)uxd.fc.nec.co.jp)
Functions defined in this file are
(canna-key-proc key)
key: single STRING
RETURNS:
Length of converted string if no error occurs.
Error string if error occurs.
DESCRIPTION:
Convert a key input to a set of strings. The
strings contain both well-formed string and a
intermediate result to show the translation
information to a user. converted strings are
stored in specific variables.
(canna-initialize)
RETURNS:
List of the following things:
- list of keys to toggle Japanese-mode
- error message
- list of warning messages
DESCRIPTION:
Initialize ``canna'', which is a kana-to-kanji
converter for XEmacs. The first arg
specifies if inserting space character between
BUNSETSU when candidates are displayed. The
second arg specifies server. The third arg
specifies a file which will be used as a
customization description. If nil is
specified for each arg, the default value will
be used.
(canna-finalize)
RETURNS:
list of warning messages
DESCRIPTION:
finalize ``canna'', which is a kana-to-kanji
converter for XEmacs. This cause to write
miscellaneous informations to kana-to-kanji
dictionary.
(canna-touroku-string string)
string:
String to register to a dictionary.
RETURNS:
The same thing returns as canna-key-proc does.
DESCRIPTION:
Register Kanji words into kana-to-kanji
conversion dictionary.
(canna-set-width width)
width:
Column width of the place where the candidates
of kana-to-kanji conversion will be shown.
RETURNS:
nil
DESCRIPTION:
Set status-line width information, which is
used to display kanji candidates.
(canna-change-mode num)
num:
The mode number of Canna.
RETURNS:
The same thing returns as canna-key-proc does.
DESCRIPTION:
Change Japanese pre-edit mode.
(canna-store-yomi yomi roma)
yomi:
``Yomi'' to be stored.
roma:
``Romaji'' which corresponds to the ``Yomi''.
RETURNS:
The same thing returns as canna-key-proc does.
DESCRIPTION:
Store yomi characters as a YOMI of
kana-to-kanji conversion.
(canna-do-function num ch)
num:
A function number to be called.
ch:
A character will be specified in order to feed
the character to the function if the function
needs a input character.
RETURNS:
The same thing returns as canna-key-proc does.
DESCRIPTION:
Do specified function at current mode.
(canna-parse string)
string:
To be parsed.
RETURNS:
List of warning messages.
DESCRIPTION:
Parse customize string.
(canna-query-mode)
RETURNS:
A string which indicate the current mode.
DESCRIPTION:
Get current mode string.
Functions below are used for KKCP compatible library. These
functions provides a base kana-to-kanji conversion system for EGG.
These functions may be used when users want to change the engine
from Wnn to Canna without changing user interface of Japanese input.
(canna-henkan-begin)
(canna-henkan-next)
(canna-bunsetu-henkou)
(canna-henkan-kakutei)
(canna-henkan-end)
(canna-henkan-quit)
*/
#include <config.h>
#include "lisp.h"
#ifdef HAVE_SHLIB
#include "emodules.h"
#endif
#include "buffer.h"
#include "file-coding.h"
#ifdef CANNA2
#define IROHA_BC
#define CANNA_NEW_WCHAR_AWARE
#include "canna/jrkanji.h"
#include "canna/RK.h"
#else /* !CANNA2 */
#include "iroha/jrkanji.h"
#include "iroha/RK.h"
#endif /* !CANNA2 */
extern char *jrKanjiError;
extern int (*jrBeepFunc) (void);
/* #### is this global really necessary? */
#define KEYTOSTRSIZE 2048
static char key_buffer[KEYTOSTRSIZE];
static char **warning;
static int canna_empty_info, canna_through_info;
static int canna_underline;
static int canna_inhibit_hankakukana;
static Lisp_Object Vcanna_kakutei_string;
static Lisp_Object Vcanna_kakutei_yomi;
static Lisp_Object Vcanna_kakutei_romaji;
static Lisp_Object Vcanna_henkan_string;
static Fixnum canna_henkan_length;
static Fixnum canna_henkan_revPos;
static Fixnum canna_henkan_revLen;
static Lisp_Object Vcanna_ichiran_string;
static Fixnum canna_ichiran_length;
static Fixnum canna_ichiran_revPos;
static Fixnum canna_ichiran_revLen;
static Lisp_Object Vcanna_mode_string;
static int IRCP_context;
static Lisp_Object storeResults (char *, int, jrKanjiStatus *);
static Lisp_Object kanjiYomiList (int, int);
static Lisp_Object CANNA_mode_keys (void);
#ifdef CANNA_MULE
static void m2c (unsigned char *, int, unsigned char *);
static Lisp_Object mule_make_string (unsigned char *, int);
static int mule_strlen (unsigned char *, int);
static void count_char (unsigned char *,int, int, int, Fixnum *, Fixnum *, Fixnum *);
#define make_string mule_make_string
#endif
/* Lisp functions definition */
DEFUN ("canna-key-proc", Fcanna_key_proc, 1, 1, 0, /*
Translate a key input to a set of strings. The strings contain both
well-formed string and intermediate result to show the translation
information to a user. Converted strings are stored in specific
variables.
*/
(ch))
{
jrKanjiStatus ks;
int len;
CHECK_CHAR_COERCE_INT (ch);
len = jrKanjiString (0, XCHAR (ch), key_buffer, KEYTOSTRSIZE, &ks);
return storeResults (key_buffer, len, &ks);
}
static Lisp_Object
storeResults (char *buf, int len, jrKanjiStatus *ks)
{
Lisp_Object val = Qnil;
if (len < 0)
{ /* Error detected */
val = make_string ((unsigned char*) jrKanjiError, strlen (jrKanjiError));
}
else
{
/* ³ÎÄꀷ€¿Êž»úÎó (the confirmed string) */
Vcanna_kakutei_string = make_string ((unsigned char *) buf, len);
val = make_int (len);
/* ³ÎÄꀷ€¿Êž»úÎó€ÎÆɀ߀ΟðÊó...
(info about the reading of the confirmed string) */
Vcanna_kakutei_yomi = Vcanna_kakutei_romaji = Qnil;
if (ks->info & KanjiYomiInfo)
{
char *p = buf + len + 1;
int yomilen = strlen (p);
if (len + yomilen + 1 < KEYTOSTRSIZE)
{
int yomilen2;
Vcanna_kakutei_yomi =
make_string ((unsigned char *) p, yomilen); /* ÆÉ€ß (reading) */
p += yomilen + 1;
yomilen2 = strlen (p);
if (len + yomilen + yomilen2 + 2 < KEYTOSTRSIZE)
{
Vcanna_kakutei_romaji =
make_string ((unsigned char *) p, yomilen2);
/* ¥í¡Œ¥Þ»ú (romanization) */
}
}
}
/* žõÊäÉœŒš€ÎÊž»úÎó€Ç€¹¡£
(string for displaying candidate translations) */
Vcanna_henkan_string = Qnil;
if (ks->length >= 0)
{
Vcanna_henkan_string = make_string (ks->echoStr, ks->length);
#ifndef CANNA_MULE
canna_henkan_length = ks->length;
canna_henkan_revPos = ks->revPos;
canna_henkan_revLen = ks->revLen;
#else /* CANNA_MULE */
if (canna_underline)
{
canna_henkan_length = mule_strlen (ks->echoStr,ks->length);
canna_henkan_revPos = mule_strlen (ks->echoStr,ks->revPos);
canna_henkan_revLen = mule_strlen (ks->echoStr+ks->revPos,
ks->revLen);
}
else
{
count_char (ks->echoStr, ks->length, ks->revPos, ks->revLen,
&canna_henkan_length, &canna_henkan_revPos,
&canna_henkan_revLen);
}
#endif /* CANNA_MULE */
}
/* °ìÍ÷€ÎŸðÊó (information about the echo area menu) */
Vcanna_ichiran_string = Qnil;
if (ks->info & KanjiGLineInfo && ks->gline.length >= 0)
{
Vcanna_ichiran_string = make_string (ks->gline.line,
ks->gline.length);
#ifndef CANNA_MULE
canna_ichiran_length = ks->gline.length;
canna_ichiran_revPos = ks->gline.revPos;
canna_ichiran_revLen = ks->gline.revLen;
#else /* CANNA_MULE */
count_char (ks->gline.line, ks->gline.length,
ks->gline.revPos, ks->gline.revLen,
&canna_ichiran_length,
&canna_ichiran_revPos, &canna_ichiran_revLen);
#endif /* CANNA_MULE */
}
/* ¥â¡Œ¥É€ÎŸðÊó (mode information) */
Vcanna_mode_string = Qnil;
if (ks->info & KanjiModeInfo)
{
Vcanna_mode_string =
make_string (ks->mode, strlen ((const char *) ks->mode));
}
/* €œ€ÎŸ€ÎŸðÊó (other information) */
canna_empty_info = (ks->info & KanjiEmptyInfo) ? 1 : 0;
canna_through_info = (ks->info & KanjiThroughInfo) ? 1 : 0;
}
return val;
}
DEFUN ("canna-set-bunsetsu-kugiri", Fcanna_set_bunsetsu, 0, 1, 0, /*
This function sets the clause separator.
If non-nil value is specified, the white space separator will be used.
No separator will be used otherwise.
*/
(num))
{
int kugiri; /* ÊžÀá¶èÀÚ€ê€ò€¹€ë€«¡© (display clause separator?) */
kugiri = NILP (num) ? 0 : 1;
jrKanjiControl (0, KC_SETBUNSETSUKUGIRI, (char *) kugiri);
return Qnil;
}
/* For whatever reason, calling Fding directly from libCanna loses */
static int
call_Fding (void)
{
Fding (Qnil, Qnil, Qnil);
return 0;
}
DEFUN ("canna-initialize", Fcanna_initialize, 0, 3, 0, /*
Initialize ``canna'', which is a kana-to-kanji converter for XEmacs.
The first arg specifies if inserting space character between BUNSETSU when
candidates are displayed.
The second arg specifies server.
The third arg specifies a file which will be used as a customization
description.
If nil is specified for each arg, the default value will be used.
*/
(num, server, rcfile))
{
Lisp_Object val;
int res;
unsigned char **p, **q;
int kugiri; /* ÊžÀá¶èÀÚ€ê€ò€¹€ë€«¡© (display clause separator?) */
IRCP_context = -1;
if (NILP (num))
{
kugiri = 1;
}
else
{
CHECK_INT (num);
kugiri = XINT (num);
kugiri = (kugiri == 1) ? 1 : 0;
}
if (NILP (server))
{
jrKanjiControl (0, KC_SETSERVERNAME, (char *) 0);
}
else
{
char servername[256];
CHECK_STRING (server);
strncpy (servername, (const char *) XSTRING_DATA (server),
XSTRING_LENGTH (server));
servername[XSTRING_LENGTH (server)] = '\0';
jrKanjiControl (0, KC_SETSERVERNAME, servername);
}
if (NILP (rcfile))
{
jrKanjiControl (0, KC_SETINITFILENAME, (char *) 0);
}
else
{
char rcname[256];
CHECK_STRING (rcfile);
strncpy (rcname, (const char *) XSTRING_DATA (rcfile),
XSTRING_LENGTH (rcfile));
rcname[XSTRING_LENGTH (rcfile)] = '\0';
jrKanjiControl (0, KC_SETINITFILENAME, rcname);
}
warning = (char **) 0;
#ifdef nec_ews_svr4
stop_polling ();
#endif /* nec_ews_svr4 */
res = jrKanjiControl (0, KC_INITIALIZE, (char *)&warning);
#ifdef nec_ews_svr4
start_polling ();
#endif /* nec_ews_svr4 */
val = Qnil;
if (warning)
{
for (p = q = (unsigned char **) warning ; *q ; q++)
;
while (p < q)
{
q--;
val = Fcons (make_string (*q, strlen ((const char *) *q)), val);
}
}
val = Fcons (val, Qnil);
if (res == -1)
{
val = Fcons (make_string ((unsigned char *) jrKanjiError,
strlen (jrKanjiError)), val);
/* ¥€¥Ë¥·¥ã¥é¥€¥º€ÇŒºÇÔ€·€¿Ÿì¹ç¡£ (on initialization failure) */
return Fcons (Qnil, val);
}
else
{
jrBeepFunc = call_Fding;
#ifdef KC_SETAPPNAME
#ifndef CANNA_MULE
jrKanjiControl (0, KC_SETAPPNAME, "nemacs");
#else /* CANNA_MULE */
jrKanjiControl (0, KC_SETAPPNAME, "mule");
#endif /* CANNA_MULE */
#endif /* KC_SETAPPNAME */
jrKanjiControl (0, KC_SETBUNSETSUKUGIRI, (char *) kugiri);
jrKanjiControl (0, KC_SETWIDTH, (char *) 78);
#ifndef CANNA_MULE
jrKanjiControl (0, KC_INHIBITHANKAKUKANA, (char *) 1);
#else
/* mule €À€Ã€¿€éÈŸ³Ñ¥«¥¿¥«¥Ê€â»È€š€ë
(Mule can use half-width katakana) */
if (canna_inhibit_hankakukana)
jrKanjiControl (0, KC_INHIBITHANKAKUKANA, (char *) 1);
#endif
jrKanjiControl (0, KC_YOMIINFO, (char *) 2); /* ¢š£²: ¥í¡Œ¥Þ»ú€Þ€ÇÊÖ€¹
(*2: return to
romanized form) */
val = Fcons (Qnil, val);
return Fcons (CANNA_mode_keys (), val);
}
}
DEFUN ("canna-finalize", Fcanna_finalize, 0, 0, 0, /*
finalize ``canna'', which is a kana-to-kanji converter for XEmacs.
This cause to write miscellaneous informations to kana-to-kanji dictionary.
*/
())
{
Lisp_Object val;
unsigned char **p;
jrKanjiControl (0, KC_FINALIZE, (char *)&warning);
val = Qnil;
if (warning)
{
for (p = (unsigned char**) warning ; *p ; p++)
{
val = Fcons (make_string (*p, strlen ((const char *) *p)), val);
}
}
val = Fcons (val, Qnil);
IRCP_context = -1;
return val;
}
DEFUN ("canna-touroku-string", Fcanna_touroku_string, 1, 1, 0, /*
Register Kanji words into kana-to-kanji conversion dictionary.
*/
(str))
{
jrKanjiStatusWithValue ksv;
jrKanjiStatus ks;
#ifdef CANNA_MULE
unsigned char cbuf[4096];
#endif
CHECK_STRING (str);
ksv.buffer = (unsigned char *) key_buffer;
ksv.bytes_buffer = KEYTOSTRSIZE;
#ifndef CANNA_MULE
ks.echoStr = XSTRING_DATA (str);
ks.length = XSTRING_LENGTH (str);
#else /* CANNA_MULE */
m2c (XSTRING_DATA (str), XSTRING_LENGTH (str), cbuf);
ks.echoStr = cbuf;
ks.length = strlen ((const char *) cbuf);
#endif /* CANNA_MULE */
ksv.ks = &ks;
jrKanjiControl (0, KC_DEFINEKANJI, (char *)&ksv);
return storeResults (key_buffer, ksv.val, ksv.ks);
}
DEFUN ("canna-set-width", Fcanna_set_width, 1, 1, 0, /*
Set status-line width information, which is used to display
kanji candidates.
*/
(num))
{
CHECK_INT (num);
jrKanjiControl (0, KC_SETWIDTH, (char *) XINT (num));
return Qnil;
}
DEFUN ("canna-change-mode", Fcanna_change_mode, 1, 1, 0, /*
Change Japanese pre-edit mode.
*/
(num))
{
jrKanjiStatusWithValue ksv;
jrKanjiStatus ks;
CHECK_INT (num);
ksv.buffer = (unsigned char *) key_buffer;
ksv.bytes_buffer = KEYTOSTRSIZE;
ksv.ks = &ks;
ksv.val = XINT (num);
jrKanjiControl (0, KC_CHANGEMODE, (char *)&ksv);
return storeResults (key_buffer, ksv.val, ksv.ks);
}
static Lisp_Object
CANNA_mode_keys (void)
{
#define CANNAWORKBUFSIZE 32
char xxx[CANNAWORKBUFSIZE];
Lisp_Object val;
int i, n;
n = jrKanjiControl (0, KC_MODEKEYS, xxx);
val = Qnil;
for (i = n ; i > 0 ;)
{
--i;
/* !!#### something fucked here */
val = Fcons (make_char ((int)(0xFF & (unsigned char) xxx[i])), val);
}
return val;
}
DEFUN ("canna-store-yomi", Fcanna_store_yomi, 1, 2, 0, /*
Store yomi characters as a YOMI of kana-to-kanji conversion.
*/
(yomi, roma))
{
jrKanjiStatusWithValue ksv;
jrKanjiStatus ks;
CHECK_STRING (yomi);
#ifndef CANNA_MULE
strncpy (key_buffer, XSTRING_DATA (yomi), XSTRING_LENGTH (yomi));
ks.length = XSTRING_LENGTH (yomi);
key_buffer[ks.length] = '\0';
#else /* CANNA_MULE */
m2c (XSTRING_DATA (yomi), XSTRING_LENGTH (yomi),
(unsigned char *) key_buffer);
ks.length = strlen (key_buffer);
#endif /* CANNA_MULE */
if (NILP (roma))
{
ks.mode = 0;
}
else
{
CHECK_STRING (roma);
#ifndef CANNA_MULE
strncpy (key_buffer + XSTRING_LENGTH (yomi) + 1, XSTRING_DATA (roma),
XSTRING_LENGTH (roma));
key_buffer[XSTRING_LENGTH (yomi) + 1 + XSTRING_LENGTH (roma)] = '\0';
ks.mode = (unsigned char *)(key_buffer + XSTRING_LENGTH (yomi) + 1);
#else /* CANNA_MULE */
ks.mode = (unsigned char *)(key_buffer + ks.length + 1);
m2c (XSTRING_DATA (roma), XSTRING_LENGTH (roma),
(unsigned char *) ks.mode);
#endif /* CANNA_MULE */
}
ks.echoStr = (unsigned char *) key_buffer;
ksv.buffer = (unsigned char *) key_buffer; /* ÊÖÃÍÍÑ (return value) */
ksv.bytes_buffer = KEYTOSTRSIZE;
ksv.ks = &ks;
jrKanjiControl (0, KC_STOREYOMI, (char *)&ksv);
return storeResults (key_buffer, ksv.val, ksv.ks);
}
DEFUN ("canna-do-function", Fcanna_do_function, 1, 2, 0, /*
Do specified function at current mode.
*/
(num, ch))
{
jrKanjiStatusWithValue ksv;
jrKanjiStatus ks;
CHECK_INT (num);
if (NILP (ch))
{
*key_buffer = '＠';
}
else
{
CHECK_CHAR (ch);
*key_buffer = XCHAR (ch);
}
ksv.buffer = (unsigned char *) key_buffer;
ksv.bytes_buffer = KEYTOSTRSIZE;
ksv.ks = &ks;
ksv.val = XINT (num);
jrKanjiControl (0, KC_DO, (char *) &ksv);
return storeResults (key_buffer, ksv.val, ksv.ks);
}
DEFUN ("canna-parse", Fcanna_parse, 1, 1, 0, /*
Parse customize string.
*/
(str))
{
Lisp_Object val;
unsigned char **p;
int n;
CHECK_STRING (str);
#ifndef CANNA_MULE
strncpy (key_buffer, XSTRING_DATA (str), XSTRING_LENGTH (str));
key_buffer[XSTRING_LENGTH (str)] = '\0';
#else /* CANNA_MULE */
m2c (XSTRING_DATA (str), XSTRING_LENGTH (str), (unsigned char *) key_buffer);
#endif /* CANNA_MULE */
p = (unsigned char**) key_buffer;
n = jrKanjiControl (0, KC_PARSE, (char *) &p);
val = Qnil;
while (n > 0)
{
n--;
val = Fcons (make_string (p[n], strlen ((const char *) p[n])), val);
}
return val;
}
DEFUN ("canna-query-mode", Fcanna_query_mode, 0, 0, 0, /*
Get current mode string.
*/
())
{
char buf[256];
jrKanjiControl (0, KC_QUERYMODE, buf);
return make_string ((unsigned char *) buf, strlen (buf));
}
/*
* Functions following this line are for KKCP interface compatible
* library. These functions may be used by MILK system.
*/
#define RKBUFSIZE 1024
static unsigned char yomibuf[RKBUFSIZE];
static short kugiri[RKBUFSIZE / 2];
static int
confirmContext (void)
{
if (IRCP_context < 0)
{
int context;
if ((context = jrKanjiControl (0, KC_GETCONTEXT, (char *) 0)) == -1)
{
return 0;
}
IRCP_context = context;
}
return 1;
}
static int
byteLen (int bun, int len)
{
int i = 0, offset = 0, ch;
if (0 <= bun && bun < RKBUFSIZE)
{
offset = kugiri[bun];
}
while (len-- > 0 && (ch = (int) yomibuf[offset + i]))
{
i++;
if (ch & 0x80)
{
i++;
}
}
return i;
}
DEFUN ("canna-henkan-begin", Fcanna_henkan_begin, 1, 1, 0, /*
Return the result of kana-to-kanji conversion.
Clause separator is set.
*/
(yomi))
{
int nbun;
CHECK_STRING (yomi);
if (confirmContext () == 0)
{
return Qnil;
}
#ifndef CANNA_MULE
strncpy (yomibuf, XSTRING_DATA (yomi), XSTRING_LENGTH (yomi));
yomibuf[XSTRING_LENGTH (yomi)] = '\0';
nbun = RkBgnBun (IRCP_context, XSTRING_DATA (yomi), XSTRING_LENGTH (yomi),
(RK_XFER << RK_XFERBITS) | RK_KFER);
#else /* CANNA_MULE */
m2c (XSTRING_DATA (yomi), XSTRING_LENGTH (yomi), yomibuf);
nbun = RkBgnBun (IRCP_context, (char *) yomibuf,
strlen ((const char *) yomibuf),
(RK_XFER << RK_XFERBITS) | RK_KFER);
#endif /* CANNA_MULE */
return kanjiYomiList (IRCP_context, nbun);
}
static Lisp_Object
kanjiYomiList (int context, int nbun)
{
Lisp_Object val, res = Qnil;
unsigned char RkBuf[RKBUFSIZE];
int len, i, total;
for (i = nbun ; i > 0 ; )
{
i--;
RkGoTo (context, i);
len = RkGetKanji (context, RkBuf, RKBUFSIZE);
val = make_string (RkBuf, len);
len = RkGetYomi (context, RkBuf, RKBUFSIZE);
res = Fcons (Fcons (val, make_string (RkBuf, len)), res);
if (i < RKBUFSIZE / 2)
{
kugiri[i] = len;
}
}
for (i = 0, total = 0 ; i < nbun ; i++)
{
int temp = kugiri[i];
kugiri[i] = total;
total += temp;
}
return res;
}
DEFUN ("canna-henkan-next", Fcanna_henkan_next, 1, 1, 0, /*
Return the list of candidates.
*/
(bunsetsu))
{
int i, slen, len;
unsigned char *p, RkBuf[RKBUFSIZE];
Lisp_Object res = Qnil;
CHECK_INT (bunsetsu);
if (confirmContext () == 0)
{
return Qnil;
}
RkGoTo (IRCP_context, XINT (bunsetsu));
len = RkGetKanjiList (IRCP_context, RkBuf, RKBUFSIZE);
p = RkBuf;
for (i = 0 ; i < len ; i++)
{
slen = strlen ((const char *) p);
if (NILP(res))
{
res = Fcons (make_string (p, slen), Qnil);
}
else
{
XCDR (res) = Fcons (make_string (p, slen), Qnil);
}
p += slen + 1;
}
return res;
}
DEFUN ("canna-bunsetu-henkou", Fcanna_bunsetu_henkou, 2, 2, 0, /*
Specify the length of a clause.
*/
(bunsetsu, bunlen))
{
int nbun, len;
CHECK_INT (bunsetsu);
CHECK_INT (bunlen);
nbun = XINT (bunsetsu);
if (confirmContext () == 0)
{
return Qnil;
}
RkGoTo (IRCP_context, nbun);
len = byteLen (nbun, XINT (bunlen));
return kanjiYomiList (IRCP_context, RkResize (IRCP_context, len));
}
DEFUN ("canna-henkan-kakutei", Fcanna_henkan_kakutei, 2, 2, 0, /*
Select a candidate.
*/
(bun, kouho))
{
int nbun, nkouho;
if (confirmContext () == 0)
{
return Qnil;
}
nbun = XINT(bun);
RkGoTo (IRCP_context, nbun);
nkouho = XINT(kouho);
RkXfer (IRCP_context, nkouho);
return Qt;
}
DEFUN ("canna-henkan-end", Fcanna_henkan_end, 0, 0, 0, /*
End conversion.
*/
())
{
if (confirmContext () == 0)
{
return Qnil;
}
RkEndBun (IRCP_context, 1); /* ³Øœ¬€Ï€€€Ä€Ç€â¹Ô€Ã€ÆÎÉ€€€â€Î€Ê€Î€«¡©
(is it OK to invoke learning function
at arbitrary times?) */
return Qt;
}
DEFUN ("canna-henkan-quit", Fcanna_henkan_quit, 0, 0, 0, /*
Quit conversion.
*/
())
{
if (confirmContext () == 0)
{
return Qnil;
}
RkEndBun (IRCP_context, 0);
return Qt;
}
/* variables below this line is constants of Canna */
static Fixnum canna_mode_AlphaMode;
static Fixnum canna_mode_EmptyMode;
static Fixnum canna_mode_KigoMode;
static Fixnum canna_mode_YomiMode;
static Fixnum canna_mode_JishuMode;
static Fixnum canna_mode_TankouhoMode;
static Fixnum canna_mode_IchiranMode;
static Fixnum canna_mode_YesNoMode;
static Fixnum canna_mode_OnOffMode;
#ifdef CANNA_MODE_AdjustBunsetsuMode
static Fixnum canna_mode_AdjustBunsetsuMode;
#endif
#ifdef CANNA_MODE_ChikujiYomiMode
static Fixnum canna_mode_ChikujiYomiMode;
static Fixnum canna_mode_ChikujiTanMode;
#endif
static Fixnum canna_mode_HenkanMode;
#ifdef CANNA_MODE_HenkanNyuryokuMode
static Fixnum canna_mode_HenkanNyuryokuMode;
#endif
#ifdef CANNA_MODE_ZenHiraHenkanMode
static Fixnum canna_mode_ZenHiraHenkanMode;
#ifdef CANNA_MODE_HanHiraHenkanMode
static Fixnum canna_mode_HanHiraHenkanMode;
#endif
static Fixnum canna_mode_ZenKataHenkanMode;
static Fixnum canna_mode_HanKataHenkanMode;
static Fixnum canna_mode_ZenAlphaHenkanMode;
static Fixnum canna_mode_HanAlphaHenkanMode;
#endif
static Fixnum canna_mode_ZenHiraKakuteiMode;
#ifdef CANNA_MODE_HanHiraKakuteiMode
static Fixnum canna_mode_HanHiraKakuteiMode;
#endif
static Fixnum canna_mode_ZenKataKakuteiMode;
static Fixnum canna_mode_HanKataKakuteiMode;
static Fixnum canna_mode_ZenAlphaKakuteiMode;
static Fixnum canna_mode_HanAlphaKakuteiMode;
static Fixnum canna_mode_HexMode;
static Fixnum canna_mode_BushuMode;
static Fixnum canna_mode_ExtendMode;
static Fixnum canna_mode_RussianMode;
static Fixnum canna_mode_GreekMode;
static Fixnum canna_mode_LineMode;
static Fixnum canna_mode_ChangingServerMode;
static Fixnum canna_mode_HenkanMethodMode;
static Fixnum canna_mode_DeleteDicMode;
static Fixnum canna_mode_TourokuMode;
static Fixnum canna_mode_TourokuEmptyMode;
static Fixnum canna_mode_TourokuHinshiMode;
static Fixnum canna_mode_TourokuDicMode;
static Fixnum canna_mode_QuotedInsertMode;
static Fixnum canna_mode_BubunMuhenkanMode;
static Fixnum canna_mode_MountDicMode;
static Fixnum canna_fn_SelfInsert;
static Fixnum canna_fn_FunctionalInsert;
static Fixnum canna_fn_QuotedInsert;
static Fixnum canna_fn_JapaneseMode;
static Fixnum canna_fn_AlphaMode;
static Fixnum canna_fn_HenkanNyuryokuMode;
static Fixnum canna_fn_Forward;
static Fixnum canna_fn_Backward;
static Fixnum canna_fn_Next;
static Fixnum canna_fn_Prev;
static Fixnum canna_fn_BeginningOfLine;
static Fixnum canna_fn_EndOfLine;
static Fixnum canna_fn_DeleteNext;
static Fixnum canna_fn_DeletePrevious;
static Fixnum canna_fn_KillToEndOfLine;
static Fixnum canna_fn_Henkan;
static Fixnum canna_fn_Kakutei;
static Fixnum canna_fn_Extend;
static Fixnum canna_fn_Shrink;
#ifdef CANNA_FN_AdjustBunsetsu
static Fixnum canna_fn_AdjustBunsetsu;
#endif
static Fixnum canna_fn_Quit;
static Fixnum canna_fn_ConvertAsHex;
static Fixnum canna_fn_ConvertAsBushu;
static Fixnum canna_fn_KouhoIchiran;
static Fixnum canna_fn_BubunMuhenkan;
static Fixnum canna_fn_Zenkaku;
static Fixnum canna_fn_Hankaku;
static Fixnum canna_fn_ToUpper;
static Fixnum canna_fn_Capitalize;
static Fixnum canna_fn_ToLower;
static Fixnum canna_fn_Hiragana;
static Fixnum canna_fn_Katakana;
static Fixnum canna_fn_Romaji;
#ifdef CANNA_FN_BaseHiragana
static Fixnum canna_fn_BaseHiragana;
static Fixnum canna_fn_BaseKatakana;
static Fixnum canna_fn_BaseEisu;
static Fixnum canna_fn_BaseZenkaku;
static Fixnum canna_fn_BaseHankaku;
static Fixnum canna_fn_BaseKana;
static Fixnum canna_fn_BaseKakutei;
static Fixnum canna_fn_BaseHenkan;
static Fixnum canna_fn_BaseHiraKataToggle;
static Fixnum canna_fn_BaseZenHanToggle;
static Fixnum canna_fn_BaseKanaEisuToggle;
static Fixnum canna_fn_BaseKakuteiHenkanToggle;
static Fixnum canna_fn_BaseRotateForward;
static Fixnum canna_fn_BaseRotateBackward;
#endif
static Fixnum canna_fn_ExtendMode;
static Fixnum canna_fn_Touroku;
static Fixnum canna_fn_HexMode;
static Fixnum canna_fn_BushuMode;
static Fixnum canna_fn_KigouMode;
#ifdef CANNA_FN_Mark
static Fixnum canna_fn_Mark;
#endif
#ifdef CANNA_FN_TemporalMode
static Fixnum canna_fn_TemporalMode;
#endif
static Fixnum canna_key_Nfer;
static Fixnum canna_key_Xfer;
static Fixnum canna_key_Up;
static Fixnum canna_key_Left;
static Fixnum canna_key_Right;
static Fixnum canna_key_Down;
static Fixnum canna_key_Insert;
static Fixnum canna_key_Rollup;
static Fixnum canna_key_Rolldown;
static Fixnum canna_key_Home;
static Fixnum canna_key_Help;
static Fixnum canna_key_KP_Key;
static Fixnum canna_key_Shift_Nfer;
static Fixnum canna_key_Shift_Xfer;
static Fixnum canna_key_Shift_Up;
static Fixnum canna_key_Shift_Left;
static Fixnum canna_key_Shift_Right;
static Fixnum canna_key_Shift_Down;
static Fixnum canna_key_Cntrl_Nfer;
static Fixnum canna_key_Cntrl_Xfer;
static Fixnum canna_key_Cntrl_Up;
static Fixnum canna_key_Cntrl_Left;
static Fixnum canna_key_Cntrl_Right;
static Fixnum canna_key_Cntrl_Down;
Lisp_Object VCANNA; /* by MORIOKA Tomohiko <morioka(a)jaist.ac.jp>
1996/6/7 */
/*
* Each dynamically loaded Emacs module is given a name at compile
* time. This is a short name, and must be a valid part of a C
* identifier. This name is used to construct the name of several
* functions which must appear in the module source code.
* The first such function, modules_of_XXXX, should load in any dependent
* modules. This function is optional, and the module will still load if
* it is not present in the module.
*
* The second function, which is NOT optional, is syms_of_XXXX, in which
* all functions that the module will be provided are declared. This
* function will contain calls to DEFSUBR().
*
* The third function, which is also NOT optional, is vars_of_XXXX, in
* which you declare all variables that the module provides. This
* function will contain calls to DEFVAR_LISP(), DEFVAR_BOOL() etc.
*
* When declaring functions and variables in the syms_of_XXXX and
* vars_of_XXXX functions, you use the exact same syntax that you
* would as if this module were being compiled into the pure Emacs.
*
* The fourth function, which is optional, is unload_XXXX, in which actions
* that must be taken to unload the module are listed. XEmacs will unbind
* functions and variables for you. Anything else that must be done should
* appear in this function.
*
* All four of these functions are declared as void functions,
* taking no parameters. Since this sample module is called 'sample',
* the functions will be named 'modules_of_sample', 'syms_of_sample',
* 'vars_of_sample', and 'unload_sample'.
*/
#if 0
void
modules_of_canna_api (void)
{
/*
* This function isn't actually required as we will not be loading
* in any dependent modules, but if we were, we would do something like:
* emodules_load ("dependent.ell", "canna2", "1.0.0");
*/
}
#endif
void
syms_of_canna_api (void)
{
DEFSUBR (Fcanna_key_proc);
DEFSUBR (Fcanna_initialize);
DEFSUBR (Fcanna_finalize);
DEFSUBR (Fcanna_touroku_string);
DEFSUBR (Fcanna_set_width);
DEFSUBR (Fcanna_change_mode);
DEFSUBR (Fcanna_store_yomi);
DEFSUBR (Fcanna_do_function);
DEFSUBR (Fcanna_parse);
DEFSUBR (Fcanna_query_mode);
DEFSUBR (Fcanna_set_bunsetsu);
DEFSUBR (Fcanna_henkan_begin);
DEFSUBR (Fcanna_henkan_next);
DEFSUBR (Fcanna_bunsetu_henkou);
DEFSUBR (Fcanna_henkan_kakutei);
DEFSUBR (Fcanna_henkan_end);
DEFSUBR (Fcanna_henkan_quit);
}
void
vars_of_canna_api (void)
{
DEFVAR_LISP ("CANNA", &VCANNA); /* hir＠nec, 1992.5.21 */
VCANNA = Qt; /* hir＠nec, 1992.5.21 */
DEFVAR_LISP ("canna-kakutei-string", &Vcanna_kakutei_string /*
*/ );
Vcanna_kakutei_string = Qnil;
DEFVAR_LISP ("canna-kakutei-yomi", &Vcanna_kakutei_yomi /*
*/ );
Vcanna_kakutei_yomi = Qnil;
DEFVAR_LISP ("canna-kakutei-romaji", &Vcanna_kakutei_romaji /*
*/ );
Vcanna_kakutei_romaji = Qnil;
DEFVAR_LISP ("canna-henkan-string", &Vcanna_henkan_string /*
*/ );
Vcanna_henkan_string = Qnil;
DEFVAR_INT ("canna-henkan-length", &canna_henkan_length /*
*/ );
canna_henkan_length = 0;
DEFVAR_INT ("canna-henkan-revpos", &canna_henkan_revPos /*
*/ );
canna_henkan_revPos = 0;
DEFVAR_INT ("canna-henkan-revlen", &canna_henkan_revLen /*
*/ );
canna_henkan_revLen = 0;
DEFVAR_LISP ("canna-ichiran-string", &Vcanna_ichiran_string /*
*/ );
Vcanna_ichiran_string = Qnil;
DEFVAR_INT ("canna-ichiran-length", &canna_ichiran_length /*
*/ );
canna_ichiran_length = 0;
DEFVAR_INT ("canna-ichiran-revpos", &canna_ichiran_revPos /*
*/ );
canna_ichiran_revPos = 0;
DEFVAR_INT ("canna-ichiran-revlen", &canna_ichiran_revLen /*
*/ );
canna_ichiran_revLen = 0;
DEFVAR_LISP ("canna-mode-string", &Vcanna_mode_string /*
*/ );
Vcanna_mode_string = Qnil;
DEFVAR_BOOL ("canna-empty-info", &canna_empty_info /*
For canna
*/ );
canna_empty_info = 0;
DEFVAR_BOOL ("canna-through-info", &canna_through_info /*
For canna
*/ );
canna_through_info = 0;
DEFVAR_BOOL ("canna-underline", &canna_underline /*
For canna
*/ );
canna_underline = 0;
DEFVAR_BOOL ("canna-inhibit-hankakukana", &canna_inhibit_hankakukana /*
For canna
*/ );
canna_inhibit_hankakukana = 0;
DEFVAR_INT ("canna-mode-alpha-mode", &canna_mode_AlphaMode /*
*/ );
canna_mode_AlphaMode = IROHA_MODE_AlphaMode;
DEFVAR_INT ("canna-mode-empty-mode", &canna_mode_EmptyMode /*
*/ );
canna_mode_EmptyMode = IROHA_MODE_EmptyMode;
DEFVAR_INT ("canna-mode-kigo-mode", &canna_mode_KigoMode /*
*/ );
canna_mode_KigoMode = IROHA_MODE_KigoMode;
DEFVAR_INT ("canna-mode-yomi-mode", &canna_mode_YomiMode /*
*/ );
canna_mode_YomiMode = IROHA_MODE_YomiMode;
DEFVAR_INT ("canna-mode-jishu-mode", &canna_mode_JishuMode /*
*/ );
canna_mode_JishuMode = IROHA_MODE_JishuMode;
DEFVAR_INT ("canna-mode-tankouho-mode", &canna_mode_TankouhoMode /*
*/ );
canna_mode_TankouhoMode = IROHA_MODE_TankouhoMode;
DEFVAR_INT ("canna-mode-ichiran-mode", &canna_mode_IchiranMode /*
*/ );
canna_mode_IchiranMode = IROHA_MODE_IchiranMode;
DEFVAR_INT ("canna-mode-yes-no-mode", &canna_mode_YesNoMode /*
*/ );
canna_mode_YesNoMode = IROHA_MODE_YesNoMode;
DEFVAR_INT ("canna-mode-on-off-mode", &canna_mode_OnOffMode /*
*/ );
canna_mode_OnOffMode = IROHA_MODE_OnOffMode;
#ifdef CANNA_MODE_AdjustBunsetsuMode
DEFVAR_INT ("canna-mode-adjust-bunsetsu-mode",
&canna_mode_AdjustBunsetsuMode /*
*/ );
canna_mode_AdjustBunsetsuMode = CANNA_MODE_AdjustBunsetsuMode;
#endif
#ifdef CANNA_MODE_ChikujiYomiMode
DEFVAR_INT ("canna-mode-chikuji-yomi-mode", &canna_mode_ChikujiYomiMode /*
*/ );
canna_mode_ChikujiYomiMode = CANNA_MODE_ChikujiYomiMode;
DEFVAR_INT ("canna-mode-chikuji-bunsetsu-mode",
&canna_mode_ChikujiTanMode /*
*/ );
canna_mode_ChikujiTanMode = CANNA_MODE_ChikujiTanMode;
#endif
DEFVAR_INT ("canna-mode-henkan-mode", &canna_mode_HenkanMode /*
*/ );
canna_mode_HenkanMode = IROHA_MODE_HenkanMode;
#ifdef CANNA_MODE_HenkanNyuryokuMode
DEFVAR_INT ("canna-mode-henkan-nyuuryoku-mode",
&canna_mode_HenkanNyuryokuMode /*
*/ );
canna_mode_HenkanNyuryokuMode = CANNA_MODE_HenkanNyuryokuMode;
#endif
#ifdef CANNA_MODE_ZenHiraHenkanMode
DEFVAR_INT ("canna-mode-zen-hira-henkan-mode",
&canna_mode_ZenHiraHenkanMode /*
*/ );
canna_mode_ZenHiraHenkanMode = CANNA_MODE_ZenHiraHenkanMode;
#ifdef CANNA_MODE_HanHiraHenkanMode
DEFVAR_INT ("canna-mode-han-hira-henkan-mode",
&canna_mode_HanHiraHenkanMode /*
*/ );
canna_mode_HanHiraHenkanMode = CANNA_MODE_HanHiraHenkanMode;
#endif
DEFVAR_INT ("canna-mode-zen-kata-henkan-mode",
&canna_mode_ZenKataHenkanMode /*
*/ );
canna_mode_ZenKataHenkanMode = CANNA_MODE_ZenKataHenkanMode;
DEFVAR_INT ("canna-mode-han-kata-henkan-mode",
&canna_mode_HanKataHenkanMode /*
*/ );
canna_mode_HanKataHenkanMode = CANNA_MODE_HanKataHenkanMode;
DEFVAR_INT ("canna-mode-zen-alpha-henkan-mode",
&canna_mode_ZenAlphaHenkanMode /*
*/ );
canna_mode_ZenAlphaHenkanMode = CANNA_MODE_ZenAlphaHenkanMode;
DEFVAR_INT ("canna-mode-han-alpha-henkan-mode",
&canna_mode_HanAlphaHenkanMode /*
*/ );
canna_mode_HanAlphaHenkanMode = CANNA_MODE_HanAlphaHenkanMode;
#endif
DEFVAR_INT ("canna-mode-zen-hira-kakutei-mode",
&canna_mode_ZenHiraKakuteiMode /*
*/ );
canna_mode_ZenHiraKakuteiMode = IROHA_MODE_ZenHiraKakuteiMode;
#ifdef CANNA_MODE_HanHiraKakuteiMode
DEFVAR_INT ("canna-mode-han-hira-kakutei-mode",
&canna_mode_HanHiraKakuteiMode /*
*/ );
canna_mode_HanHiraKakuteiMode = CANNA_MODE_HanHiraKakuteiMode;
#endif
DEFVAR_INT ("canna-mode-zen-kata-kakutei-mode",
&canna_mode_ZenKataKakuteiMode /*
*/ );
canna_mode_ZenKataKakuteiMode = IROHA_MODE_ZenKataKakuteiMode;
DEFVAR_INT ("canna-mode-han-kata-kakutei-mode",
&canna_mode_HanKataKakuteiMode /*
*/ );
canna_mode_HanKataKakuteiMode = IROHA_MODE_HanKataKakuteiMode;
DEFVAR_INT ("canna-mode-zen-alpha-kakutei-mode",
&canna_mode_ZenAlphaKakuteiMode /*
*/ );
canna_mode_ZenAlphaKakuteiMode = IROHA_MODE_ZenAlphaKakuteiMode;
DEFVAR_INT ("canna-mode-han-alpha-kakutei-mode",
&canna_mode_HanAlphaKakuteiMode /*
*/ );
canna_mode_HanAlphaKakuteiMode = IROHA_MODE_HanAlphaKakuteiMode;
DEFVAR_INT ("canna-mode-hex-mode", &canna_mode_HexMode /*
*/ );
canna_mode_HexMode = IROHA_MODE_HexMode;
DEFVAR_INT ("canna-mode-bushu-mode", &canna_mode_BushuMode /*
*/ );
canna_mode_BushuMode = IROHA_MODE_BushuMode;
DEFVAR_INT ("canna-mode-extend-mode", &canna_mode_ExtendMode /*
*/ );
canna_mode_ExtendMode = IROHA_MODE_ExtendMode;
DEFVAR_INT ("canna-mode-russian-mode", &canna_mode_RussianMode /*
*/ );
canna_mode_RussianMode = IROHA_MODE_RussianMode;
DEFVAR_INT ("canna-mode-greek-mode", &canna_mode_GreekMode /*
*/ );
canna_mode_GreekMode = IROHA_MODE_GreekMode;
DEFVAR_INT ("canna-mode-line-mode", &canna_mode_LineMode /*
*/ );
canna_mode_LineMode = IROHA_MODE_LineMode;
DEFVAR_INT ("canna-mode-changing-server-mode",
&canna_mode_ChangingServerMode /*
*/ );
canna_mode_ChangingServerMode = IROHA_MODE_ChangingServerMode;
DEFVAR_INT ("canna-mode-henkan-method-mode",
&canna_mode_HenkanMethodMode /*
*/ );
canna_mode_HenkanMethodMode = IROHA_MODE_HenkanMethodMode;
DEFVAR_INT ("canna-mode-delete-dic-mode", &canna_mode_DeleteDicMode /*
*/ );
canna_mode_DeleteDicMode = IROHA_MODE_DeleteDicMode;
DEFVAR_INT ("canna-mode-touroku-mode", &canna_mode_TourokuMode /*
*/ );
canna_mode_TourokuMode = IROHA_MODE_TourokuMode;
DEFVAR_INT ("canna-mode-touroku-empty-mode",
&canna_mode_TourokuEmptyMode /*
*/ );
canna_mode_TourokuEmptyMode = IROHA_MODE_TourokuEmptyMode;
DEFVAR_INT ("canna-mode-touroku-hinshi-mode",
&canna_mode_TourokuHinshiMode /*
*/ );
canna_mode_TourokuHinshiMode = IROHA_MODE_TourokuHinshiMode;
DEFVAR_INT ("canna-mode-touroku-dic-mode", &canna_mode_TourokuDicMode /*
*/ );
canna_mode_TourokuDicMode = IROHA_MODE_TourokuDicMode;
DEFVAR_INT ("canna-mode-quoted-insert-mode",
&canna_mode_QuotedInsertMode /*
*/ );
canna_mode_QuotedInsertMode = IROHA_MODE_QuotedInsertMode;
DEFVAR_INT ("canna-mode-bubun-muhenkan-mode",
&canna_mode_BubunMuhenkanMode /*
*/ );
canna_mode_BubunMuhenkanMode = IROHA_MODE_BubunMuhenkanMode;
DEFVAR_INT ("canna-mode-mount-dic-mode", &canna_mode_MountDicMode /*
*/ );
canna_mode_MountDicMode = IROHA_MODE_MountDicMode;
DEFVAR_INT ("canna-func-self-insert", &canna_fn_SelfInsert /*
*/ );
canna_fn_SelfInsert = IROHA_FN_SelfInsert;
DEFVAR_INT ("canna-func-functional-insert", &canna_fn_FunctionalInsert /*
*/ );
canna_fn_FunctionalInsert = IROHA_FN_FunctionalInsert;
DEFVAR_INT ("canna-func-quoted-insert", &canna_fn_QuotedInsert /*
*/ );
canna_fn_QuotedInsert = IROHA_FN_QuotedInsert;
DEFVAR_INT ("canna-func-japanese-mode", &canna_fn_JapaneseMode /*
*/ );
canna_fn_JapaneseMode = IROHA_FN_JapaneseMode;
DEFVAR_INT ("canna-func-alpha-mode", &canna_fn_AlphaMode /*
*/ );
canna_fn_AlphaMode = IROHA_FN_AlphaMode;
DEFVAR_INT ("canna-func-henkan-nyuryoku-mode",
&canna_fn_HenkanNyuryokuMode /*
*/ );
canna_fn_HenkanNyuryokuMode = IROHA_FN_HenkanNyuryokuMode;
DEFVAR_INT ("canna-func-forward", &canna_fn_Forward /*
*/ );
canna_fn_Forward = IROHA_FN_Forward;
DEFVAR_INT ("canna-func-backward", &canna_fn_Backward /*
*/ );
canna_fn_Backward = IROHA_FN_Backward;
DEFVAR_INT ("canna-func-next", &canna_fn_Next /*
*/ );
canna_fn_Next = IROHA_FN_Next;
DEFVAR_INT ("canna-func-previous", &canna_fn_Prev /*
*/ );
canna_fn_Prev = IROHA_FN_Prev;
DEFVAR_INT ("canna-func-beginning-of-line", &canna_fn_BeginningOfLine /*
*/ );
canna_fn_BeginningOfLine = IROHA_FN_BeginningOfLine;
DEFVAR_INT ("canna-func-end-of-line", &canna_fn_EndOfLine /*
*/ );
canna_fn_EndOfLine = IROHA_FN_EndOfLine;
DEFVAR_INT ("canna-func-delete-next", &canna_fn_DeleteNext /*
*/ );
canna_fn_DeleteNext = IROHA_FN_DeleteNext;
DEFVAR_INT ("canna-func-delete-previous", &canna_fn_DeletePrevious /*
*/ );
canna_fn_DeletePrevious = IROHA_FN_DeletePrevious;
DEFVAR_INT ("canna-func-kill-to-end-of-line", &canna_fn_KillToEndOfLine /*
*/ );
canna_fn_KillToEndOfLine = IROHA_FN_KillToEndOfLine;
DEFVAR_INT ("canna-func-henkan", &canna_fn_Henkan /*
*/ );
canna_fn_Henkan = IROHA_FN_Henkan;
DEFVAR_INT ("canna-func-kakutei", &canna_fn_Kakutei /*
*/ );
canna_fn_Kakutei = IROHA_FN_Kakutei;
DEFVAR_INT ("canna-func-extend", &canna_fn_Extend /*
*/ );
canna_fn_Extend = IROHA_FN_Extend;
DEFVAR_INT ("canna-func-shrink", &canna_fn_Shrink /*
*/ );
canna_fn_Shrink = IROHA_FN_Shrink;
#ifdef CANNA_FN_AdjustBunsetsu
DEFVAR_INT ("canna-func-adjust-bunsetsu", &canna_fn_AdjustBunsetsu /*
*/ );
canna_fn_AdjustBunsetsu = CANNA_FN_AdjustBunsetsu;
#endif
DEFVAR_INT ("canna-func-quit", &canna_fn_Quit /*
*/ );
canna_fn_Quit = IROHA_FN_Quit;
DEFVAR_INT ("canna-func-convert-as-hex", &canna_fn_ConvertAsHex /*
*/ );
canna_fn_ConvertAsHex = IROHA_FN_ConvertAsHex;
DEFVAR_INT ("canna-func-convert-as-bushu", &canna_fn_ConvertAsBushu /*
*/ );
canna_fn_ConvertAsBushu = IROHA_FN_ConvertAsBushu;
DEFVAR_INT ("canna-func-kouho-ichiran", &canna_fn_KouhoIchiran /*
*/ );
canna_fn_KouhoIchiran = IROHA_FN_KouhoIchiran;
DEFVAR_INT ("canna-func-bubun-muhenkan", &canna_fn_BubunMuhenkan /*
*/ );
canna_fn_BubunMuhenkan = IROHA_FN_BubunMuhenkan;
DEFVAR_INT ("canna-func-zenkaku", &canna_fn_Zenkaku /*
*/ );
canna_fn_Zenkaku = IROHA_FN_Zenkaku;
DEFVAR_INT ("canna-func-hankaku", &canna_fn_Hankaku /*
*/ );
canna_fn_Hankaku = IROHA_FN_Hankaku;
DEFVAR_INT ("canna-func-to-upper", &canna_fn_ToUpper /*
*/ );
canna_fn_ToUpper = IROHA_FN_ToUpper;
DEFVAR_INT ("canna-func-capitalize", &canna_fn_Capitalize /*
*/ );
canna_fn_Capitalize = IROHA_FN_Capitalize;
DEFVAR_INT ("canna-func-to-lower", &canna_fn_ToLower /*
*/ );
canna_fn_ToLower = IROHA_FN_ToLower;
DEFVAR_INT ("canna-func-hiragana", &canna_fn_Hiragana /*
*/ );
canna_fn_Hiragana = IROHA_FN_Hiragana;
DEFVAR_INT ("canna-func-katakana", &canna_fn_Katakana /*
*/ );
canna_fn_Katakana = IROHA_FN_Katakana;
DEFVAR_INT ("canna-func-romaji", &canna_fn_Romaji /*
*/ );
canna_fn_Romaji = IROHA_FN_Romaji;
#ifdef CANNA_FN_BaseHiragana
DEFVAR_INT ("canna-func-base-hiragana", &canna_fn_BaseHiragana /*
*/ );
canna_fn_BaseHiragana = CANNA_FN_BaseHiragana;
DEFVAR_INT ("canna-func-base-katakana", &canna_fn_BaseKatakana /*
*/ );
canna_fn_BaseKatakana = CANNA_FN_BaseKatakana;
DEFVAR_INT ("canna-func-base-eisu", &canna_fn_BaseEisu /*
*/ );
canna_fn_BaseEisu = CANNA_FN_BaseEisu;
DEFVAR_INT ("canna-func-base-zenkaku", &canna_fn_BaseZenkaku /*
*/ );
canna_fn_BaseZenkaku = CANNA_FN_BaseZenkaku;
DEFVAR_INT ("canna-func-base-hankaku", &canna_fn_BaseHankaku /*
*/ );
canna_fn_BaseHankaku = CANNA_FN_BaseHankaku;
DEFVAR_INT ("canna-func-base-kana", &canna_fn_BaseKana /*
*/ );
canna_fn_BaseKana = CANNA_FN_BaseKana;
DEFVAR_INT ("canna-func-base-kakutei", &canna_fn_BaseKakutei /*
*/ );
canna_fn_BaseKakutei = CANNA_FN_BaseKakutei;
DEFVAR_INT ("canna-func-base-henkan", &canna_fn_BaseHenkan /*
*/ );
canna_fn_BaseHenkan = CANNA_FN_BaseHenkan;
DEFVAR_INT ("canna-func-base-hiragana-katakana-toggle",
&canna_fn_BaseHiraKataToggle /*
*/ );
canna_fn_BaseHiraKataToggle = CANNA_FN_BaseHiraKataToggle;
DEFVAR_INT ("canna-func-base-zenkaku-hankaku-toggle",
&canna_fn_BaseZenHanToggle /*
*/ );
canna_fn_BaseZenHanToggle = CANNA_FN_BaseZenHanToggle;
DEFVAR_INT ("canna-func-base-kana-eisu-toggle",
&canna_fn_BaseKanaEisuToggle /*
*/ );
canna_fn_BaseKanaEisuToggle = CANNA_FN_BaseKanaEisuToggle;
DEFVAR_INT ("canna-func-base-kakutei-henkan-toggle",
&canna_fn_BaseKakuteiHenkanToggle /*
*/ );
canna_fn_BaseKakuteiHenkanToggle = CANNA_FN_BaseKakuteiHenkanToggle;
DEFVAR_INT ("canna-func-base-rotate-forward",
&canna_fn_BaseRotateForward /*
*/ );
canna_fn_BaseRotateForward = CANNA_FN_BaseRotateForward;
DEFVAR_INT ("canna-func-base-rotate-backward",
&canna_fn_BaseRotateBackward /*
*/ );
canna_fn_BaseRotateBackward = CANNA_FN_BaseRotateBackward;
#endif
DEFVAR_INT ("canna-func-extend-mode", &canna_fn_ExtendMode /*
*/ );
canna_fn_ExtendMode = IROHA_FN_ExtendMode;
DEFVAR_INT ("canna-func-touroku", &canna_fn_Touroku /*
*/ );
canna_fn_Touroku = IROHA_FN_Touroku;
DEFVAR_INT ("canna-func-hex-mode", &canna_fn_HexMode /*
*/ );
canna_fn_HexMode = IROHA_FN_HexMode;
DEFVAR_INT ("canna-func-bushu-mode", &canna_fn_BushuMode /*
*/ );
canna_fn_BushuMode = IROHA_FN_BushuMode;
DEFVAR_INT ("canna-func-kigo-mode", &canna_fn_KigouMode /*
*/ );
canna_fn_KigouMode = IROHA_FN_KigouMode;
#ifdef CANNA_FN_Mark
DEFVAR_INT ("canna-func-mark", &canna_fn_Mark /*
*/ );
canna_fn_Mark = CANNA_FN_Mark;
#endif
#ifdef CANNA_FN_TemporalMode
DEFVAR_INT ("canna-func-temporal-mode", &canna_fn_TemporalMode /*
*/ );
canna_fn_TemporalMode = CANNA_FN_TemporalMode;
#endif
DEFVAR_INT ("canna-key-nfer", &canna_key_Nfer /*
*/ );
canna_key_Nfer = IROHA_KEY_Nfer;
DEFVAR_INT ("canna-key-xfer", &canna_key_Xfer /*
*/ );
canna_key_Xfer = IROHA_KEY_Xfer;
DEFVAR_INT ("canna-key-up", &canna_key_Up /*
*/ );
canna_key_Up = IROHA_KEY_Up;
DEFVAR_INT ("canna-key-left", &canna_key_Left /*
*/ );
canna_key_Left = IROHA_KEY_Left;
DEFVAR_INT ("canna-key-right", &canna_key_Right /*
*/ );
canna_key_Right = IROHA_KEY_Right;
DEFVAR_INT ("canna-key-down", &canna_key_Down /*
*/ );
canna_key_Down = IROHA_KEY_Down;
DEFVAR_INT ("canna-key-insert", &canna_key_Insert /*
*/ );
canna_key_Insert = IROHA_KEY_Insert;
DEFVAR_INT ("canna-key-rollup", &canna_key_Rollup /*
*/ );
canna_key_Rollup = IROHA_KEY_Rollup;
DEFVAR_INT ("canna-key-rolldown", &canna_key_Rolldown /*
*/ );
canna_key_Rolldown = IROHA_KEY_Rolldown;
DEFVAR_INT ("canna-key-home", &canna_key_Home /*
*/ );
canna_key_Home = IROHA_KEY_Home;
DEFVAR_INT ("canna-key-help", &canna_key_Help /*
*/ );
canna_key_Help = IROHA_KEY_Help;
DEFVAR_INT ("canna-key-kp-key", &canna_key_KP_Key /*
*/ );
canna_key_KP_Key = IROHA_KEY_KP_Key;
DEFVAR_INT ("canna-key-shift-nfer", &canna_key_Shift_Nfer /*
*/ );
canna_key_Shift_Nfer = IROHA_KEY_Shift_Nfer;
DEFVAR_INT ("canna-key-shift-xfer", &canna_key_Shift_Xfer /*
*/ );
canna_key_Shift_Xfer = IROHA_KEY_Shift_Xfer;
DEFVAR_INT ("canna-key-shift-up", &canna_key_Shift_Up /*
*/ );
canna_key_Shift_Up = IROHA_KEY_Shift_Up;
DEFVAR_INT ("canna-key-shift-left", &canna_key_Shift_Left /*
*/ );
canna_key_Shift_Left = IROHA_KEY_Shift_Left;
DEFVAR_INT ("canna-key-shift-right", &canna_key_Shift_Right /*
*/ );
canna_key_Shift_Right = IROHA_KEY_Shift_Right;
DEFVAR_INT ("canna-key-shift-down", &canna_key_Shift_Down /*
*/ );
canna_key_Shift_Down = IROHA_KEY_Shift_Down;
DEFVAR_INT ("canna-key-control-nfer", &canna_key_Cntrl_Nfer /*
*/ );
canna_key_Cntrl_Nfer = IROHA_KEY_Cntrl_Nfer;
DEFVAR_INT ("canna-key-control-xfer", &canna_key_Cntrl_Xfer /*
*/ );
canna_key_Cntrl_Xfer = IROHA_KEY_Cntrl_Xfer;
DEFVAR_INT ("canna-key-control-up", &canna_key_Cntrl_Up /*
*/ );
canna_key_Cntrl_Up = IROHA_KEY_Cntrl_Up;
DEFVAR_INT ("canna-key-control-left", &canna_key_Cntrl_Left /*
*/ );
canna_key_Cntrl_Left = IROHA_KEY_Cntrl_Left;
DEFVAR_INT ("canna-key-control-right", &canna_key_Cntrl_Right /*
*/ );
canna_key_Cntrl_Right = IROHA_KEY_Cntrl_Right;
DEFVAR_INT ("canna-key-control-down", &canna_key_Cntrl_Down /*
*/ );
canna_key_Cntrl_Down = IROHA_KEY_Cntrl_Down;
Fprovide (intern ("CANNA"));
}
#if 0
#ifdef HAVE_SHLIB
void unload_canna_api (void);
void
unload_canna_api (void)
{
/* We don't need to do anything here in the sample case. However, if you
create any new types with INIT_LRECORD_IMPLEMENTATION (sample_type), then
UNDEF_LRECORD_IMPLEMENTATION (sample_type) must appear here. Also, any
symbols declared with DEFSYMBOL (Qsample_var), or one of its variants,
must have a corresponding unstaticpro_nodump (&Qsample_var) here. */
}
#endif
#endif
#ifdef CANNA_MULE
/* To handle MULE internal code and EUC.
I assume CANNA can handle only Japanese EUC. */
/* EUC multibyte string to MULE internal string */
static void
c2mu (unsigned char *cp, int l, unsigned char *mp)
{
unsigned char ch, *ep = cp+l;
while ((cp < ep) && (ch = *cp))
{
if ((unsigned char) ch == ISO_CODE_SS2)
{
*mp++ = LEADING_BYTE_KATAKANA_JISX0201;
cp++;
}
else if ((unsigned char) ch == ISO_CODE_SS3)
{
*mp++ = LEADING_BYTE_JAPANESE_JISX0212;
cp++;
*mp++ = *cp++;
}
else if (ch & 0x80)
{
*mp++ = LEADING_BYTE_JAPANESE_JISX0208;
*mp++ = *cp++;
}
*mp++ = *cp++;
}
*mp = 0;
}
/* MULE internal string to EUC multibyte string */
static void
m2c (unsigned char *mp, int l, unsigned char *cp)
{
unsigned char ch, *ep = mp + l;
while ((mp < ep) && (ch = *mp++))
{
switch (ch)
{
case LEADING_BYTE_KATAKANA_JISX0201:
*cp++ = ISO_CODE_SS2;
*cp++ = *mp++;
break;
case LEADING_BYTE_JAPANESE_JISX0212:
*cp++ = ISO_CODE_SS3;
case LEADING_BYTE_JAPANESE_JISX0208:
*cp++ = *mp++;
*cp++ = *mp++;
break;
default:
*cp++ = ch;
break;
}
}
*cp = 0;
}
#undef make_string
/* make_string after converting EUC string to MULE internal string */
static Lisp_Object
mule_make_string (unsigned char *p, int l)
{
unsigned char cbuf[4096];
c2mu (p,l,cbuf);
return (make_string (cbuf, strlen ((const char *) cbuf)));
}
/* return the MULE internal string length of EUC string */
/* Modified by sb to return a character count not byte count. */
static int
mule_strlen (unsigned char *p, int l)
{
unsigned char ch, *cp = p;
int len = 0;
while ((cp < p + l) && (ch = *cp))
{
if ((unsigned char) ch == ISO_CODE_SS2)
{
len++;
cp += 2;
}
else if ((unsigned char) ch == ISO_CODE_SS3)
{
len++;
cp += 3;
}
else if (ch & 0x80)
{
len++;
cp += 2;
}
else
{
len++;
cp++;
}
}
return (len);
}
/* count number of characters */
static void
count_char (unsigned char *p, int len, int pos, int rev,
Fixnum *clen, Fixnum *cpos, Fixnum *crev)
{
unsigned char *q = p;
*clen = *cpos = *crev = 0;
if (len == 0) return;
while (q < p + pos)
{
(*clen)++;
(*cpos)++;
if (*q++ & 0x80) q++;
}
while (q < p + pos + rev)
{
(*clen)++;
(*crev)++;
if (*q++ & 0x80) q++;
}
while (q < p + len)
{
(*clen)++;
if (*q++ & 0x80) q++;
}
}
#endif /* CANNA_MULE */
1.2 +79 -0 XEmacs/xemacs/modules/canna/configure.ac
Index: configure.ac
===================================================================
RCS file: configure.ac
diff -N configure.ac
--- /dev/null Tue Oct 4 19:51:05 2005
+++ /tmp/cvsAAAoRaqOE Tue Oct 4 19:51:33 2005
＠＠ -0,0 +1,79 ＠＠
+# Process this file with autoconf to produce a configure script.
+# This is only used for independent module building.
+AC_INIT([Sample module], [1.0], [xemacs-beta(a)xemacs.org])
+AC_PREREQ(2.53)
+AC_REVISION($Revision: 1.2 $)
+AC_COPYRIGHT([Configuration script for the sample module.
+Copyright (C) 2002 Jerry James.
+
+This file is part of XEmacs.
+
+XEmacs is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs; see the file COPYING. If not, write to the Free
+Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.])
+
+AC_CONFIG_SRCDIR([sample.c])
+AC_PROG_CC
+AC_PROG_INSTALL
+AC_SUBST(CFLAGS)
+AC_SUBST(LDFLAGS)
+
+# Find ELLCC
+AC_ARG_VAR([ELLCC], [The path to the ellcc module compiler])
+AC_PATH_PROG([ELLCC], [ellcc], ["FAIL"])
+AS_IF([test "$ELLCC" = "FAIL"], [AS_ERROR([Cannot find ellcc])])
+
+# Insert autoconf macros here to find the headers, libraries, other
+# programs, etc. needed by your module. If other libraries will be linked
+# with your module, then after detecting them, use a line of this form last:
+
+# detect canna
+canna_includes_found=no
+if test "$with_canna" != "no"; then
+ AC_CHECK_HEADER(canna/jrkanji.h,canna_includes_found=yes)
+fi
+if test "$canna_includes_found" = "no" -a "$with_canna" != "no" -a \
+ -d "/usr/local/canna/include"; then
+ save_c_switch_site="$c_switch_site"
+ c_switch_site="$c_switch_site -I/usr/local/canna/include"
+ AC_CHECK_HEADER(canna/jrkanji.h,canna_includes_found=yes)
+ if test "$canna_includes_found" != "yes"; then
+ c_switch_site="$save_c_switch_site"
+ with_canna="no"
+ fi
+fi
+
+test -z "$with_canna" && { AC_CHECK_HEADER(canna/RK.h, , with_canna=no) }
+test -z "$with_canna" && { AC_CHECK_LIB(RKC, RkBgnBun, [:],with_canna=no) }
+test -z "$with_canna" && { AC_CHECK_LIB(canna,jrKanjiControl,[:],with_canna=no) }
+test -z "$with_canna" && with_canna=yes
+if test "$with_canna" = "yes"; then
+ AC_DEFINE(HAVE_CANNA)
+ LIBS="-lcanna -lRKC"
+fi
+
+AC_SUBST(canna_libs, "$LIBS")
+
+# This part should appear unchanged in every module configure.ac
+AC_SUBST(PROGNAME, "module")
+AC_SUBST(MOD_CC, "＠ELLCC＠")
+AC_SUBST(MODARCHDIR, "\$(shell ＠ELLCC＠ --mod-archdir)")
+AC_SUBST(MAKE_DOCFILE, "\$(MODARCHDIR)/make-docfile")
+AC_SUBST(MODCFLAGS, "\$(CFLAGS) --mode=compile --mod-output=\$＠ -I\$(MODARCHDIR)/include")
+AC_SUBST(INSTALLPATH, "\$(shell ＠ELLCC＠ --mod-site-location)")
+AC_SUBST(MOD_INSTALL_PROGRAM, "＠INSTALL_PROGRAM＠")
+AC_SUBST(OBJECT_TO_BUILD, "\$(MODNAME).ell")
+
+AC_CONFIG_FILES([Makefile.in Makefile])
+AC_OUTPUT
1.2 +251 -0 XEmacs/xemacs/modules/canna/install-sh
Index: install-sh
===================================================================
RCS file: install-sh
diff -N install-sh
--- /dev/null Tue Oct 4 19:51:05 2005
+++ /tmp/cvsAAAISaOOE Tue Oct 4 19:51:33 2005
＠＠ -0,0 +1,251 ＠＠
+#!/bin/sh
+#
+# install - install a program, script, or datafile
+# This comes from X11R5 (mit/util/scripts/install.sh).
+#
+# Copyright 1991 by the Massachusetts Institute of Technology
+#
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation, and that the name of M.I.T. not be used in advertising or
+# publicity pertaining to distribution of the software without specific,
+# written prior permission. M.I.T. makes no representations about the
+# suitability of this software for any purpose. It is provided "as is"
+# without express or implied warranty.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch. It can only install one file at a time, a restriction
+# shared with many OS's install programs.
+
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit="${DOITPROG-}"
+
+
+# put in absolute paths if you don't have them in your path; or use env. vars.
+
+mvprog="${MVPROG-mv}"
+cpprog="${CPPROG-cp}"
+chmodprog="${CHMODPROG-chmod}"
+chownprog="${CHOWNPROG-chown}"
+chgrpprog="${CHGRPPROG-chgrp}"
+stripprog="${STRIPPROG-strip}"
+rmprog="${RMPROG-rm}"
+mkdirprog="${MKDIRPROG-mkdir}"
+
+transformbasename=""
+transform_arg=""
+instcmd="$mvprog"
+chmodcmd="$chmodprog 0755"
+chowncmd=""
+chgrpcmd=""
+stripcmd=""
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
+src=""
+dst=""
+dir_arg=""
+
+while [ x"$1" != x ]; do
+ case $1 in
+ -c) instcmd="$cpprog"
+ shift
+ continue;;
+
+ -d) dir_arg=true
+ shift
+ continue;;
+
+ -m) chmodcmd="$chmodprog $2"
+ shift
+ shift
+ continue;;
+
+ -o) chowncmd="$chownprog $2"
+ shift
+ shift
+ continue;;
+
+ -g) chgrpcmd="$chgrpprog $2"
+ shift
+ shift
+ continue;;
+
+ -s) stripcmd="$stripprog"
+ shift
+ continue;;
+
+ -t=*) transformarg=`echo $1 | sed 's/-t=//'`
+ shift
+ continue;;
+
+ -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+ shift
+ continue;;
+
+ *) if [ x"$src" = x ]
+ then
+ src=$1
+ else
+ # this colon is to work around a 386BSD /bin/sh bug
+ :
+ dst=$1
+ fi
+ shift
+ continue;;
+ esac
+done
+
+if [ x"$src" = x ]
+then
+ echo "install: no input file specified"
+ exit 1
+else
+ :
+fi
+
+if [ x"$dir_arg" != x ]; then
+ dst=$src
+ src=""
+
+ if [ -d $dst ]; then
+ instcmd=:
+ chmodcmd=""
+ else
+ instcmd=$mkdirprog
+ fi
+else
+
+# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+# might cause directories to be created, which would be especially bad
+# if $src (and thus $dsttmp) contains '*'.
+
+ if [ -f "$src" ] || [ -d "$src" ]
+ then
+ :
+ else
+ echo "install: $src does not exist"
+ exit 1
+ fi
+
+ if [ x"$dst" = x ]
+ then
+ echo "install: no destination specified"
+ exit 1
+ else
+ :
+ fi
+
+# If destination is a directory, append the input filename; if your system
+# does not like double slashes in filenames, you may need to add some logic
+
+ if [ -d $dst ]
+ then
+ dst="$dst"/`basename $src`
+ else
+ :
+ fi
+fi
+
+## this sed command emulates the dirname command
+dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+
+# Make sure that the destination directory exists.
+# this part is taken from Noah Friedman's mkinstalldirs script
+
+# Skip lots of stat calls in the usual case.
+if [ ! -d "$dstdir" ]; then
+defaultIFS='
+ '
+IFS="${IFS-${defaultIFS}}"
+
+oIFS="${IFS}"
+# Some sh's can't handle IFS=/ for some reason.
+IFS='%'
+set - `echo ${dstdir} | sed -e 's＠/＠%＠g' -e 's＠^%＠/＠'`
+IFS="${oIFS}"
+
+pathcomp=''
+
+while [ $# -ne 0 ] ; do
+ pathcomp="${pathcomp}${1}"
+ shift
+
+ if [ ! -d "${pathcomp}" ] ;
+ then
+ $mkdirprog "${pathcomp}"
+ else
+ :
+ fi
+
+ pathcomp="${pathcomp}/"
+done
+fi
+
+if [ x"$dir_arg" != x ]
+then
+ $doit $instcmd $dst &&
+
+ if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi &&
+ if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi &&
+ if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi &&
+ if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi
+else
+
+# If we're going to rename the final executable, determine the name now.
+
+ if [ x"$transformarg" = x ]
+ then
+ dstfile=`basename $dst`
+ else
+ dstfile=`basename $dst $transformbasename |
+ sed $transformarg`$transformbasename
+ fi
+
+# don't allow the sed command to completely eliminate the filename
+
+ if [ x"$dstfile" = x ]
+ then
+ dstfile=`basename $dst`
+ else
+ :
+ fi
+
+# Make a temp file name in the proper directory.
+
+ dsttmp=$dstdir/#inst.$$#
+
+# Move or copy the file name to the temp name
+
+ $doit $instcmd $src $dsttmp &&
+
+ trap "rm -f ${dsttmp}" 0 &&
+
+# and set any options; do chmod last to preserve setuid bits
+
+# If any of these fail, we abort the whole thing. If we want to
+# ignore errors from any of these, just make sure not to ignore
+# errors from the above "$doit $instcmd $src $dsttmp" command.
+
+ if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi &&
+ if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi &&
+ if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi &&
+ if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi &&
+
+# Now rename the file to the real destination.
+
+ $doit $rmcmd -f $dstdir/$dstfile &&
+ $doit $mvcmd $dsttmp $dstdir/$dstfile
+
+fi &&
+
+
+exit 0
- 1 participants
- 0 comments