Commit ec72bf63 authored by Gnus developers's avatar Gnus developers Committed by Katsumi Yamaoka

Merge changes made in Gnus trunk.

shr.el (shr-render-td): Store the actual background colour used.
gnus-sum.el (gnus-user-date): Renamed back from gnus-summary-user-date since user code refers to it.
auth-source.el: Rewrite.
gnus.texi: Add DEVEL header (suggested by Andreas Schwab).
WEBHACKDEVEL work:
 Makefile.in (webhack, nowebhack): Hacks to produce for-the-web manuals.
 auth.texi: Use WEBHACKDEVEL.
 emacs-mime.texi: Use WEBHACKDEVEL.
 gnus.texi: Use WEBHACKDEVEL.
 message.texi: Use WEBHACKDEVEL.
 pgg.texi: Use WEBHACKDEVEL.
 sasl.texi: Use WEBHACKDEVEL.
 sieve.texi: Use WEBHACKDEVEL.
 overrides.texi: New file to set or clear WEBHACKDEVEL.
message.el (message-setup-1): Remove the read-only stuff, since it doesn't work under XEmacs, for some reason.
parent f90e08f5
2011-02-04 Teodor Zlatanov <tzz@lifelogs.com>
* overrides.texi: New file to set or clear WEBHACKDEVEL.
* sieve.texi: Use WEBHACKDEVEL.
* sasl.texi: Use WEBHACKDEVEL.
* pgg.texi: Use WEBHACKDEVEL.
* message.texi: Use WEBHACKDEVEL.
* gnus.texi: Use WEBHACKDEVEL.
* emacs-mime.texi: Use WEBHACKDEVEL.
* auth.texi: Use WEBHACKDEVEL.
* Makefile.in (webhack, nowebhack): Hacks to produce for-the-web
manuals.
2011-02-04 Lars Ingebrigtsen <larsi@gnus.org>
* gnus.texi: Add DEVEL header (suggested by Andreas Schwab).
2011-02-03 Paul Eggert <eggert@cs.ucla.edu>
* texinfo.tex: Update to version 2011-02-01.10 from gnulib,
......
\input texinfo @c -*-texinfo-*-
@include overrides.texi
@setfilename ../../info/auth
@settitle Emacs auth-source Library @value{VERSION}
......@@ -35,7 +38,12 @@ license to the document, as described in section 6 of the license.
@end direntry
@titlepage
@ifset WEBHACKDEVEL
@title Emacs auth-source Library (DEVELOPMENT VERSION)
@end ifset
@ifclear WEBHACKDEVEL
@title Emacs auth-source Library
@end ifclear
@author by Ted Zlatanov
@page
@vskip 0pt plus 1filll
......
\input texinfo
@include overrides.texi
@setfilename ../../info/emacs-mime
@settitle Emacs MIME Manual
@synindex fn cp
......@@ -38,7 +40,12 @@ developing GNU and promoting software freedom.''
@setchapternewpage odd
@titlepage
@ifset WEBHACKDEVEL
@title Emacs MIME Manual (DEVELOPMENT VERSION)
@end ifset
@ifclear WEBHACKDEVEL
@title Emacs MIME Manual
@end ifclear
@author by Lars Magne Ingebrigtsen
@page
......
\input texinfo
@include overrides.texi
@setfilename ../../info/gnus
@settitle Gnus Manual
@syncodeindex fn cp
......@@ -329,7 +331,12 @@ developing GNU and promoting software freedom.''
@titlepage
@ifset WEBHACKDEVEL
@title Gnus Manual (DEVELOPMENT VERSION)
@end ifset
@ifclear WEBHACKDEVEL
@title Gnus Manual
@end ifclear
@author by Lars Magne Ingebrigtsen
@page
\input texinfo @c -*-texinfo-*-
@include overrides.texi
@setfilename ../../info/message
@settitle Message Manual
@synindex fn cp
......@@ -34,7 +36,12 @@ developing GNU and promoting software freedom.''
@end iftex
@titlepage
@ifset WEBHACKDEVEL
@title Message Manual (DEVELOPMENT VERSION)
@end ifset
@ifclear WEBHACKDEVEL
@title Message Manual
@end ifclear
@author by Lars Magne Ingebrigtsen
@page
......
@clear WEBHACKDEVEL
\input texinfo @c -*-texinfo-*-
@include overrides.texi
@setfilename ../../info/pgg
@settitle PGG @value{VERSION}
......@@ -30,7 +33,12 @@ developing GNU and promoting software freedom.''
@end direntry
@titlepage
@ifset WEBHACKDEVEL
@title PGG (DEVELOPMENT VERSION)
@end ifset
@ifclear WEBHACKDEVEL
@title PGG
@end ifclear
@author by Daiki Ueno
@page
......
\input texinfo @c -*-texinfo-*-
@include overrides.texi
@setfilename ../../info/sasl
@set VERSION 0.2
......@@ -37,7 +40,12 @@ license to the document, as described in section 6 of the license.
@titlepage
@ifset WEBHACKDEVEL
@title Emacs SASL Library @value{VERSION} (DEVELOPMENT VERSION)
@end ifset
@ifclear WEBHACKDEVEL
@title Emacs SASL Library @value{VERSION}
@end ifclear
@author by Daiki Ueno
@page
......
\input texinfo @c -*-texinfo-*-
@include overrides.texi
@setfilename ../../info/sieve
@settitle Emacs Sieve Manual
@synindex fn cp
......@@ -34,7 +37,12 @@ developing GNU and promoting software freedom.''
@setchapternewpage odd
@titlepage
@ifset WEBHACKDEVEL
@title Emacs Sieve Manual (DEVELOPMENT VERSION)
@end ifset
@ifclear WEBHACKDEVEL
@title Emacs Sieve Manual
@end ifclear
@author by Simon Josefsson
@page
......
2011-02-04 Lars Ingebrigtsen <larsi@gnus.org>
* message.el (message-setup-1): Remove the read-only stuff, since it
doesn't work under XEmacs, for some reason.
* gnus-sum.el (gnus-user-date): Renamed back from
gnus-summary-user-date since user code refers to it.
* shr.el (shr-render-td): Store the actual background colour used.
* message.el (message-setup-1): Don't bind the constant
-forbidden-properties.
(message-setup-1): Revert previous change, since it needs to bind the
......
......@@ -1395,7 +1395,7 @@ the normal Gnus MIME machinery."
(?u gnus-tmp-user-defined ?s)
(?P (gnus-pick-line-number) ?d)
(?B gnus-tmp-thread-tree-header-string ?s)
(user-date (gnus-summary-user-date
(user-date (gnus-user-date
,(macroexpand '(mail-header-date gnus-tmp-header))) ?s))
"An alist of format specifications that can appear in summary lines.
These are paired with what variables they correspond with, along with
......@@ -3882,7 +3882,7 @@ respectively."
(make-obsolete-variable 'gnus-user-date-format-alist
'gnus-summary-user-date-format-alist "24.1")
(defun gnus-summary-user-date (messy-date)
(defun gnus-user-date (messy-date)
"Format the messy-date according to `gnus-summary-user-date-format-alist'.
Returns \" ? \" if there's bad input or if another error occurs.
Input should look like this: \"Sun, 14 Oct 2001 13:34:39 +0200\"."
......
......@@ -6411,9 +6411,7 @@ are not included."
(funcall message-default-headers)
message-default-headers))
(or (bolp) (insert ?\n)))
(let ((message-forbidden-properties nil))
(insert (propertize (concat mail-header-separator "\n")
'read-only t 'rear-nonsticky t 'intangible t)))
(insert (concat mail-header-separator "\n"))
(forward-line -1)
;; If a crash happens while replying, the auto-save file would *not* have a
;; `References:' header if `message-generate-headers-first' was nil.
......
......@@ -601,7 +601,8 @@ ones, in case fg and bg are nil."
(when fg
(shr-put-color start end :foreground (cadr new-colors)))
(when bg
(shr-put-color start end :background (car new-colors)))))))
(shr-put-color start end :background (car new-colors))))
new-colors)))
;; Put a color in the region, but avoid putting colors on on blank
;; text at the start of the line, and the newline at the end, to avoid
......@@ -1126,7 +1127,7 @@ ones, in case fg and bg are nil."
(fgcolor (cdr (assq :fgcolor cont)))
(style (cdr (assq :style cont)))
(shr-stylesheet shr-stylesheet)
overlays)
overlays actual-colors)
(when style
(setq style (and (string-match "color" style)
(shr-parse-style style))))
......@@ -1178,16 +1179,17 @@ ones, in case fg and bg are nil."
(insert (make-string (- width (current-column)) ? )))
(forward-line 1)))
(when style
(shr-colorize-region
(point-min) (point-max)
(cdr (assq 'color shr-stylesheet))
(cdr (assq 'background-color shr-stylesheet)))))
(setq actual-colors
(shr-colorize-region
(point-min) (point-max)
(cdr (assq 'color shr-stylesheet))
(cdr (assq 'background-color shr-stylesheet))))))
(if fill
(list max
(count-lines (point-min) (point-max))
(split-string (buffer-string) "\n")
(shr-collect-overlays)
(cdr (assq 'background-color shr-stylesheet)))
(car actual-colors))
(list max
(shr-natural-width)))))))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment