mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-03 02:31:03 -08:00
Merge changes made in Gnus trunk.
auth.texi (GnuPG and EasyPG Assistant Configuration): Fix syntax and trim sentence. shr.el (shr-current-column): Remove buggy and unnecessary function. auth.texi: Fix up pxref/xref. auth.texi (GnuPG and EasyPG Assistant Configuration): Fix up the @item syntax for in-Emacs makeinfo. gnus-spec.el (gnus-parse-simple-format): princ doesn't really insert anything in Emacs. mm-decode.el (mm-shr): Allow use from non-Gnus users. nnimap.el (nnimap-parse-flags): Be more strict when looking for FETCH responses. nnimap.el, tls.el: Rip the STARTTLS stuff out of tls.el again, and just bind it directly from nnimap. shr.el (shr-find-fill-point): Use a filling algorithm that should probably work for CJVK text, too. nnimap.el (nnimap-open-connection): Fix open-tls-stream call. nnimap.el (nnimap-parse-flags): Fix regexp. tls.el (tls-program): Remove spurious %s from openssl. shr.el (shr-find-fill-point): Don't inloop on indented text.
This commit is contained in:
parent
2e288d54f0
commit
a1d16a7bd9
9 changed files with 75 additions and 59 deletions
|
|
@ -680,7 +680,7 @@ are supported for %s."
|
|||
((string= fstring "%d")
|
||||
(setq dontinsert t)
|
||||
(if insert
|
||||
(list `(princ ,(car flist)))
|
||||
`(insert (int-to-string ,(car flist)))
|
||||
(list `(int-to-string ,(car flist)))))
|
||||
;; Just lots of chars and strings.
|
||||
((string-match "\\`\\(%[cs]\\)+\\'" fstring)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue