Merge changes made in Wanderlust.

ptexinfmt.el (texinfo-multitable-widths): Use `make-char' instead of KANJI literal.
ptexinfmt.el (texinfo-format-verb): Use `(delete-char -1)' instead of `(delete-backward-char 1)', for Emacs 24.

diff --git a/ChangeLog b/ChangeLog
index b2c514d..7c53972 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-02  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+       * ptexinfmt.el (texinfo-multitable-widths): Use `make-char' instead of
+       KANJI literal.
+
+2010-08-24  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+       * ptexinfmt.el (texinfo-format-verb): Use `(delete-char -1)' instead of
+       `(delete-backward-char 1)', for Emacs 24.
+
 2009-02-16  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * auth-ja.texi: New file.

diff --git a/ptexinfmt.el b/ptexinfmt.el
index 67e2524..528f252 100644 (file)
--- a/ptexinfmt.el
+++ b/ptexinfmt.el
@@ -165,7 +165,10 @@ DOCSTRING will be printed if ASSERTION is nil and
   "`texinfo-multitable-widths' unsupport wide-char."
   (if (fboundp 'texinfo-multitable-widths)
       (with-temp-buffer
-       (let ((str "\e$BI}9-J8;z\e(B"))
+       (let ((str (string (make-char 'japanese-jisx0208 73 125)
+                          (make-char 'japanese-jisx0208 57 45)
+                          (make-char 'japanese-jisx0208 74 56)
+                          (make-char 'japanese-jisx0208 59 122))))
          (texinfo-mode)
          (insert (format " {%s}\n" str))
          (goto-char (point-min))
@@ -404,7 +407,7 @@ For example, @verb\{|@|\} results in @ and
       (error "Not found: @verb start brace"))
     (delete-region texinfo-command-start (+ 2 texinfo-command-end))
     (search-forward  delimiter))
-  (delete-backward-char 1)
+  (delete-char -1)
   (unless (looking-at "}")
     (error "Not found: @verb end brace"))
   (delete-char 1))