[Emacs-diffs] Changes to emacs/lisp/mail/supercite.el

[Richard M . Stallman]

Index: emacs/lisp/mail/supercite.el
diff -c emacs/lisp/mail/supercite.el:1.52 emacs/lisp/mail/supercite.el:1.53
*** emacs/lisp/mail/supercite.el:1.52   Sat Aug  6 18:54:05 2005
--- emacs/lisp/mail/supercite.el        Tue Aug  9 11:39:01 2005
***************
*** 643,650 ****
            (prog1 quit-flag (setq quit-flag nil)))
          (progn
            (message "%s%s" p (single-key-description event))
!           (and (fboundp 'deallocate-event)
!                (deallocate-event event))
            (setq quit-flag nil)
            (signal 'quit '())))
        (let ((char
--- 643,650 ----
            (prog1 quit-flag (setq quit-flag nil)))
          (progn
            (message "%s%s" p (single-key-description event))
!           (if (fboundp 'deallocate-event)
!               (deallocate-event event))
            (setq quit-flag nil)
            (signal 'quit '())))
        (let ((char
***************
*** 659,666 ****
         ((setq elt (rassq char alist))
          (message "%s%s" p (car elt))
          (setq p (cdr elt)))
!        ((and (fboundp 'button-release-event-p)
!              (button-release-event-p event)) ; ignore them
          nil)
         (t
          (message "%s%s" p (single-key-description event))
--- 659,666 ----
         ((setq elt (rassq char alist))
          (message "%s%s" p (car elt))
          (setq p (cdr elt)))
!        ((if (fboundp 'button-release-event-p)
!             (button-release-event-p event)) ; ignore them
          nil)
         (t
          (message "%s%s" p (single-key-description event))
***************
*** 670,677 ****
          (discard-input)
          (if (eq p prompt)
              (setq p (concat "Try again.  " prompt)))))))
!     (and (fboundp 'deallocate-event)
!        (deallocate-event event))
      p))
  
  (defun sc-scan-info-alist (alist)
--- 670,677 ----
          (discard-input)
          (if (eq p prompt)
              (setq p (concat "Try again.  " prompt)))))))
!     (if (fboundp 'deallocate-event)
!       (deallocate-event event))
      p))
  
  (defun sc-scan-info-alist (alist)
***************
*** 1517,1523 ****
               (progn (forward-line -1)
                      (or (= (point) (mail-header-end))
                          (and (eq major-mode 'mh-letter-mode)
!                              (mh-in-header-p)))))
          (progn (forward-line)
                 (let ((kill-lines-magic t))
                   (kill-line))))))
--- 1517,1524 ----
               (progn (forward-line -1)
                      (or (= (point) (mail-header-end))
                          (and (eq major-mode 'mh-letter-mode)
!                              (with-no-warnings
!                                (mh-in-header-p))))))
          (progn (forward-line)
                 (let ((kill-lines-magic t))
                   (kill-line))))))