Mercurial > emacs
diff lisp/mail/supercite.el @ 90224:2d92f5c9d6ae
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-78
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 514-518)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 104-105)
- Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Fri, 26 Aug 2005 09:51:52 +0000 |
| parents | f9a65d7ebd29 103e161cb74f |
| children | 5e2d3828e89f |
line wrap: on
line diff
--- a/lisp/mail/supercite.el Fri Aug 05 10:57:36 2005 +0000 +++ b/lisp/mail/supercite.el Fri Aug 26 09:51:52 2005 +0000 @@ -1,6 +1,7 @@ ;;; supercite.el --- minor mode for citing mail and news replies -;; Copyright (C) 1993, 1997, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1997, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: 1993 Barry A. Warsaw <bwarsaw@python.org> ;; Maintainer: Glenn Morris <gmorris@ast.cam.ac.uk> @@ -642,8 +643,8 @@ (prog1 quit-flag (setq quit-flag nil))) (progn (message "%s%s" p (single-key-description event)) - (and (fboundp 'deallocate-event) - (deallocate-event event)) + (if (fboundp 'deallocate-event) + (deallocate-event event)) (setq quit-flag nil) (signal 'quit '()))) (let ((char @@ -658,8 +659,8 @@ ((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 + ((if (fboundp 'button-release-event-p) + (button-release-event-p event)) ; ignore them nil) (t (message "%s%s" p (single-key-description event)) @@ -669,8 +670,8 @@ (discard-input) (if (eq p prompt) (setq p (concat "Try again. " prompt))))))) - (and (fboundp 'deallocate-event) - (deallocate-event event)) + (if (fboundp 'deallocate-event) + (deallocate-event event)) p)) (defun sc-scan-info-alist (alist) @@ -1516,7 +1517,8 @@ (progn (forward-line -1) (or (= (point) (mail-header-end)) (and (eq major-mode 'mh-letter-mode) - (mh-in-header-p))))) + (with-no-warnings + (mh-in-header-p)))))) (progn (forward-line) (let ((kill-lines-magic t)) (kill-line))))))