summaryrefslogtreecommitdiff
path: root/lisp/gnus
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/gnus')
-rw-r--r--lisp/gnus/ChangeLog129
-rw-r--r--lisp/gnus/ChangeLog.24
-rw-r--r--lisp/gnus/gnus-art.el2
-rw-r--r--lisp/gnus/gnus-fun.el6
-rw-r--r--lisp/gnus/gnus-group.el2
-rw-r--r--lisp/gnus/gnus-msg.el4
-rw-r--r--lisp/gnus/gnus-spec.el4
-rw-r--r--lisp/gnus/gnus-sum.el15
-rw-r--r--lisp/gnus/gnus-win.el4
-rw-r--r--lisp/gnus/gnus.el2
-rw-r--r--lisp/gnus/message.el23
-rw-r--r--lisp/gnus/mm-decode.el2
-rw-r--r--lisp/gnus/mm-view.el1
-rw-r--r--lisp/gnus/nndiary.el10
-rw-r--r--lisp/gnus/nnir.el4
-rw-r--r--lisp/gnus/nntp.el2
-rw-r--r--lisp/gnus/plstore.el2
-rw-r--r--lisp/gnus/rfc2231.el2
18 files changed, 127 insertions, 91 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index fbfcda57b53..1fff67074e7 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,32 @@
+2011-12-28 Katsumi Yamaoka <yamaoka@jpl.org>
+
+ * mm-view.el (mm-display-inline-fontify): Add comment.
+
+2011-12-15 Juri Linkov <juri@jurta.org>
+
+ * mm-decode.el (mm-inline-media-tests): Add missing
+ `mm-handle-media-subtype'.
+
+2011-12-09 Tassilo Horn <tassilo@member.fsf.org>
+
+ * message.el (message-valid-fqdn-regexp): Update with newly approved
+ top-level domain names ".tel" and ".asia".
+
+2011-12-08 Katsumi Yamaoka <yamaoka@jpl.org>
+
+ * gnus-sum.el (gnus-summary-show-article): Don't load shr
+ unconditionally.
+
+2011-12-07 Katsumi Yamaoka <yamaoka@jpl.org>
+
+ * message.el (message-pop-to-buffer): Use pop-to-buffer instead of
+ pop-to-buffer-same-window for old Emacsen.
+
+2011-12-04 Chong Yidong <cyd@gnu.org>
+
+ * message.el (message-pop-to-buffer): Partially revert 2011-11-30
+ change (Bug#10200).
+
2011-12-02 Katsumi Yamaoka <yamaoka@jpl.org>
* compface.el (uncompface):
@@ -145,7 +174,7 @@
2011-10-17 Dave Abrahams <dave@boostpro.com> (tiny change)
- * gnus-registry.el (gnus-registry-enabled): Add new variable. (Bug#9691)
+ * gnus-registry.el (gnus-registry-enabled): Add new variable (bug#9691).
(gnus-registry-install-shortcuts): Set `gnus-registry-install' to 'ask
only while we need to find out if it should be t or nil.
(gnus-registry-initialize): Don't set `gnus-registry-install' to t.
@@ -304,7 +333,7 @@
2011-09-20 Julien Danjou <julien@danjou.info>
* auth-source.el (auth-source-netrc-create): Use default value for
- password if specified. Evaluate default.
+ password if specified. Evaluate default.
(auth-source-plstore-create): Ditto.
(auth-source-plstore-create, auth-source-netrc-create): Fix default
value evaluation.
@@ -360,7 +389,7 @@
(message-mail-other-window, message-mail-other-frame)
(message-news-other-window, message-news-other-frame):
Use switch-to-buffer-other-frame and switch-to-buffer-other-window
- instead of setting buffer display varibles.
+ instead of setting buffer display variables.
2011-09-11 Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -621,8 +650,8 @@
2011-08-05 Andrew Cohen <cohen@andy.bu.edu>
- * gnus-sum.el (gnus-summary-refer-article): Warp to article. This
- allows article-referral to work from an nnir group.
+ * gnus-sum.el (gnus-summary-refer-article): Warp to article.
+ This allows article-referral to work from an nnir group.
2011-08-04 Andrew Cohen <cohen@andy.bu.edu>
@@ -638,7 +667,7 @@
2011-08-03 Andrew Cohen <cohen@andy.bu.edu>
* nnir.el (nnir-read-server-parm): Add an argument to restrict to
- server-variables only. This should fix a bug introduced with commit
+ server-variables only. This should fix a bug introduced with commit
e1889675b7f4adf057833c5513c9374134c4e053.
(nnir-run-query): 'nnir-search-engine should not be set from the global
environment.
@@ -1838,7 +1867,7 @@
2011-03-21 Julien Danjou <julien@danjou.info>
* mm-view.el (mm-display-inline-fontify): Make mode optional, and call
- normal-mode if not set. Set temp buffer unmodified to avoid kill-buffer
+ normal-mode if not set. Set temp buffer unmodified to avoid kill-buffer
query.
(mm-inline-text): Render normal text with fontification whenever
possible.
@@ -2682,9 +2711,9 @@
* gnus.el (gnus-summary-line-format): Mention &user-date format in
docstring.
- * gnus.el (gnus-user-date-format-alist): Change default value. Use
- defcustom, with type and group. Move from gnus-util.el. Rename to
- gnus-summary-user-date-format-alist.
+ * gnus.el (gnus-user-date-format-alist): Change default value.
+ Use defcustom, with type and group. Move from gnus-util.el.
+ Rename to gnus-summary-user-date-format-alist.
2011-02-03 Glenn Morris <rgm@gnu.org>
@@ -3211,12 +3240,12 @@
2010-12-17 Julien Danjou <julien@danjou.info>
* gnus-util.el (gnus-rescale-image): Allow to resize images even if
- they are from file. Can also scale up.
+ they are from file. Can also scale up.
2010-12-17 Andrew Cohen <cohen@andy.bu.edu>
- * gnus-sum.el (gnus-summary-refer-thread): Simplify code. Restore
- gnus-use-agent.
+ * gnus-sum.el (gnus-summary-refer-thread): Simplify code.
+ Restore gnus-use-agent.
(gnus-get-newsgroup-headers): Avoid unwanted spaces at eol.
* nnir.el (nnir-get-active): Ignore nnir-ignored-newsgroups if null.
@@ -3574,8 +3603,8 @@
* nnir.el: Update to handle the registry better.
(autoload): Silence byte-compiler.
(nnir-open-server): Add a hook for nnir groups.
- (nnir-request-move-article): Don't mangle the header. Better to use
- formating variables (which will be added in the future).
+ (nnir-request-move-article): Don't mangle the header. Better to use
+ formatting variables (which will be added in the future).
(nnir-registry-action): Update the registry using the original article
group name.
(nnir-mode): Install nnir-specific hooks for updating the registry.
@@ -4010,7 +4039,7 @@
2010-11-21 Andrew Cohen <cohen@andy.bu.edu>
* nnir.el: Fix typo in comments.
- (nnir-run-imap): Simplify code. No need to reverse artlist.
+ (nnir-run-imap): Simplify code. No need to reverse artlist.
(nnir-run-gmane): Use nnir-tmp-buffer for web results.
2010-11-21 Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -4042,8 +4071,8 @@
2010-11-19 Katsumi Yamaoka <yamaoka@jpl.org>
- * gnus-art.el (gnus-mime-display-single)
- * gnus-html.el (gnus-html-wash-images, gnus-html-prefetch-images)
+ * gnus-art.el (gnus-mime-display-single):
+ * gnus-html.el (gnus-html-wash-images, gnus-html-prefetch-images):
* mm-decode.el (mm-shr): Assume that gnus-inhibit-images may be a group
parameter.
@@ -4398,7 +4427,7 @@
* gnus-util.el (gnus-string-match-p): New function, that is an alias to
string-match-p in Emacs >=23.
- * gnus-msg.el (gnus-configure-posting-styles)
+ * gnus-msg.el (gnus-configure-posting-styles):
* nnir.el (nnir-run-gmane): Use gnus-string-match-p.
2010-11-01 Glenn Morris <rgm@gnu.org>
@@ -5346,8 +5375,8 @@
* gnus-util.el (gnus-remove-if): Allow hash table.
(gnus-remove-if-not): New function.
- * gnus-art.el (gnus-mime-view-part-as-type)
- * gnus-score.el (gnus-summary-score-effect)
+ * gnus-art.el (gnus-mime-view-part-as-type):
+ * gnus-score.el (gnus-summary-score-effect):
* gnus-sum.el (gnus-read-move-group-name):
Replace remove-if-not with gnus-remove-if-not.
@@ -5836,8 +5865,8 @@
2010-09-29 Katsumi Yamaoka <yamaoka@jpl.org>
* mm-util.el (mm-codepage-iso-8859-list, mm-charset-eval-alist)
- (mm-mime-charset)
- * rfc2047.el (rfc2047-syntax-table)
+ (mm-mime-charset):
+ * rfc2047.el (rfc2047-syntax-table):
* utf7.el (utf7-utf-16-coding-system): Comment fix.
* nnrss.el (nnrss-read-server-data, nnrss-read-group-data): Use `load'
@@ -5852,8 +5881,8 @@
2010-09-28 Katsumi Yamaoka <yamaoka@jpl.org>
- * mail-source.el (mail-source-report-new-mail)
- * message.el (message-default-mail-headers)
+ * mail-source.el (mail-source-report-new-mail):
+ * message.el (message-default-mail-headers):
* mm-decode.el (mm-valid-image-format-p): Comment fix.
* mml2015.el (mml2015-use): Don't bind recursive-load-depth-limit.
@@ -6349,8 +6378,8 @@
(gnus-article-next-page-1): No need to adjust the number of lines.
(gnus-article-describe-bindings): Always use help-buffer.
- * gnus-audio.el (gnus-audio-inline-sound)
- * gnus-cus.el (gnus-custom-mode)
+ * gnus-audio.el (gnus-audio-inline-sound):
+ * gnus-cus.el (gnus-custom-mode):
* gnus-group.el (gnus-group-update-tool-bar): Comment fix.
* gnus-sum.el (gnus-remove-overlays): Doc fix.
@@ -6546,9 +6575,9 @@
2010-09-22 Katsumi Yamaoka <yamaoka@jpl.org>
- * mailcap.el (mailcap-parse-mailcap, mailcap-parse-mimetypes)
- * mm-util.el (mm-decompress-buffer)
- * nnir.el (nnir-run-find-grep)
+ * mailcap.el (mailcap-parse-mailcap, mailcap-parse-mimetypes):
+ * mm-util.el (mm-decompress-buffer):
+ * nnir.el (nnir-run-find-grep):
* pop3.el (pop3-list): Use 3rd arg of split-string.
2010-09-21 Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -7123,7 +7152,7 @@
* gnus-start.el (gnus-activate-group): Take an optional parameter to
say that you don't want to call gnus-request-group with don-check, but
- do check the reponse. This is for virtual groups only.
+ do check the response. This is for virtual groups only.
(gnus-get-unread-articles): Count the archive groups as secondary, so
that they're activated the same way as before.
@@ -7414,7 +7443,7 @@
2010-09-01 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus-html.el (gnus-html-cache-directory, gnus-html-cache-size)
- (gnus-html-frame-width, gnus-blocked-images)
+ (gnus-html-frame-width, gnus-blocked-images):
* message.el (message-prune-recipient-rules): Add custom version.
* gnus-sum.el (gnus-auto-expirable-marks): Bump custom version.
@@ -7464,11 +7493,11 @@
* gnus-ems.el: Provide compatibility functions for
gnus-set-process-plist.
- * gnus-sum.el (gnus-summary-stop-at-end-of-message)
- * gnus.el (gnus-valid-select-methods)
- * message.el (message-send-mail-partially-limit)
- * mm-decode.el (mm-text-html-renderer)
- * mml.el (mml-insert-mime-headers-always)
+ * gnus-sum.el (gnus-summary-stop-at-end-of-message):
+ * gnus.el (gnus-valid-select-methods):
+ * message.el (message-send-mail-partially-limit):
+ * mm-decode.el (mm-text-html-renderer):
+ * mml.el (mml-insert-mime-headers-always):
* smiley.el (smiley-regexp-alist): Bump custom version.
2010-08-31 Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -7800,7 +7829,7 @@
2010-05-13 Katsumi Yamaoka <yamaoka@jpl.org>
- * mml1991.el (mml1991-mailcrypt-encrypt, mml1991-gpg-encrypt)
+ * mml1991.el (mml1991-mailcrypt-encrypt, mml1991-gpg-encrypt):
* mml2015.el (mml2015-gpg-encrypt): Disable multibyte in buffers
generated within the mm-with-unibyte-current-buffer macro.
@@ -7875,11 +7904,11 @@
2010-05-07 Katsumi Yamaoka <yamaoka@jpl.org>
- * nnweb.el (nnweb-gmane-search)
+ * nnweb.el (nnweb-gmane-search):
* yenc.el (yenc-decode-region): Don't run set-buffer-multibyte for
XEmacs.
- * gnus-art.el (gnus-article-browse-html-parts)
+ * gnus-art.el (gnus-article-browse-html-parts):
* gnus-group.el (gnus-read-ephemeral-gmane-group)
(gnus-read-ephemeral-bug-grou): Use mm-make-temp-file instead of
make-temp-file.
@@ -10587,10 +10616,10 @@
2007-12-05 Katsumi Yamaoka <yamaoka@jpl.org>
- * gnus-art.el (gnus-use-idna)
- * gnus-start.el (gnus-site-init-file)
- * message.el (message-use-idna)
- * mm-uu.el (mm-uu-hide-markers)
+ * gnus-art.el (gnus-use-idna):
+ * gnus-start.el (gnus-site-init-file):
+ * message.el (message-use-idna):
+ * mm-uu.el (mm-uu-hide-markers):
* smiley.el (smiley-style): Revert changes that suppress warnings.
2007-12-05 Katsumi Yamaoka <yamaoka@jpl.org>
@@ -11892,13 +11921,13 @@
2007-05-25 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus-art.el (gnus-header-from, gnus-header-subject, gnus-header-name)
- (gnus-header-content)
- * gnus-cite.el (gnus-cite-10)
- * gnus-srvr.el (gnus-server-closed)
+ (gnus-header-content):
+ * gnus-cite.el (gnus-cite-10):
+ * gnus-srvr.el (gnus-server-closed):
* gnus.el (gnus-group-mail-1, gnus-group-mail-1-empty)
(gnus-group-mail-2, gnus-group-mail-2-empty, gnus-group-mail-3)
(gnus-group-mail-3-empty, gnus-group-mail-low)
- (gnus-group-mail-low-empty, gnus-splash)
+ (gnus-group-mail-low-empty, gnus-splash):
* message.el (message-header-to, message-header-cc)
(message-header-subject, message-header-other, message-header-name)
(message-header-xheader, message-separator, message-cited-text)
@@ -21315,7 +21344,7 @@
(gnus-agent-cat-groups): Use eval-and-compile, not
eval-when-compile, to define gnus-agent-set-cat-groups as the setf
method of gnus-agent-cat-groups even when the buffer has been
- evaled.
+ evalled.
(gnus-agent-save-active, gnus-agent-save-active-1): Merge to
delete gnus-agent-save-active-1.
(gnus-agent-save-groups): Delete. Identical to
@@ -21831,7 +21860,7 @@
2004-01-06 Steve Youngs <sryoungs@bigpond.net.au>
- * gnus-ems.el (gnus-mode-line-modified): Don't conditionalise on
+ * gnus-ems.el (gnus-mode-line-modified): Don't conditionalize on
XEmacs version.
* dns.el (dns-make-network-process): Use `open-network-stream'
diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2
index 6b11a956a99..64b15ce31b3 100644
--- a/lisp/gnus/ChangeLog.2
+++ b/lisp/gnus/ChangeLog.2
@@ -5094,7 +5094,7 @@
2003-02-02 Katsumi Yamaoka <yamaoka@jpl.org>
* nnheader.el (nnheader-directory-separator-character): Change the
- way to compute the dafault value.
+ way to compute the default value.
2003-02-02 Jesper Harder <harder@ifa.au.dk>
@@ -8442,7 +8442,7 @@
2002-07-21 Nevin Kapur <nevin@jhu.edu>
- * nnmail.el (nnmail-fancy-expiry-target): Treat nonexisting
+ * nnmail.el (nnmail-fancy-expiry-target): Treat nonexistent
headers as empty headers.
2002-07-21 Jochen Hein <jochen@jochen.org>
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 555c715bc2f..ea0710bf026 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -669,7 +669,7 @@ non-nil.
If the match is a string, it is used as a regexp match on the
article. If the match is a symbol, that symbol will be funcalled
from the buffer of the article to be saved with the newsgroup as the
-parameter. If it is a list, it will be evaled in the same buffer.
+parameter. If it is a list, it will be evalled in the same buffer.
If this form or function returns a string, this string will be used as a
possible file name; and if it returns a non-nil list, that list will be
diff --git a/lisp/gnus/gnus-fun.el b/lisp/gnus/gnus-fun.el
index 08ec3c4ffb0..44cb1583ec9 100644
--- a/lisp/gnus/gnus-fun.el
+++ b/lisp/gnus/gnus-fun.el
@@ -274,10 +274,10 @@ colors of the displayed X-Faces."
result))
(defun gnus-fun-ppm-change-string ()
- (let* ((possibilites '("%02x0000" "00%02x00" "0000%02x"
- "%02x%02x00" "00%02x%02x" "%02x00%02x"))
+ (let* ((possibilities '("%02x0000" "00%02x00" "0000%02x"
+ "%02x%02x00" "00%02x%02x" "%02x00%02x"))
(format (concat "'#%02x%02x%02x' '#"
- (nth (random 6) possibilites)
+ (nth (random 6) possibilities)
"'"))
(values nil))
(dotimes (i 255)
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 694b4d7e8b4..9730b69164e 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -992,7 +992,7 @@ Setter function for custom variables."
'gnus-group-tool-bar-retro)
"Specifies the Gnus group tool bar.
-It can be either a list or a symbol refering to a list. See
+It can be either a list or a symbol referring to a list. See
`gmm-tool-bar-from-list' for the format of the list. The
default key map is `gnus-group-mode-map'.
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index e06d475ed6c..6ff1023383b 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -1588,7 +1588,7 @@ this is a reply."
;; BUG: We really need to get the charset for
;; each name in the Newsgroups and Followup-To
;; lines to allow crossposting between group
- ;; namess with incompatible character sets.
+ ;; names with incompatible character sets.
;; -- Per Abrahamsen <abraham@dina.kvl.dk> 2001-10-08.
(group-field-charset
(gnus-group-name-charset
@@ -1784,7 +1784,7 @@ this is a reply."
(and header
(string-match (nth 2 match) header)))))))
(t
- ;; This is a form to be evaled.
+ ;; This is a form to be evalled.
(eval match)))))
;; We have a match, so we set the variables.
(dolist (attribute style)
diff --git a/lisp/gnus/gnus-spec.el b/lisp/gnus/gnus-spec.el
index 2345c4fc141..4c5715c67f9 100644
--- a/lisp/gnus/gnus-spec.el
+++ b/lisp/gnus/gnus-spec.el
@@ -52,7 +52,7 @@ text properties. This is only needed on XEmacs, as Emacs does this anyway."
(defvar gnus-group-indentation "")
;; Format specs. The chunks below are the machine-generated forms
-;; that are to be evaled as the result of the default format strings.
+;; that are to be evalled as the result of the default format strings.
;; We write them in here to get them byte-compiled. That way the
;; default actions will be quite fast, while still retaining the full
;; flexibility of the user-defined format specs.
@@ -690,7 +690,7 @@ are supported for %s."
(not (and (featurep 'xemacs)
gnus-use-correct-string-widths)))
(insert (number-to-string pad-width)))
- ;; Create the form to be evaled.
+ ;; Create the form to be evalled.
(if (or max-width cut-width ignore-value
(and (featurep 'xemacs)
gnus-use-correct-string-widths))
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index b3f85cf9366..d8db300efbd 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -2835,7 +2835,7 @@ Setter function for custom variables."
'gnus-summary-tool-bar-retro)
"Specifies the Gnus summary tool bar.
-It can be either a list or a symbol refering to a list. See
+It can be either a list or a symbol referring to a list. See
`gmm-tool-bar-from-list' for the format of the list. The
default key map is `gnus-summary-mode-map'.
@@ -2969,7 +2969,7 @@ When FORCE, rebuild the tool bar."
'gnus-summary-mode-map)))
(when map
;; Need to set `gnus-summary-tool-bar-map' because `gnus-article-mode'
- ;; uses it's value.
+ ;; uses its value.
(setq gnus-summary-tool-bar-map map))))
(set (make-local-variable 'tool-bar-map) gnus-summary-tool-bar-map))
@@ -7087,7 +7087,7 @@ With ARG, turn line truncation on if ARG is positive."
(defun gnus-summary-find-for-reselect ()
"Return the number of an article to stay on across a reselect.
The current article is considered, then following articles, then previous
-articles. An article is sought which is not cancelled and isn't a temporary
+articles. An article is sought which is not canceled and isn't a temporary
insertion from another group. If there's no such then return a dummy 0."
(let (found)
(dolist (rev '(nil t))
@@ -9611,9 +9611,12 @@ C-u g', show the raw article."
(when (gnus-summary-goto-subject (cdr gnus-article-current) nil t)
(gnus-summary-update-secondary-mark (cdr gnus-article-current))))))
((not arg)
- (require 'shr)
- (let ((shr-ignore-cache t))
- ;; Select the article the normal way.
+ ;; Select the article the normal way.
+ (if (eq mm-text-html-renderer 'shr)
+ (progn
+ (require 'shr)
+ (let ((shr-ignore-cache t))
+ (gnus-summary-select-article nil 'force)))
(gnus-summary-select-article nil 'force)))
((equal arg '(16))
;; C-u C-u g
diff --git a/lisp/gnus/gnus-win.el b/lisp/gnus/gnus-win.el
index ecd5b3b525b..f0009830b44 100644
--- a/lisp/gnus/gnus-win.el
+++ b/lisp/gnus/gnus-win.el
@@ -242,7 +242,7 @@ See the Gnus manual for an explanation of the syntax used.")
(let* ((current-window (or (get-buffer-window (current-buffer)) (selected-window)))
(window (or window current-window)))
(select-window window)
- ;; The SPLIT might be something that is to be evaled to
+ ;; The SPLIT might be something that is to be evalled to
;; return a new SPLIT.
(while (and (not (assq (car split) gnus-window-to-buffer))
(symbolp (car split)) (fboundp (car split)))
@@ -447,7 +447,7 @@ should have point."
(when (consp (car split))
(push 1.0 split)
(push 'vertical split))
- ;; The SPLIT might be something that is to be evaled to
+ ;; The SPLIT might be something that is to be evalled to
;; return a new SPLIT.
(while (and (not (assq (car split) gnus-window-to-buffer))
(symbolp (car split)) (fboundp (car split)))
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 5f385ec1054..b1f0f60668e 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -700,7 +700,7 @@ be set in `.emacs' instead."
(defface gnus-summary-cancelled
'((((class color))
(:foreground "yellow" :background "black")))
- "Face used for cancelled articles."
+ "Face used for canceled articles."
:group 'gnus-summary)
;; backward-compatibility alias
(put 'gnus-summary-cancelled-face 'face-alias 'gnus-summary-cancelled)
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index ee9d4992158..5198618c2c3 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -906,7 +906,7 @@ The function `message-setup' runs this hook."
:type 'hook)
(defcustom message-cancel-hook nil
- "Hook run when cancelling articles."
+ "Hook run when canceling articles."
:group 'message-various
:link '(custom-manual "(message)Various Message Variables")
:type 'hook)
@@ -1893,14 +1893,14 @@ You must have the \"hashcash\" binary installed, see `hashcash-path'."
(concat "[a-z0-9][-.a-z0-9]+\\." ;; [hostname.subdomain.]domain.
;; valid TLDs:
"\\([a-z][a-z]\\|" ;; two letter country TDLs
- "aero\\|arpa\\|bitnet\\|biz\\|bofh\\|"
+ "aero\\|arpa\\|asia\\|bitnet\\|biz\\|bofh\\|"
"cat\\|com\\|coop\\|edu\\|gov\\|"
"info\\|int\\|jobs\\|"
"mil\\|mobi\\|museum\\|name\\|net\\|"
- "org\\|pro\\|travel\\|uucp\\)")
+ "org\\|pro\\|tel\\|travel\\|uucp\\)")
;; http://en.wikipedia.org/wiki/List_of_Internet_top-level_domains
;; http://en.wikipedia.org/wiki/GTLD
- ;; `in the process of being approved': .asia .post .tel .sex
+ ;; `approved, but not yet in operation': .xxx
;; "dead" nato bitnet uucp
"Regular expression that matches a valid FQDN."
;; see also: gnus-button-valid-fqdn-regexp
@@ -4409,7 +4409,7 @@ This function could be useful in `message-setup-hook'."
;; A simple function.
((functionp action)
(funcall action))
- ;; Something to be evaled.
+ ;; Something to be evalled.
(t
(eval action))))))
@@ -4840,7 +4840,7 @@ Otherwise, generate and save a value for `canlock-password' first."
(message-fetch-field "Followup-To")))
;; BUG: We really need to get the charset for each name in the
;; Newsgroups and Followup-To lines to allow crossposting
- ;; between group namess with incompatible character sets.
+ ;; between group names with incompatible character sets.
;; -- Per Abrahamsen <abraham@dina.kvl.dk> 2001-10-08.
(group-field-charset
(gnus-group-name-charset method newsgroups-field))
@@ -6327,7 +6327,6 @@ between beginning of field and beginning of line."
(defun message-pop-to-buffer (name &optional switch-function)
"Pop to buffer NAME, and warn if it already exists and is modified."
- (unless switch-function (setq switch-function #'pop-to-buffer))
(let ((buffer (get-buffer name)))
(if (and buffer
(buffer-name buffer))
@@ -6337,7 +6336,7 @@ between beginning of field and beginning of line."
(progn
(gnus-select-frame-set-input-focus (window-frame window))
(select-window window))
- (funcall switch-function buffer)
+ (funcall (or switch-function #'pop-to-buffer) buffer)
(set-buffer buffer))
(when (and (buffer-modified-p)
(not (prog1
@@ -6345,7 +6344,11 @@ between beginning of field and beginning of line."
"Message already being composed; erase? ")
(message nil))))
(error "Message being composed")))
- (funcall switch-function name)
+ (funcall (or switch-function
+ (if (fboundp #'pop-to-buffer-same-window)
+ #'pop-to-buffer-same-window
+ #'pop-to-buffer))
+ name)
(set-buffer name))
(erase-buffer)
(message-mode)))
@@ -7735,7 +7738,7 @@ Setter function for custom variables."
'message-tool-bar-retro)
"Specifies the message mode tool bar.
-It can be either a list or a symbol refering to a list. See
+It can be either a list or a symbol referring to a list. See
`gmm-tool-bar-from-list' for the format of the list. The
default key map is `message-mode-map'.
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index 44e2af5b904..7ea0902bdb5 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -275,7 +275,7 @@ before the external MIME handler is invoked."
(ignore-errors
(if (fboundp 'create-image)
(create-image (buffer-string) 'imagemagick 'data-p)
- (mm-create-image-xemacs type)))))
+ (mm-create-image-xemacs (mm-handle-media-subtype handle))))))
(when image
(setcar (cdr handle) (list "image/imagemagick"))
(mm-image-fit-p handle)))))))
diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el
index 854ca3497da..f14b47e86e4 100644
--- a/lisp/gnus/mm-view.el
+++ b/lisp/gnus/mm-view.el
@@ -602,6 +602,7 @@ If MODE is not set, try to find mode automatically."
;; I find font-lock a bit too verbose.
(let ((font-lock-verbose nil))
;; Disable support modes, e.g., jit-lock, lazy-lock, etc.
+ ;; Note: XEmacs people use `font-lock-mode-hook' to run those modes.
(set (make-local-variable 'font-lock-mode-hook) nil)
(set (make-local-variable 'font-lock-support-mode) nil)
(setq buffer-file-name (mm-handle-filename handle))
diff --git a/lisp/gnus/nndiary.el b/lisp/gnus/nndiary.el
index 043356ca841..29f0695c74e 100644
--- a/lisp/gnus/nndiary.el
+++ b/lisp/gnus/nndiary.el
@@ -353,7 +353,7 @@ all. This may very well take some time.")
;; List of NNDiary headers that specify the time spec. Each header name is
;; followed by either two integers (specifying a range of possible values
;; for this header) or one list (specifying all the possible values for this
- ;; header). In the latter case, the list does NOT include the unspecifyed
+ ;; header). In the latter case, the list does NOT include the unspecified
;; spec (*).
;; For time zone values, we have symbolic time zone names associated with
;; the (relative) number of seconds ahead GMT.
@@ -1161,11 +1161,11 @@ all. This may very well take some time.")
(defun nndiary-parse-schedule-value (str min-or-values max)
;; Parse the schedule string STR, or signal an error.
- ;; Signals are caught by `nndary-schedule'.
+ ;; Signals are caught by `nndiary-schedule'.
(if (string-match "[ \t]*\\*[ \t]*" str)
- ;; unspecifyed
+ ;; unspecified
nil
- ;; specifyed
+ ;; specified
(if (listp min-or-values)
;; min-or-values is values
;; #### NOTE: this is actually only a hack for time zones.
@@ -1204,7 +1204,7 @@ all. This may very well take some time.")
;; - Returns nil if `*'
;; - Otherwise returns a list of integers and/or ranges (BEG . END)
;; The exception is the Timze-Zone value which is always of the form (STR).
- ;; Signals are caught by `nndary-schedule'.
+ ;; Signals are caught by `nndiary-schedule'.
(let ((header (format "^X-Diary-%s: \\(.*\\)$" head)))
(goto-char (point-min))
(if (not (re-search-forward header nil t))
diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el
index 78d2478b4fb..3d0fc78dca7 100644
--- a/lisp/gnus/nnir.el
+++ b/lisp/gnus/nnir.el
@@ -1273,8 +1273,8 @@ Tested with swish-e-2.0.1 on Windows NT 4.0."
(message "Doing hyrex-search query \"%s\"...done" qstring)
(sit-for 0)
;; nnir-search returns:
- ;; for nnml/nnfolder: "filename mailid weigth"
- ;; for nnimap: "group mailid weigth"
+ ;; for nnml/nnfolder: "filename mailid weight"
+ ;; for nnimap: "group mailid weight"
(goto-char (point-min))
(delete-non-matching-lines "^\\S + [0-9]+ [0-9]+$")
;; HyREX doesn't search directly in groups -- so filter out here.
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index 9816c208fab..f4b8ce66d16 100644
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -665,7 +665,7 @@ command whose response triggered the error."
(process-buffer -process))))
;; When I an able to identify the
;; connection to the server AND I've
- ;; received NO reponse for
+ ;; received NO response for
;; nntp-connection-timeout seconds.
(when (and -buffer (eq 0 (buffer-size -buffer)))
;; Close the connection. Take no
diff --git a/lisp/gnus/plstore.el b/lisp/gnus/plstore.el
index 340c7255958..50208cc5b0b 100644
--- a/lisp/gnus/plstore.el
+++ b/lisp/gnus/plstore.el
@@ -420,7 +420,7 @@ SECRET-KEYS is a plist containing secret data."
(current-buffer)))))
(epa-select-keys
context
- "Select recipents for encryption.
+ "Select recipients for encryption.
If no one is selected, symmetric encryption will be performed. "
recipients)
(if plstore-encrypt-to
diff --git a/lisp/gnus/rfc2231.el b/lisp/gnus/rfc2231.el
index 306b67cd7c1..9c30379ef6e 100644
--- a/lisp/gnus/rfc2231.el
+++ b/lisp/gnus/rfc2231.el
@@ -58,7 +58,7 @@ must never cause a Lisp error."
;; The most likely cause of an error is unbalanced parentheses
;; or double-quotes. If all parentheses and double-quotes are
;; quoted meaninglessly with backslashes, removing them might
- ;; make it parseable. Let's try...
+ ;; make it parsable. Let's try...
(error
(let (mod)
(when (and (string-match "\\\\\"" string)