(outline-promote): Try shortening the heading.

[gnu-emacs] / lisp / mail / supercite.el

diff --git a/lisp/mail/supercite.el b/lisp/mail/supercite.el
index 137d7d51b53d3bf6e408342138360a4298b1a7c9..a180c6c67ceac7d6e8cf57d935ab989bcb1011f6 100644 (file)
--- a/lisp/mail/supercite.el
+++ b/lisp/mail/supercite.el
@@ -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>
@@ -24,8 +25,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;; LCD Archive Entry
 ;; supercite|Barry A. Warsaw|supercite-help@python.org
@@ -642,8 +643,8 @@ the list should be unique."
            (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 @@ the list should be unique."
         ((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 @@ the list should be unique."
          (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 @@ non-nil."
               (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))))))