From 63348d2452e6821bfc2f6207bc0d176f58adfeb7 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 18 Sep 2009 07:39:56 +0000 Subject: [PATCH] Fix typos in condition-case handlers. --- lisp/gnus/ChangeLog | 8 ++++++++ lisp/gnus/gnus-diary.el | 8 ++++---- lisp/gnus/message.el | 5 ++--- lisp/gnus/nnbabyl.el | 2 +- lisp/gnus/nndiary.el | 6 +++--- 5 files changed, 18 insertions(+), 11 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 7a140a5ee65..5b1a9e9e9e0 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,11 @@ +2009-09-18 Glenn Morris + + * gnus-diary.el (gnus-diary-check-message): + * message.el (message-insert-formatted-citation-line): + * nnbabyl.el (top-level): + * nndiary.el (nndiary-schedule): + Fix typos in condition-case handlers. + 2009-09-10 Katsumi Yamaoka * nnrss.el (nnrss-request-article): Remove binding of diff --git a/lisp/gnus/gnus-diary.el b/lisp/gnus/gnus-diary.el index 630066afafa..7ec4c6735b4 100644 --- a/lisp/gnus/gnus-diary.el +++ b/lisp/gnus/gnus-diary.el @@ -1,7 +1,7 @@ ;;; gnus-diary.el --- Wrapper around the NNDiary Gnus back end -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, -;; 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, +;; 2008, 2009 Free Software Foundation, Inc. ;; Author: Didier Verna ;; Maintainer: Didier Verna @@ -351,7 +351,7 @@ If ARG (or prefix) is non-nil, force prompting for all fields." (condition-case () (nndiary-parse-schedule-value value (nth 1 head) (nth 2 head)) - (t + (error (setq invalid t))) ;; #### NOTE: this (along with the `gnus-diary-add-header' ;; function) could be rewritten in a better way, in particular @@ -378,7 +378,7 @@ If ARG (or prefix) is non-nil, force prompting for all fields." (condition-case () (nndiary-parse-schedule-value value (nth 1 head) (nth 2 head)) - (t + (error (setq invalid t)))) (gnus-diary-add-header (concat header ": " value)) )) diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index 3c465b1a89b..e5d4d3a4464 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -3822,9 +3822,8 @@ See `message-citation-line-format'." (>= i ?a))) (push i lst) (push (condition-case nil - (progn (format-time-string (format "%%%c" i) - replydate)) - (format ">%c<" i)) + (format-time-string (format "%%%c" i) replydate) + (error (format ">%c<" i))) lst)) (setq i (1+ i))) (reverse lst))) diff --git a/lisp/gnus/nnbabyl.el b/lisp/gnus/nnbabyl.el index 2b9b1e5f30c..40863454518 100644 --- a/lisp/gnus/nnbabyl.el +++ b/lisp/gnus/nnbabyl.el @@ -32,7 +32,7 @@ (require 'nnheader) (condition-case nil (require 'rmail) - (t (nnheader-message + (error (nnheader-message 5 "Ignore rmail errors from this file, you don't have rmail"))) (require 'nnmail) (require 'nnoo) diff --git a/lisp/gnus/nndiary.el b/lisp/gnus/nndiary.el index 9ba8e37942e..c6821b0f8db 100644 --- a/lisp/gnus/nndiary.el +++ b/lisp/gnus/nndiary.el @@ -1,7 +1,7 @@ ;;; nndiary.el --- A diary back end for Gnus -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, +;; 2008, 2009 Free Software Foundation, Inc. ;; Author: Didier Verna ;; Maintainer: Didier Verna @@ -368,7 +368,7 @@ all. This may very well take some time.") (setq head (nth 0 elt)) (nndiary-parse-schedule (nth 0 elt) (nth 1 elt) (nth 2 elt))) nndiary-headers) - (t + (error (nnheader-report 'nndiary "X-Diary-%s header parse error: %s." head (cdr arg)) nil)) -- 2.39.2