Changes committed gnus/lisp (10 files)
"Katsumi Yamaoka" <[email protected]> Mon, 28 Sep 2009 14:10:56 +0200
| Newsgroups | gmane.emacs.gnus.commits |
|---|---|
| Message-ID | <[email protected]> |
Modified: ChangeLog dig.el gnus-art.el gnus-diary.el message.el mm-util.el
nnbabyl.el nndiary.el nnir.el pgg-pgp.el
Synch with Emacs trunk.
2009-09-24 Juanma Barranquero <[email protected]>
* dig.el (dig-invoke): Fix typo in docstring.
(query-dig): Reflow docstring.
2009-09-23 Juanma Barranquero <[email protected]>
* gnus-art.el (gnus-article-encrypt-body):
* message.el (message-check-recipients):
* mm-util.el (mm-codepage-setup):
* nnir.el (gnus-summary-nnir-goto-thread, nnir-run-waissearch)
(nnir-run-swish++, nnir-run-swish-e): Fix typos in error messages.
2009-09-21 Kevin Ryde <[email protected]>
* dig.el: Add "Keywords: comm", as per net-utils.el.
2009-09-21 Stefan Monnier <[email protected]>
* dig.el (dig-mode): Use define-derived-mode.
2009-09-19 Glenn Morris <[email protected]>
* pgg-pgp.el (pgg-pgp-encrypt-region): Add missing mapconcat separator.
2009-09-18 Glenn Morris <[email protected]>
* 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.
Index: ChangeLog
diff -u gnus/lisp/ChangeLog:7.2024 gnus/lisp/ChangeLog:7.2025
--- ChangeLog:7.2024 Wed Sep 23 09:08:39 2009
+++ ChangeLog Mon Sep 28 14:10:56 2009
@@ -1,6 +1,15 @@
-2009-09-23 Katsumi Yamaoka <[email protected]>
+2009-09-24 Juanma Barranquero <[email protected]>
- * pgg-pgp.el (pgg-pgp-encrypt-region): Add 3rd arg to mapconcat.
+ * dig.el (dig-invoke): Fix typo in docstring.
+ (query-dig): Reflow docstring.
+
+2009-09-23 Juanma Barranquero <[email protected]>
+
+ * gnus-art.el (gnus-article-encrypt-body):
+ * message.el (message-check-recipients):
+ * mm-util.el (mm-codepage-setup):
+ * nnir.el (gnus-summary-nnir-goto-thread, nnir-run-waissearch)
+ (nnir-run-swish++, nnir-run-swish-e): Fix typos in error messages.
2009-09-22 Daiki Ueno <[email protected]>
@@ -10,6 +19,26 @@
* mml-smime.el (mml-smime-epg-sign, mml-smime-epg-encrypt): Ditto.
* mml1991.el (mml1991-epg-sign, mml1991-epg-encrypt): Ditto.
+2009-09-21 Kevin Ryde <[email protected]>
+
+ * dig.el: Add "Keywords: comm", as per net-utils.el.
+
+2009-09-21 Stefan Monnier <[email protected]>
+
+ * dig.el (dig-mode): Use define-derived-mode.
+
+2009-09-19 Glenn Morris <[email protected]>
+
+ * pgg-pgp.el (pgg-pgp-encrypt-region): Add missing mapconcat separator.
+
+2009-09-18 Glenn Morris <[email protected]>
+
+ * 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-15 Katsumi Yamaoka <[email protected]>
* gnus-art.el (gnus-article-edit-part): Work for the buffer
Index: dig.el
diff -u gnus/lisp/dig.el:7.15 gnus/lisp/dig.el:7.16
--- dig.el:7.15 Wed Sep 9 11:31:35 2009
+++ dig.el Mon Sep 28 14:10:56 2009
@@ -4,7 +4,7 @@
;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
;; Author: Simon Josefsson <[email protected]>
-;; Keywords: DNS BIND dig
+;; Keywords: DNS BIND dig comm
;; This file is part of GNU Emacs.
@@ -68,10 +68,10 @@
query-type query-class query-option
dig-option server)
"Call dig with given arguments and return buffer containing output.
-DOMAIN is a string with a DNS domain. QUERY-TYPE is an optional string
-with a DNS type. QUERY-CLASS is an optional string with a DNS class.
-QUERY-OPTION is an optional string with dig \"query options\".
-DIG-OPTIONS is an optional string with parameters for the dig program.
+DOMAIN is a string with a DNS domain. QUERY-TYPE is an optional
+string with a DNS type. QUERY-CLASS is an optional string with a DNS
+class. QUERY-OPTION is an optional string with dig \"query options\".
+DIG-OPTION is an optional string with parameters for the dig program.
SERVER is an optional string with a domain name server to query.
Dig is an external program found in the BIND name server distribution,
@@ -136,23 +136,16 @@
(define-key dig-mode-map "q" 'dig-exit))
-(defun dig-mode ()
+(define-derived-mode dig-mode nil "Dig"
"Major mode for displaying dig output."
- (interactive)
- (kill-all-local-variables)
- (setq mode-name "dig")
- (setq major-mode 'dig-mode)
- (use-local-map dig-mode-map)
(buffer-disable-undo)
(unless (featurep 'xemacs)
(set (make-local-variable 'font-lock-defaults)
'(dig-font-lock-keywords t)))
(when (featurep 'font-lock)
+ ;; FIXME: what is this for?? --Stef
(font-lock-set-defaults))
- (save-current-buffer
- (if (fboundp 'run-mode-hooks)
- (run-mode-hooks 'dig-mode-hook)
- (run-hooks 'dig-mode-hook))))
+ )
(defun dig-exit ()
"Quit dig output buffer."
@@ -178,9 +171,9 @@
(defun query-dig (domain &optional
query-type query-class query-option dig-option server)
"Query addresses of a DOMAIN using dig.
-It works by calling `dig-invoke' and `dig-extract-rr'. Optional
-arguments are passed to `dig-invoke' and `dig-extract-rr'. Returns
-nil for domain/class/type queries that results in no data."
+It works by calling `dig-invoke' and `dig-extract-rr'.
+Optional arguments are passed to `dig-invoke' and `dig-extract-rr'.
+Returns nil for domain/class/type queries that result in no data."
(let ((buffer (dig-invoke domain query-type query-class
query-option dig-option server)))
(when buffer
Index: gnus-art.el
diff -u gnus/lisp/gnus-art.el:7.296 gnus/lisp/gnus-art.el:7.297
--- gnus-art.el:7.296 Tue Sep 15 12:19:16 2009
+++ gnus-art.el Mon Sep 28 14:10:56 2009
@@ -8316,7 +8316,7 @@
(when (and gnus-article-encrypt-protocol
gnus-novice-user)
(unless (gnus-y-or-n-p "Really encrypt article(s)? ")
- (error "Encrypt aborted.")))
+ (error "Encrypt aborted")))
(let ((func (cdr (assoc protocol gnus-article-encrypt-protocol-alist))))
(unless func
(error "Can't find the encrypt protocol %s" protocol))
Index: gnus-diary.el
diff -u gnus/lisp/gnus-diary.el:7.22 gnus/lisp/gnus-diary.el:7.23
--- gnus-diary.el:7.22 Thu Jan 22 08:02:16 2009
+++ gnus-diary.el Mon Sep 28 14:10:56 2009
@@ -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 <[email protected]>
;; Maintainer: Didier Verna <[email protected]>
@@ -351,7 +351,7 @@
(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 @@
(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))
))
Index: message.el
diff -u gnus/lisp/message.el:7.282 gnus/lisp/message.el:7.283
--- message.el:7.282 Wed Sep 9 11:31:35 2009
+++ message.el Mon Sep 28 14:10:56 2009
@@ -3822,9 +3822,8 @@
(>= 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)))
@@ -4248,7 +4247,7 @@
(not (y-or-n-p
(format
"Address `%s' might be bogus. Continue? " bog)))
- (error "Bogus address."))))))))
+ (error "Bogus address"))))))))
(custom-add-option 'message-setup-hook 'message-check-recipients)
Index: mm-util.el
diff -u gnus/lisp/mm-util.el:7.92 gnus/lisp/mm-util.el:7.93
--- mm-util.el:7.92 Wed Sep 9 11:31:35 2009
+++ mm-util.el Mon Sep 28 14:10:56 2009
@@ -315,7 +315,7 @@
(candidates (if (fboundp 'cp-supported-codepages)
(cp-supported-codepages)
;; Removed in Emacs 23 (unicode), so signal an error:
- (error "`codepage-setup' not present in this Emacs version."))))
+ (error "`codepage-setup' not present in this Emacs version"))))
(list (completing-read "Setup DOS Codepage: (default 437) " candidates
nil t nil nil "437"))))
(when alias
@@ -326,7 +326,7 @@
(unless (mm-coding-system-p cp)
(if (fboundp 'codepage-setup) ; silence compiler
(codepage-setup number)
- (error "`codepage-setup' not present in this Emacs version.")))
+ (error "`codepage-setup' not present in this Emacs version")))
(when (and alias
;; Don't add alias if setup of cp failed.
(mm-coding-system-p cp))
Index: nnbabyl.el
diff -u gnus/lisp/nnbabyl.el:7.14 gnus/lisp/nnbabyl.el:7.15
--- nnbabyl.el:7.14 Thu Jan 22 08:02:16 2009
+++ nnbabyl.el Mon Sep 28 14:10:56 2009
@@ -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)
Index: nndiary.el
diff -u gnus/lisp/nndiary.el:7.22 gnus/lisp/nndiary.el:7.23
--- nndiary.el:7.22 Thu Jan 22 08:02:16 2009
+++ nndiary.el Mon Sep 28 14:10:56 2009
@@ -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 <[email protected]>
;; Maintainer: Didier Verna <[email protected]>
@@ -368,7 +368,7 @@
(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))
Index: nnir.el
diff -u gnus/lisp/nnir.el:7.6 gnus/lisp/nnir.el:7.7
--- nnir.el:7.6 Wed Sep 9 11:31:35 2009
+++ nnir.el Mon Sep 28 14:10:56 2009
@@ -690,7 +690,7 @@
and show thread that contains this article."
(interactive)
(unless (eq 'nnir (car (gnus-find-method-for-group gnus-newsgroup-name)))
- (error "Can't execute this command unless in nnir group."))
+ (error "Can't execute this command unless in nnir group"))
(let* ((cur (gnus-summary-article-number))
(group (nnir-artlist-artitem-group nnir-artlist cur))
(backend-number (nnir-artlist-artitem-number nnir-artlist cur))
@@ -889,7 +889,7 @@
"Run given query agains waissearch. Returns vector of (group name, file name)
pairs (also vectors, actually)."
(when group
- (error "The freeWAIS-sf backend cannot search specific groups."))
+ (error "The freeWAIS-sf backend cannot search specific groups"))
(save-excursion
(let ((qstring (cdr (assq 'query query)))
(prefix (nnir-read-server-parm 'nnir-wais-remove-prefix server))
@@ -1162,7 +1162,7 @@
Windows NT 4.0."
(when group
- (error "The swish++ backend cannot search specific groups."))
+ (error "The swish++ backend cannot search specific groups"))
(save-excursion
(let ( (qstring (cdr (assq 'query query)))
@@ -1179,7 +1179,7 @@
score artno dirnam filenam)
(when (equal "" qstring)
- (error "swish++: You didn't enter anything."))
+ (error "swish++: You didn't enter anything"))
(set-buffer (get-buffer-create nnir-tmp-buffer))
(erase-buffer)
@@ -1251,7 +1251,7 @@
;; swish-e crashes with empty parameter to "-w" on commandline...
(when group
- (error "The swish-e backend cannot search specific groups."))
+ (error "The swish-e backend cannot search specific groups"))
(save-excursion
(let ((qstring (cdr (assq 'query query)))
@@ -1261,7 +1261,7 @@
artlist score artno dirnam group )
(when (equal "" qstring)
- (error "swish-e: You didn't enter anything."))
+ (error "swish-e: You didn't enter anything"))
(set-buffer (get-buffer-create nnir-tmp-buffer))
(erase-buffer)
Index: pgg-pgp.el
diff -u gnus/lisp/pgg-pgp.el:7.21 gnus/lisp/pgg-pgp.el:7.22
--- pgg-pgp.el:7.21 Wed Sep 23 09:08:17 2009
+++ pgg-pgp.el Mon Sep 28 14:10:56 2009
@@ -1,7 +1,7 @@
;;; pgg-pgp.el --- PGP 2.* and 6.* support for PGG.
-;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+;; 2009 Free Software Foundation, Inc.
;; Author: Daiki Ueno <[email protected]>
;; Created: 1999/11/02
@@ -145,8 +145,7 @@
(mapconcat 'shell-quote-argument
(append recipients
(if pgg-encrypt-for-me
- (list pgg-pgp-user-id)))
- " "))
+ (list pgg-pgp-user-id))) " "))
(if sign (concat " -s -u " (shell-quote-argument pgg-pgp-user-id))))))
(pgg-pgp-process-region start end nil pgg-pgp-program args)
(pgg-process-when-success nil)))