[gnu.emacs.bug] bug in texinfmt.el

cph@ZURICH.AI.MIT.EDU (Chris Hanson) (06/27/89)

The following patch fixes a bug in `texinfo-format-buffer': the
formatting for @defop and @defcv was incorrect.  The diff is for emacs
version 18.54.

*** texinfmt.el.~1~	Wed Dec 28 23:11:05 1988
--- texinfmt.el	Tue Jun 27 06:45:43 1989
***************
*** 905,911 ****
  	       (setq args (cdr args))))
      (let ((formatter (get texinfo-command-name 'texinfo-defun-format-type)))
        (if formatter
! 	  (setq type (funcall formatter type args))))
      ;; Delete extra newline inserted after previous header line.
      (if (not first-p)
  	(delete-char -1))
--- 905,913 ----
  	       (setq args (cdr args))))
      (let ((formatter (get texinfo-command-name 'texinfo-defun-format-type)))
        (if formatter
! 	  (let ((ta (funcall formatter type args)))
! 	    (setq type (car ta))
! 	    (setq args (cdr ta)))))
      ;; Delete extra newline inserted after previous header line.
      (if (not first-p)
  	(delete-char -1))
***************
*** 1029,1035 ****
  (put 'defmethodx 'texinfo-defun-format-index 'texinfo-format-defop-index)
  
  (defun texinfo-format-defop-type (type args)
!   (format "%s on %s" type (car args)))
  
  (defun texinfo-format-defop-index (type args)
    (format "%s on %s" (car (cdr args)) (car args)))
--- 1031,1037 ----
  (put 'defmethodx 'texinfo-defun-format-index 'texinfo-format-defop-index)
  
  (defun texinfo-format-defop-type (type args)
!   (cons (format "%s on %s" type (car args)) (cdr args)))
  
  (defun texinfo-format-defop-index (type args)
    (format "%s on %s" (car (cdr args)) (car args)))
***************
*** 1059,1065 ****
  (put 'defivarx 'texinfo-defun-format-index 'texinfo-format-defcv-index)
  
  (defun texinfo-format-defcv-type (type args)
!   (format "%s of %s" type (car args)))
  
  (defun texinfo-format-defcv-index (type args)
    (format "%s of %s" (car (cdr args)) (car args)))
--- 1061,1067 ----
  (put 'defivarx 'texinfo-defun-format-index 'texinfo-format-defcv-index)
  
  (defun texinfo-format-defcv-type (type args)
!   (cons (format "%s of %s" type (car args)) (cdr args)))
  
  (defun texinfo-format-defcv-index (type args)
    (format "%s of %s" (car (cdr args)) (car args)))