diff options
author | Satoshi Taoka <taoka@FreeBSD.org> | 2000-07-10 17:36:21 +0000 |
---|---|---|
committer | Satoshi Taoka <taoka@FreeBSD.org> | 2000-07-10 17:36:21 +0000 |
commit | 3c94e67047a4761bbc4f98a2eaa6533a3a3e02ea (patch) | |
tree | f7de83f1f28f546b958ac84af31a611f2a1506b9 | |
parent | Update to version 1.3 (diff) |
lookup-1.3 has two bugs (do not do lookup-splash on XEmacs and
unable to compile on mule-2.3).
These patches is to fix these problems.
Notes
Notes:
svn path=/head/; revision=30454
-rw-r--r-- | japanese/lookup-emacs21/files/patch-aa | 20 | ||||
-rw-r--r-- | japanese/lookup-emacs21/files/patch-ab | 14 | ||||
-rw-r--r-- | japanese/lookup-mule/files/patch-aa | 20 | ||||
-rw-r--r-- | japanese/lookup-mule/files/patch-ab | 14 | ||||
-rw-r--r-- | japanese/lookup/files/patch-aa | 20 | ||||
-rw-r--r-- | japanese/lookup/files/patch-ab | 14 |
6 files changed, 102 insertions, 0 deletions
diff --git a/japanese/lookup-emacs21/files/patch-aa b/japanese/lookup-emacs21/files/patch-aa new file mode 100644 index 000000000000..8a3102c17c57 --- /dev/null +++ b/japanese/lookup-emacs21/files/patch-aa @@ -0,0 +1,20 @@ +--- lisp/lookup.el~ Fri Jun 16 12:44:14 2000 ++++ lisp/lookup.el Sun Jun 25 00:53:24 2000 +@@ -620,7 +620,8 @@ + (defmacro logo-image () + (with-temp-buffer + (cond ((featurep 'xemacs) +- (insert-file-contents lookup-logo-file)) ++ (let ((format-alist nil)) ++ (insert-file-contents lookup-logo-file))) + ((locate-library "bitmap") + (require 'bitmap) + (bitmap-insert-xbm-file lookup-logo-file) +@@ -637,6 +638,7 @@ + (or lookup-use-bitmap (featurep 'xemacs))) + (let ((buffer (get-buffer-create "*Lookup Logo*"))) + (set-buffer buffer) ++ (setq fill-column (window-width)) + (erase-buffer) + (if (featurep 'xemacs) + (let ((logo-glyph (make-glyph (vector 'xpm :data lookup-logo-image))) diff --git a/japanese/lookup-emacs21/files/patch-ab b/japanese/lookup-emacs21/files/patch-ab new file mode 100644 index 000000000000..24ab23124c51 --- /dev/null +++ b/japanese/lookup-emacs21/files/patch-ab @@ -0,0 +1,14 @@ +--- lisp/lookup-vars.el.in~ Sat Jun 17 09:55:39 2000 ++++ lisp/lookup-vars.el.in Wed Jun 21 16:57:28 2000 +@@ -167,8 +167,9 @@ + :type 'boolean + :group 'lookup-general-options) + +-(defcustom lookup-use-kakasi (or (locate-library "kakasi" nil exec-path) +- (locate-library "kakasi.exe" nil exec-path)) ++(defcustom lookup-use-kakasi (let ((load-path exec-path)) ++ (or (locate-library "kakasi") ++ (locate-library "kakasi.exe"))) + "*Non-nil を指定すると、いくつかの局面で KAKASI が利用される。 + これは現在、具体的には日本語のデフォルトの検索語の切り出しに用いている。" + :type 'boolean diff --git a/japanese/lookup-mule/files/patch-aa b/japanese/lookup-mule/files/patch-aa new file mode 100644 index 000000000000..8a3102c17c57 --- /dev/null +++ b/japanese/lookup-mule/files/patch-aa @@ -0,0 +1,20 @@ +--- lisp/lookup.el~ Fri Jun 16 12:44:14 2000 ++++ lisp/lookup.el Sun Jun 25 00:53:24 2000 +@@ -620,7 +620,8 @@ + (defmacro logo-image () + (with-temp-buffer + (cond ((featurep 'xemacs) +- (insert-file-contents lookup-logo-file)) ++ (let ((format-alist nil)) ++ (insert-file-contents lookup-logo-file))) + ((locate-library "bitmap") + (require 'bitmap) + (bitmap-insert-xbm-file lookup-logo-file) +@@ -637,6 +638,7 @@ + (or lookup-use-bitmap (featurep 'xemacs))) + (let ((buffer (get-buffer-create "*Lookup Logo*"))) + (set-buffer buffer) ++ (setq fill-column (window-width)) + (erase-buffer) + (if (featurep 'xemacs) + (let ((logo-glyph (make-glyph (vector 'xpm :data lookup-logo-image))) diff --git a/japanese/lookup-mule/files/patch-ab b/japanese/lookup-mule/files/patch-ab new file mode 100644 index 000000000000..24ab23124c51 --- /dev/null +++ b/japanese/lookup-mule/files/patch-ab @@ -0,0 +1,14 @@ +--- lisp/lookup-vars.el.in~ Sat Jun 17 09:55:39 2000 ++++ lisp/lookup-vars.el.in Wed Jun 21 16:57:28 2000 +@@ -167,8 +167,9 @@ + :type 'boolean + :group 'lookup-general-options) + +-(defcustom lookup-use-kakasi (or (locate-library "kakasi" nil exec-path) +- (locate-library "kakasi.exe" nil exec-path)) ++(defcustom lookup-use-kakasi (let ((load-path exec-path)) ++ (or (locate-library "kakasi") ++ (locate-library "kakasi.exe"))) + "*Non-nil を指定すると、いくつかの局面で KAKASI が利用される。 + これは現在、具体的には日本語のデフォルトの検索語の切り出しに用いている。" + :type 'boolean diff --git a/japanese/lookup/files/patch-aa b/japanese/lookup/files/patch-aa new file mode 100644 index 000000000000..8a3102c17c57 --- /dev/null +++ b/japanese/lookup/files/patch-aa @@ -0,0 +1,20 @@ +--- lisp/lookup.el~ Fri Jun 16 12:44:14 2000 ++++ lisp/lookup.el Sun Jun 25 00:53:24 2000 +@@ -620,7 +620,8 @@ + (defmacro logo-image () + (with-temp-buffer + (cond ((featurep 'xemacs) +- (insert-file-contents lookup-logo-file)) ++ (let ((format-alist nil)) ++ (insert-file-contents lookup-logo-file))) + ((locate-library "bitmap") + (require 'bitmap) + (bitmap-insert-xbm-file lookup-logo-file) +@@ -637,6 +638,7 @@ + (or lookup-use-bitmap (featurep 'xemacs))) + (let ((buffer (get-buffer-create "*Lookup Logo*"))) + (set-buffer buffer) ++ (setq fill-column (window-width)) + (erase-buffer) + (if (featurep 'xemacs) + (let ((logo-glyph (make-glyph (vector 'xpm :data lookup-logo-image))) diff --git a/japanese/lookup/files/patch-ab b/japanese/lookup/files/patch-ab new file mode 100644 index 000000000000..24ab23124c51 --- /dev/null +++ b/japanese/lookup/files/patch-ab @@ -0,0 +1,14 @@ +--- lisp/lookup-vars.el.in~ Sat Jun 17 09:55:39 2000 ++++ lisp/lookup-vars.el.in Wed Jun 21 16:57:28 2000 +@@ -167,8 +167,9 @@ + :type 'boolean + :group 'lookup-general-options) + +-(defcustom lookup-use-kakasi (or (locate-library "kakasi" nil exec-path) +- (locate-library "kakasi.exe" nil exec-path)) ++(defcustom lookup-use-kakasi (let ((load-path exec-path)) ++ (or (locate-library "kakasi") ++ (locate-library "kakasi.exe"))) + "*Non-nil を指定すると、いくつかの局面で KAKASI が利用される。 + これは現在、具体的には日本語のデフォルトの検索語の切り出しに用いている。" + :type 'boolean |