On August 13, 2005 at 10:12AM +0900, tats (at vega.ocn.ne.jp) wrote: > Package: ddskk > Version: 12.2.rel.0-3 > > There is now a CVS version of Emacs (22.0.50) in Debian > (emacs-snapshot). However, ddskk 12.2.rel.0-3 fails with it. > > I've created the backport patch from the upstream CVS. Please see the > attached patch. Also, please add `emacs-snapshot' to the dependency.
Sorry, the patch of the previous mail is broken. So, I've now resend it. To fix this bug please apply it, or sync with the upstream CVS version. -- Tatsuya Kinoshita
--- ddskk-12.2.rel.0-3/SKK-MK
+++ ddskk-12.2.rel.0/SKK-MK
@@ -325,7 +325,7 @@
;; FSFmacs
(when (featurep 'faces)
(add-to-list 'list 'ccc))
- (when (= emacs-major-version 21)
+ (when (string< "5.0" mule-version)
(add-to-list 'list 'skk-e21))))
;; skk-jisx0213.el
(when (condition-case nil
--- ddskk-12.2.rel.0-3/skk-isearch.el
+++ ddskk-12.2.rel.0/skk-isearch.el
@@ -646,12 +646,8 @@
skk-isearch-whitespace-regexp
""))))
(when (string-match regexp isearch-message)
- (setq isearch-message
- (with-temp-buffer
- (insert isearch-message)
- (goto-char (point-min))
- (replace-regexp regexp "")
- (buffer-substring (point-min) (point-max))))
+ (setq isearch-message (skk-replace-regexp-in-string regexp ""
+ isearch-message))
(setq isearch-cmds (cdr isearch-cmds))
(isearch-push-state)
(isearch-update))))))
--- ddskk-12.2.rel.0-3/skk-macs.el
+++ ddskk-12.2.rel.0/skk-macs.el
@@ -406,6 +406,17 @@
(setq keys (recent-keys))
(vector (aref keys (1- (length keys)))))))))
+(defun skk-replace-regexp-in-string (regexp rep string
+ &optional
+ fixedcase literal subexp start)
+ (static-cond
+ ((and (eq skk-emacs-type 'xemacs)
+ (not (fboundp 'replace-regexp-in-string)))
+ (replace-in-string string regexp rep literal))
+ (t
+ (replace-regexp-in-string regexp rep string
+ fixedcase literal subexp start))))
+
;;; version independent
(defsubst skk-cursor-set (&optional color force)
(when (or skk-use-color-cursor
--- ddskk-12.2.rel.0-3/skk-server.el
+++ ddskk-12.2.rel.0/skk-server.el
@@ -210,7 +210,11 @@
skk-server-host
(or skk-server-portnum
"skkserv"))))
- (process-kill-without-query process)
+ (static-cond
+ ((string-lessp "22.0" emacs-version)
+ (set-process-query-on-exit-flag process nil))
+ (t
+ (process-kill-without-query process)))
process)))
(defun skk-startup-server (arg)
pgpyd3YlXC9Ax.pgp
Description: PGP signature
