summaryrefslogtreecommitdiff
path: root/lisp/gnus
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/gnus')
-rw-r--r--lisp/gnus/ChangeLog76
-rw-r--r--lisp/gnus/ChangeLog.14
-rw-r--r--lisp/gnus/ChangeLog.28
-rw-r--r--lisp/gnus/compface.el3
-rw-r--r--lisp/gnus/gmm-utils.el2
-rw-r--r--lisp/gnus/gnus-art.el17
-rw-r--r--lisp/gnus/gnus-group.el6
-rw-r--r--lisp/gnus/gnus-msg.el5
-rw-r--r--lisp/gnus/gnus-start.el2
-rw-r--r--lisp/gnus/gnus-sum.el2
-rw-r--r--lisp/gnus/gnus-topic.el2
-rw-r--r--lisp/gnus/mail-source.el4
-rw-r--r--lisp/gnus/message.el14
-rw-r--r--lisp/gnus/mm-bodies.el4
-rw-r--r--lisp/gnus/mm-decode.el2
-rw-r--r--lisp/gnus/mml.el23
-rw-r--r--lisp/gnus/nnml.el2
-rw-r--r--lisp/gnus/pop3.el6
-rw-r--r--lisp/gnus/rfc2047.el4
-rw-r--r--lisp/gnus/shr.el6
-rw-r--r--lisp/gnus/starttls.el32
21 files changed, 147 insertions, 77 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 889a5230d15..fbfcda57b53 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,45 @@
+2011-12-02 Katsumi Yamaoka <yamaoka@jpl.org>
+
+ * compface.el (uncompface):
+ * gnus-art.el (gnus-article-x-face-command): Update the header format
+ of icon data for the most recent icontopbm program.
+
+2011-12-01 Katsumi Yamaoka <yamaoka@jpl.org>
+
+ * gnus-msg.el (gnus-inews-do-gcc):
+ * message.el (message-send-mail):
+ * mml.el (mml-generate-mime): Share the value of the buffer-local
+ `message-options' variable between a draft buffer and temprary working
+ buffers.
+
+2011-11-30 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * message.el (message-pop-to-buffer): Revert 2011-09-11 change.
+
+2011-11-30 Katsumi Yamaoka <yamaoka@jpl.org>
+
+ * gnus-art.el (gnus-article-browse-html-parts): Convert link file names
+ for Cygwin.
+
+2011-11-24 Glenn Morris <rgm@gnu.org>
+
+ * starttls.el: Fix case of "GnuTLS".
+
+2011-11-24 Juanma Barranquero <lekktu@gmail.com>
+
+ * gnus-group.el (gnus-group-highlight): Fix typo.
+
+2011-11-24 Adam W <adam_w67@yahoo.com> (tiny change)
+
+ * mail-source.el (mail-source-fetch-maildir): Don't expect the return
+ value of `delete-file', that returns nil for a local file but returns t
+ for a remote file using ssh.
+
+2011-11-22 Lars Magne Ingebrigtsen <larsi@gnus.org>
+
+ * shr.el (shr-table-horizontal-line): Use "?\s" instead of "? " to
+ avoid later breakage.
+
2011-11-22 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus-art.el (gnus-article-setup-buffer): Decode group name used for
@@ -2266,7 +2308,7 @@
* gnus-art.el (gnus-article-next-page-1): Because customized mode-line
face with line-width greater than zero will cause RET in gnus summary
buffer to scroll down article page-wise because auto vscroll happens,
- it should be temporalily disabled when doing a scroll-up.
+ it should be temporally disabled when doing a scroll-up.
2011-02-19 Lars Ingebrigtsen <larsi@gnus.org>
@@ -2759,7 +2801,7 @@
2011-01-28 Lars Ingebrigtsen <larsi@gnus.org>
* gnus-sum.el (gnus-select-newsgroup): Don't try to alter the active
- data if the group is unactivated.
+ data if the group is inactive.
2011-01-28 Julien Danjou <julien@danjou.info>
@@ -2850,7 +2892,7 @@
we're using an encrypted connection.
* proto-stream.el: Alter the interface functions to also return the
- actual stream type used: network or tls.
+ actual stream type used: network or TLS.
2011-01-25 Julien Danjou <julien@danjou.info>
@@ -3579,7 +3621,7 @@
2010-11-30 Lars Magne Ingebrigtsen <larsi@gnus.org>
- * proto-stream.el (open-protocol-stream): All starttls connections are
+ * proto-stream.el (open-protocol-stream): All STARTTLS connections are
handled by the network handler.
2010-11-30 Julien Danjou <julien@danjou.info>
@@ -3668,9 +3710,9 @@
(nnimap-open-connection): Be more backwards-compatible.
* proto-stream.el (proto-stream-always-use-starttls): New variable.
- (proto-stream-open-starttls): De-duplicate the starttls code.
+ (proto-stream-open-starttls): De-duplicate the STARTTLS code.
(proto-stream-open-starttls): Folded back into the main function.
- (proto-stream-open-network): Fix typo in the gnutls path.
+ (proto-stream-open-network): Fix typo in the GnuTLS path.
(proto-stream-command): Refactor out.
* nntp.el (nntp-open-connection): Fix the STARTTLS command syntax.
@@ -3682,7 +3724,7 @@
* proto-stream.el (proto-stream-open-tls): Delete output from openssl
if we're using tls.el.
- (proto-stream-open-network): If we don't have gnutls-cli or gnutls
+ (proto-stream-open-network): If we don't have gnutls-cli or GnuTLS
built in, then don't try to establish a STARTTLS connection.
* nntp.el (nntp-open-connection): Switch on STARTTLS on supported
@@ -5082,7 +5124,7 @@
* gnus-sum.el (gnus-summary-set-local-parameters): Ignore the `active'
non-variable, too.
- * nnimap.el (nnimap-open-connection): Use gnutls STARTTLS, if
+ * nnimap.el (nnimap-open-connection): Use GnuTLS STARTTLS, if
available.
(nnimap-update-info): Rely more on the current active than the param
active to avoid marking articles as read too much.
@@ -5131,8 +5173,8 @@
group is the "last", so that the backends like nnfolder actually save
their folders.
- * nnimap.el (nnimap-open-connection): If we have gnutls loaded, then
- try to use that for the tls stream.
+ * nnimap.el (nnimap-open-connection): If we have GnuTLS loaded, then
+ try to use that for the TLS stream.
(nnimap-retrieve-group-data-early): Rework the marks code to heed
UIDVALIDITY and find out which groups are read-only and not.
(nnimap-get-flags): Use the same marks parsing code as the rest of
@@ -6351,8 +6393,8 @@
* gnus-int.el (gnus-request-update-info): Protect against backends not
having the function.
- * nnimap.el (nnimap-stream): Mention starttls.
- (nnimap-open-connection): Add starttls support.
+ * nnimap.el (nnimap-stream): Mention STARTTLS.
+ (nnimap-open-connection): Add STARTTLS support.
2010-09-23 Andrew Cohen <cohen@andy.bu.edu>
@@ -10942,7 +10984,7 @@
2007-11-14 Denys Duchier <denys.duchier@univ-orleans.fr> (tiny change)
* pop3.el (pop3-open-server): Accept and process data more robustly at
- connexion start to avoid spurious "POP SSL connexion failed" errors.
+ connection start to avoid spurious "POP SSL connection failed" errors.
2007-11-14 Katsumi Yamaoka <yamaoka@jpl.org>
@@ -11689,7 +11731,7 @@
(nntp-open-marks): Decode group names when bootstrapping marks.
* rfc2047.el (rfc2047-encode-message-header): Make XEmacs decode
- Newsgroups and Folowup-To headers.
+ Newsgroups and Followup-To headers.
2007-07-13 Katsumi Yamaoka <yamaoka@jpl.org>
@@ -16497,7 +16539,7 @@
2005-07-01 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus-art.el (article-display-face): Improve the efficiency.
- (article-display-x-face): Ditto; remove grey x-face stuff.
+ (article-display-x-face): Ditto; remove gray x-face stuff.
2005-06-30 Katsumi Yamaoka <yamaoka@jpl.org>
@@ -18632,7 +18674,7 @@
2004-09-28 Kevin Greiner <kgreiner@compsol.cc>
* gnus-agent.el (gnus-agent-synchronize-group-flags): Replace
- gnus-requst-update-info with explicit code to sync the in-memory
+ gnus-request-update-info with explicit code to sync the in-memory
info read flags with the marks being sync'd to the backend.
* gnus-util.el (gnus-pp): Add optional stream to match pp API.
@@ -19746,7 +19788,7 @@
2004-05-26 Simon Josefsson <jas@extundo.com>
- * starttls.el: Merge with my GNUTLS based starttls.el.
+ * starttls.el: Merge with my GnuTLS based starttls.el.
(starttls-gnutls-program, starttls-use-gnutls)
(starttls-extra-arguments, starttls-process-connection-type)
(starttls-connect, starttls-failure, starttls-success):
diff --git a/lisp/gnus/ChangeLog.1 b/lisp/gnus/ChangeLog.1
index 86c4eea59ab..a2d6d61efd4 100644
--- a/lisp/gnus/ChangeLog.1
+++ b/lisp/gnus/ChangeLog.1
@@ -2346,7 +2346,7 @@
* nnmh.el: Don't call nnmail-activate.
- * gnus.el: User-variabelize all custom vars.
+ * gnus.el: User-variablize all custom vars.
1998-02-13 Lars Magne Ingebrigtsen <larsi@menja.ifi.uio.no>
@@ -3471,7 +3471,7 @@
* pop3.el (pop3-md5): `with-temp-buffer' doesn't exist in Emacs
19.34.
- * nneething.el (nneething-directory): Defvarred.
+ * nneething.el (nneething-directory): Defvared.
* message.el: Autoloaded nndraft things.
(message-set-auto-save-file-name): Use it.
diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2
index e519ce340c2..6b11a956a99 100644
--- a/lisp/gnus/ChangeLog.2
+++ b/lisp/gnus/ChangeLog.2
@@ -1396,7 +1396,7 @@
* tls.el (tls-process-connection-type): Doc fix.
* imap.el (imap-starttls-open): Rewrite, should support both old
- starttls.el and new starttls.el that uses GNUTLS.
+ starttls.el and new starttls.el that uses GnuTLS.
2003-09-18 Katsumi Yamaoka <yamaoka@jpl.org>
@@ -5120,7 +5120,7 @@
* gnus-util.el (gnus-prin1-to-string): Bind print-length and
print-level.
- * gnus-art.el (article-display-x-face): Removed grey x-face stuff.
+ * gnus-art.el (article-display-x-face): Removed gray x-face stuff.
(gnus-treat-display-grey-xface): Removed.
* gnus-fun.el (gnus-grab-cam-face): New.
@@ -9836,7 +9836,7 @@
2002-02-08 ShengHuo ZHU <zsh@cs.rochester.edu>
* gnus-art.el (gnus-treat-display-grey-xface): New variable.
- (article-display-x-face): Use it. Disable grey xface, if
+ (article-display-x-face): Use it. Disable gray xface, if
uncompface is not found.
* message.el (message-mode): Don't enable multibyte on an indirect
@@ -11350,7 +11350,7 @@
* gnus-fun.el (gnus-convert-gray-x-face-to-xpm): Renamed.
* gnus-art.el (gnus-ignored-headers): Hide all X-Faces.
- (article-display-x-face): Display grey X-Faces.
+ (article-display-x-face): Display gray X-Faces.
* gnus-fun.el (gnus-convert-gray-x-face-region): New function.
(gnus-convert-gray-x-face-to-ppm): Ditto.
diff --git a/lisp/gnus/compface.el b/lisp/gnus/compface.el
index 2a2383777cb..e132f736269 100644
--- a/lisp/gnus/compface.el
+++ b/lisp/gnus/compface.el
@@ -42,7 +42,8 @@ or `faces-xface' and `netpbm' or `libgr-progs', for instance."
'delete '(t nil) nil))
(progn
(goto-char (point-min))
- (insert "/* Width=48, Height=48 */\n")
+ (insert "/* Format_version=1, Width=48, Height=48, Depth=1,\
+ Valid_bits_per_item=16 */\n")
;; I just can't get "icontopbm" to work correctly on its
;; own in XEmacs. And Emacs doesn't understand un-raw pbm
;; files.
diff --git a/lisp/gnus/gmm-utils.el b/lisp/gnus/gmm-utils.el
index f913ddb5378..3ee72bc5fc6 100644
--- a/lisp/gnus/gmm-utils.el
+++ b/lisp/gnus/gmm-utils.el
@@ -217,7 +217,7 @@ This is a copy of the `lazy' widget in Emacs 22.1 provided for compatibility."
'static-color 'pseudo-color)))))
'gnome
'retro)
- "Prefered tool bar style."
+ "Preferred tool bar style."
:type '(choice (const :tag "GNOME style" gnome)
(const :tag "Retro look" retro))
:group 'gmm)
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 0abc802f558..555c715bc2f 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -268,11 +268,14 @@ This can also be a list of the above values."
(if (or (gnus-image-type-available-p 'xface)
(gnus-image-type-available-p 'pbm))
'gnus-display-x-face-in-from
- "{ echo '/* Width=48, Height=48 */'; uncompface; } | icontopbm | ee -")
+ "{ echo \
+'/* Format_version=1, Width=48, Height=48, Depth=1, Valid_bits_per_item=16 */'\
+; uncompface; } | icontopbm | ee -")
(if (gnus-image-type-available-p 'pbm)
'gnus-display-x-face-in-from
- "{ echo '/* Width=48, Height=48 */'; uncompface; } | icontopbm | \
-display -"))
+ "{ echo \
+'/* Format_version=1, Width=48, Height=48, Depth=1, Valid_bits_per_item=16 */'\
+; uncompface; } | icontopbm | display -"))
"*String or function to be executed to display an X-Face header.
If it is a string, the command will be executed in a sub-shell
asynchronously. The compressed face will be piped to this command."
@@ -2879,6 +2882,14 @@ message header will be added to the bodies of the \"text/html\" parts."
(with-current-buffer gnus-article-buffer
gnus-article-mime-handles)
cid-dir))
+ (when (eq system-type 'cygwin)
+ (setq cid-file
+ (concat "/" (substring
+ (with-output-to-string
+ (call-process "cygpath" nil
+ standard-output
+ nil "-m" cid-file))
+ 0 -1))))
(replace-match (concat "file://" cid-file)
nil nil nil 1))))
(unless content (setq content (buffer-string))))
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 6f146644115..694b4d7e8b4 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -362,7 +362,7 @@ If you want to modify the group buffer, you can use this hook."
gnus-group-news-low))
"*Controls the highlighting of group buffer lines.
-Below is a list of `Form'/`Face' pairs. When deciding how a a
+Below is a list of `Form'/`Face' pairs. When deciding how a
particular group line should be displayed, each form is
evaluated. The content of the face field after the first true form is
used. You can change how those group lines are displayed by
@@ -1354,9 +1354,9 @@ if it is a string, only list groups matching REGEXP."
(predicate t) ; We list all groups?
(t
(or
- (if (eq unread t) ; Unactivated?
+ (if (eq unread t) ; Inactive?
gnus-group-list-inactive-groups
- ; We list unactivated
+ ; We list inactive
(and (numberp unread) (> unread 0)))
; We list groups with unread articles
(and gnus-list-groups-with-ticked-articles
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index e6a06a0500d..e06d475ed6c 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -1549,7 +1549,7 @@ this is a reply."
(message-narrow-to-headers)
(let ((gcc (or gcc (mail-fetch-field "gcc" nil t)))
(cur (current-buffer))
- groups group method group-art
+ groups group method group-art options
mml-externalize-attachments)
(when gcc
(message-remove-header "gcc")
@@ -1573,6 +1573,7 @@ this is a reply."
gnus-gcc-externalize-attachments))
(save-excursion
(nnheader-set-temp-buffer " *acc*")
+ (setq message-options (with-current-buffer cur message-options))
(insert-buffer-substring cur)
(message-encode-message-body)
(save-restriction
@@ -1629,6 +1630,8 @@ this is a reply."
(boundp 'gnus-inews-mark-gcc-as-read)
(symbol-value 'gnus-inews-mark-gcc-as-read))))
(gnus-group-mark-article-read group (cdr group-art)))
+ (setq options message-options)
+ (with-current-buffer cur (setq message-options options))
(kill-buffer (current-buffer)))))))))
(defun gnus-inews-insert-gcc (&optional group)
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index b18b78df063..3a9294d58d6 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -2533,7 +2533,7 @@ If FORCE is non-nil, the .newsrc file is read."
((or (eq symbol options-symbol)
(eq symbol Options-symbol))
(setq gnus-newsrc-options
- ;; This concating is quite inefficient, but since our
+ ;; This concatting is quite inefficient, but since our
;; thorough studies show that approx 99.37% of all
;; .newsrc files only contain a single options line, we
;; don't give a damn, frankly, my dear.
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 7cea88e7f54..b3f85cf9366 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -11913,7 +11913,7 @@ will not be marked as saved."
;; This is a pseudo-article.
(if (assq 'name header)
(gnus-copy-file (cdr (assq 'name header)))
- (gnus-message 1 "Article %d is unsaveable" article))
+ (gnus-message 1 "Article %d is unsavable" article))
;; This is a real article.
(save-window-excursion
(gnus-summary-select-article decode decode nil article)
diff --git a/lisp/gnus/gnus-topic.el b/lisp/gnus/gnus-topic.el
index 17af1a38333..87ca27adcf4 100644
--- a/lisp/gnus/gnus-topic.el
+++ b/lisp/gnus/gnus-topic.el
@@ -582,7 +582,7 @@ articles in the topic and its subtopics."
(or gnus-topic-display-empty-topics ;We want empty topics
(not (zerop unread)) ;Non-empty
tick ;Ticked articles
- (/= point-max (point-max)))) ;Unactivated groups
+ (/= point-max (point-max)))) ;Inactive groups
(gnus-extent-start-open (point))
(gnus-topic-insert-topic-line
(car type) visiblep
diff --git a/lisp/gnus/mail-source.el b/lisp/gnus/mail-source.el
index 6e6ef76c0c1..2315cff6261 100644
--- a/lisp/gnus/mail-source.el
+++ b/lisp/gnus/mail-source.el
@@ -1017,6 +1017,7 @@ This only works when `display-time' is enabled."
(dolist (file (directory-files (concat path subdir) t))
(when (and (not (file-directory-p file))
(not (if function
+ ;; `function' should return nil if successful.
(funcall function file mail-source-crash-box)
(let ((coding-system-for-write
mm-text-coding-system)
@@ -1035,7 +1036,8 @@ This only works when `display-time' is enabled."
;;; (insert "\n\n")
;; MMDF mail format
(insert "\001\001\001\001\n"))
- (delete-file file)))))
+ (delete-file file)
+ nil))))
(incf found (mail-source-callback callback file))
(mail-source-delete-crash-box)))))
found)))
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 5d82faee20d..ee9d4992158 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -4507,7 +4507,8 @@ This function could be useful in `message-setup-hook'."
(boundp 'gnus-group-posting-charset-alist))
(gnus-setup-posting-charset nil)
message-posting-charset))
- (headers message-required-mail-headers))
+ (headers message-required-mail-headers)
+ options)
(when (and message-generate-hashcash
(not (eq message-generate-hashcash 'opportunistic)))
(message "Generating hashcash...")
@@ -4546,9 +4547,11 @@ This function could be useful in `message-setup-hook'."
(error "Failed to send the message")))))
;; Let the user do all of the above.
(run-hooks 'message-header-hook))
+ (setq options message-options)
(unwind-protect
(with-current-buffer tembuf
(erase-buffer)
+ (setq message-options options)
;; Avoid copying text props (except hard newlines).
(insert (with-current-buffer mailbuf
(mml-buffer-substring-no-properties-except-hard-newlines
@@ -4630,9 +4633,11 @@ If you always want Gnus to send messages in one piece, set
(message "Sending via mail...")
(funcall (or message-send-mail-real-function
message-send-mail-function)))
- (message-send-mail-partially)))
+ (message-send-mail-partially))
+ (setq options message-options))
(kill-buffer tembuf))
(set-buffer mailbuf)
+ (setq message-options options)
(push 'mail message-sent-message-via)))
(defvar sendmail-program)
@@ -6322,6 +6327,7 @@ 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))
@@ -6331,7 +6337,7 @@ between beginning of field and beginning of line."
(progn
(gnus-select-frame-set-input-focus (window-frame window))
(select-window window))
- (funcall (or switch-function 'switch-to-buffer) buffer)
+ (funcall switch-function buffer)
(set-buffer buffer))
(when (and (buffer-modified-p)
(not (prog1
@@ -6339,7 +6345,7 @@ between beginning of field and beginning of line."
"Message already being composed; erase? ")
(message nil))))
(error "Message being composed")))
- (funcall (or switch-function 'switch-to-buffer) name)
+ (funcall switch-function name)
(set-buffer name))
(erase-buffer)
(message-mode)))
diff --git a/lisp/gnus/mm-bodies.el b/lisp/gnus/mm-bodies.el
index 695451ddc45..ee7ba1c193b 100644
--- a/lisp/gnus/mm-bodies.el
+++ b/lisp/gnus/mm-bodies.el
@@ -87,9 +87,9 @@ If no encoding was done, nil is returned."
(goto-char (point-min))
(if (re-search-forward "[^\x0-\x7f]" nil t)
(or mail-parse-charset
- (message-options-get 'mm-encody-body-charset)
+ (message-options-get 'mm-body-charset-encoding-alist)
(message-options-set
- 'mm-encody-body-charset
+ 'mm-body-charset-encoding-alist
(mm-read-coding-system "Charset used in the article: ")))
;; The logic in `mml-generate-mime-1' confirms that it's OK
;; to return nil here.
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index 36c56e0921b..44e2af5b904 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -360,7 +360,7 @@ to:
(\"text/html\" \"text/richtext\")
Adding \"image/.*\" might also be useful. Spammers use it as the
-prefered part of multipart/alternative messages. See also
+preferred part of multipart/alternative messages. See also
`gnus-buttonized-mime-types', to which adding \"multipart/alternative\"
enables you to choose manually one of two types those mails include."
:type '(repeat regexp) ;; See `mm-preferred-alternative-precedence'.
diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index 352fa329e3e..867c3be4b60 100644
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/mml.el
@@ -466,16 +466,21 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
(defun mml-generate-mime ()
"Generate a MIME message based on the current MML document."
(let ((cont (mml-parse))
- (mml-multipart-number mml-multipart-number))
+ (mml-multipart-number mml-multipart-number)
+ (options message-options))
(if (not cont)
nil
- (mm-with-multibyte-buffer
- (if (and (consp (car cont))
- (= (length cont) 1))
- (mml-generate-mime-1 (car cont))
- (mml-generate-mime-1 (nconc (list 'multipart '(type . "mixed"))
- cont)))
- (buffer-string)))))
+ (prog1
+ (mm-with-multibyte-buffer
+ (setq message-options options)
+ (if (and (consp (car cont))
+ (= (length cont) 1))
+ (mml-generate-mime-1 (car cont))
+ (mml-generate-mime-1 (nconc (list 'multipart '(type . "mixed"))
+ cont)))
+ (setq options message-options)
+ (buffer-string))
+ (setq message-options options)))))
(defun mml-generate-mime-1 (cont)
(let ((mm-use-ultra-safe-encoding
@@ -1454,7 +1459,7 @@ Should be adopted if code in `message-send-mail' is changed."
"Display current buffer with Gnus, in a new buffer.
If RAW, display a raw encoded MIME message.
-The window layout for the preview buffer is controled by the variables
+The window layout for the preview buffer is controlled by the variables
`special-display-buffer-names', `special-display-regexps', or
`gnus-buffer-configuration' (the first match made will be used),
or the `pop-to-buffer' function."
diff --git a/lisp/gnus/nnml.el b/lisp/gnus/nnml.el
index 399008cec1b..59e06364f42 100644
--- a/lisp/gnus/nnml.el
+++ b/lisp/gnus/nnml.el
@@ -1213,7 +1213,7 @@ Use the nov database for the current group if available."
;; #### already belongs to a range, whereas the corresponding
;; #### article doesn't exist (for example, if you delete an
;; #### article). For that reason, it is important to update
- ;; #### the ranges (meaning remove inexistent articles) before
+ ;; #### the ranges (meaning remove nonexistent articles) before
;; #### doing anything on them.
;; 2 a/ read articles:
(let ((read (gnus-info-read info)))
diff --git a/lisp/gnus/pop3.el b/lisp/gnus/pop3.el
index ee3e6582e80..0f7a450b30c 100644
--- a/lisp/gnus/pop3.el
+++ b/lisp/gnus/pop3.el
@@ -270,11 +270,11 @@ Use streaming commands."
message-count))
(defcustom pop3-stream-type nil
- "*Transport security type for POP3 connexions.
-This may be either nil (plain connexion), `ssl' (use an
+ "*Transport security type for POP3 connections.
+This may be either nil (plain connection), `ssl' (use an
SSL/TSL-secured stream) or `starttls' (use the starttls mechanism
to turn on TLS security after opening the stream). However, if
-this is nil, `ssl' is assumed for connexions to port
+this is nil, `ssl' is assumed for connections to port
995 (pop3s)."
:version "23.1" ;; No Gnus
:group 'pop3
diff --git a/lisp/gnus/rfc2047.el b/lisp/gnus/rfc2047.el
index feed078034c..f1cb1f69e56 100644
--- a/lisp/gnus/rfc2047.el
+++ b/lisp/gnus/rfc2047.el
@@ -586,7 +586,7 @@ should not change this value.")
((>= column rfc2047-encode-max-chars)
(when eword
(cond ((string-match "\n[ \t]+\\'" eword)
- ;; Reomove a superfluous empty line.
+ ;; Remove a superfluous empty line.
(setq eword (substring eword 0 (match-beginning 0))))
((string-match "(+\\'" eword)
;; Break the line before the open parenthesis.
@@ -639,7 +639,7 @@ should not change this value.")
(setq crest " "
eword (concat eword next)))
(when (string-match "\n[ \t]+\\'" eword)
- ;; Reomove a superfluous empty line.
+ ;; Remove a superfluous empty line.
(setq eword (substring eword 0 (match-beginning 0))))
(rfc2047-encode-1 (length crest) (substring string index)
cs encoder start " " tail
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index 119d8e0a7f3..f2d8f843564 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -53,17 +53,17 @@ fit these criteria."
:group 'shr
:type 'regexp)
-(defcustom shr-table-horizontal-line ? ; space
+(defcustom shr-table-horizontal-line ?\s
"Character used to draw horizontal table lines."
:group 'shr
:type 'character)
-(defcustom shr-table-vertical-line ? ; space
+(defcustom shr-table-vertical-line ?\s
"Character used to draw vertical table lines."
:group 'shr
:type 'character)
-(defcustom shr-table-corner ? ; space
+(defcustom shr-table-corner ?\s
"Character used to draw table corners."
:group 'shr
:type 'character)
diff --git a/lisp/gnus/starttls.el b/lisp/gnus/starttls.el
index b995f7478ce..af9fd42c127 100644
--- a/lisp/gnus/starttls.el
+++ b/lisp/gnus/starttls.el
@@ -5,7 +5,7 @@
;; Author: Daiki Ueno <ueno@unixuser.org>
;; Author: Simon Josefsson <simon@josefsson.org>
;; Created: 1999/11/20
-;; Keywords: TLS, SSL, OpenSSL, GNUTLS, mail, news
+;; Keywords: TLS, SSL, OpenSSL, GnuTLS, mail, news
;; This file is part of GNU Emacs.
@@ -33,15 +33,15 @@
;; implementations both called "starttls.el". The first one is Daiki
;; Ueno's starttls.el which uses his own "starttls" command line tool,
;; and the second one is Simon Josefsson's starttls.el which uses
-;; "gnutls-cli" from GNUTLS.
+;; "gnutls-cli" from GnuTLS.
;;
-;; If "starttls" is available, it is prefered by the code over
+;; If "starttls" is available, it is preferred by the code over
;; "gnutls-cli", for backwards compatibility. Use
;; `starttls-use-gnutls' to toggle between implementations if you have
-;; both tools installed. It is recommended to use GNUTLS, though, as
+;; both tools installed. It is recommended to use GnuTLS, though, as
;; it performs more verification of the certificates.
-;; The GNUTLS support requires GNUTLS 0.9.90 (released 2003-10-08) or
+;; The GnuTLS support requires GnuTLS 0.9.90 (released 2003-10-08) or
;; later, from <http://www.gnu.org/software/gnutls/>, or "starttls"
;; from <ftp://ftp.opaopa.org/pub/elisp/>.
@@ -121,8 +121,8 @@
:group 'mail)
(defcustom starttls-gnutls-program "gnutls-cli"
- "Name of GNUTLS command line tool.
-This program is used when GNUTLS is used, i.e. when
+ "Name of GnuTLS command line tool.
+This program is used when GnuTLS is used, i.e. when
`starttls-use-gnutls' is non-nil."
:version "22.1"
:type 'string
@@ -136,7 +136,7 @@ i.e. when `starttls-use-gnutls' is nil."
:group 'starttls)
(defcustom starttls-use-gnutls (not (executable-find starttls-program))
- "*Whether to use GNUTLS instead of the `starttls' command."
+ "*Whether to use GnuTLS instead of the `starttls' command."
:version "22.1"
:type 'boolean
:group 'starttls)
@@ -150,7 +150,7 @@ These apply when the `starttls' command is used, i.e. when
(defcustom starttls-extra-arguments nil
"Extra arguments to `starttls-program'.
-These apply when GNUTLS is used, i.e. when `starttls-use-gnutls' is non-nil.
+These apply when GnuTLS is used, i.e. when `starttls-use-gnutls' is non-nil.
For example, non-TLS compliant servers may require
'(\"--protocols\" \"ssl3\"). Invoke \"gnutls-cli --help\" to
@@ -167,8 +167,8 @@ find out which parameters are available."
(defcustom starttls-connect "- Simple Client Mode:\n\n"
"*Regular expression indicating successful connection.
-The default is what GNUTLS's \"gnutls-cli\" outputs."
- ;; GNUTLS cli.c:main() prints this string when it is starting to run
+The default is what GnuTLS's \"gnutls-cli\" outputs."
+ ;; GnuTLS cli.c:main() prints this string when it is starting to run
;; in the application read/write phase. If the logic, or the string
;; itself, is modified, this must be updated.
:version "22.1"
@@ -177,8 +177,8 @@ The default is what GNUTLS's \"gnutls-cli\" outputs."
(defcustom starttls-failure "\\*\\*\\* Handshake has failed"
"*Regular expression indicating failed TLS handshake.
-The default is what GNUTLS's \"gnutls-cli\" outputs."
- ;; GNUTLS cli.c:do_handshake() prints this string on failure. If the
+The default is what GnuTLS's \"gnutls-cli\" outputs."
+ ;; GnuTLS cli.c:do_handshake() prints this string on failure. If the
;; logic, or the string itself, is modified, this must be updated.
:version "22.1"
:type 'regexp
@@ -186,8 +186,8 @@ The default is what GNUTLS's \"gnutls-cli\" outputs."
(defcustom starttls-success "- Compression: "
"*Regular expression indicating completed TLS handshakes.
-The default is what GNUTLS's \"gnutls-cli\" outputs."
- ;; GNUTLS cli.c:do_handshake() calls, on success,
+The default is what GnuTLS's \"gnutls-cli\" outputs."
+ ;; GnuTLS cli.c:do_handshake() calls, on success,
;; common.c:print_info(), that unconditionally print this string
;; last. If that logic, or the string itself, is modified, this
;; must be updated.
@@ -283,7 +283,7 @@ BUFFER is the buffer (or `buffer-name') to associate with the process.
Third arg is name of the host to connect to, or its IP address.
Fourth arg PORT is an integer specifying a port to connect to.
If `starttls-use-gnutls' is nil, this may also be a service name, but
-GNUTLS requires a port number."
+GnuTLS requires a port number."
(if starttls-use-gnutls
(starttls-open-stream-gnutls name buffer host port)
(message "Opening STARTTLS connection to `%s:%s'" host (format "%s" port))
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-24 21:53:41 +0000