Synch with Wanderlust.

diff --git a/ChangeLog b/ChangeLog
index e6307ec..0e602f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2000-08-31  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+       * lisp/ptexinfmt.el (texinfo-multitable-widths,
+       texinfo-multitable-item): Apply char-width probrem fix patch
+       (by KOIE Hidetaka <koie@skipjack.koie.org>).
+       Newsgroups: fj.editor.emacs
+       Message-ID: <5dzom3nxq7.fsf@skipjack.koie.org>
+
+       * lisp/ptexinfmt.el (ptexinfmt-disable-broken-notice): New
+       variable.
+
 2000-08-29  TSUCHIYA Masatoshi  <tsuchiya@pine.kuee.kyoto-u.ac.jp>
 
        * lisp/nnshimbun.el (nnshimbun-zdnet-get-headers): Follow changes

diff --git a/lisp/ptexinfmt.el b/lisp/ptexinfmt.el
index 22df1cf..4209158 100644 (file)
--- a/lisp/ptexinfmt.el
+++ b/lisp/ptexinfmt.el
@@ -41,6 +41,9 @@
 (provide 'ptexinfmt)
 
 ;;; Broken
+(defvar ptexinfmt-disable-broken-notice t
+  "If non-nil disable notice, when call `broken-facility'.")
+
 ;; @var
 (broken-facility texinfo-format-var
   "Don't perse @COMMAND included @var"
@@ -52,7 +55,7 @@
          (texinfo-format-expand-region (point-min) (point-max))
          t))
     (error nil))
-  'no-notice)
+  ptexinfmt-disable-broken-notice)
 
 ;; @xref
 (broken-facility texinfo-format-xref
@@ -65,7 +68,7 @@
          (texinfo-format-expand-region (point-min) (point-max))
          t))
     (error nil))
-  'no-notice)
+  ptexinfmt-disable-broken-notice)
 
 ;; @uref
 (broken-facility texinfo-format-uref
@@ -78,7 +81,7 @@
          (texinfo-format-expand-region (point-min) (point-max))
          t))
     (error nil))
-  'no-notice)
+  ptexinfmt-disable-broken-notice)
 
 ;;; Obsolete
 ;; Removed Texinfo 3.8
@@ -537,7 +540,8 @@ otherwise, insert URL-TITLE followed by URL in parentheses."
                  ;; forward-sexp works with braces in Texinfo mode
                   (progn (forward-sexp 1) (1- (point)))))
             (setq texinfo-multitable-width-list
-                  (cons (- end-of-template start-of-template)
+                 (cons (- (progn (goto-char end-of-template) (current-column))
+                          (progn (goto-char start-of-template) (current-column)))
                         texinfo-multitable-width-list))
             ;; Remove carriage return from within a template, if any.
             ;; This helps those those who want to use more than
@@ -658,10 +662,8 @@ This command is executed when texinfmt sees @item inside @multitable."
              ;; add one more space for inter-column spacing
              (needed-whitespace
               (1+
-               (- fill-column
-                  (-
-                   (progn (end-of-line) (point)) ; end of existing line
-                   beg)))))
+              (- fill-column
+                 (progn (end-of-line) (current-column)))))) ; end of existing line
         (insert (make-string
                  (if (> needed-whitespace 0) needed-whitespace 1)
                  ? )))
@@ -697,5 +699,4 @@ This command is executed when texinfmt sees @item inside @multitable."
     (kill-buffer texinfo-multitable-buffer-name)
     (setq fill-column existing-fill-column)))
 
-
 ;;; ptexinfmt.el ends here