diff options
| author | Gnus developers <ding@gnus.org> | 2010-10-10 00:15:21 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2010-10-10 00:15:21 +0000 |
| commit | f7aa248a5b1ce15ac2a3b70b4a55833d9d1eb44b (patch) | |
| tree | b99adc70fa490b39906ab483b5478066d81d149a /lisp/gnus/shr.el | |
| parent | e836e5cd0462864de01c9873a327169f7706bd3a (diff) | |
| download | emacs-f7aa248a5b1ce15ac2a3b70b4a55833d9d1eb44b.tar.gz | |
Merge changes made in Gnus trunk.
nnimap.el (nnimap-open-connection): If we have gnutls loaded, then try to use that for the tls stream.
nnimap.el (nnimap-retrieve-group-data-early): Rework the marks code to heed UIDVALIDITY and find out which groups are read-only and not.
nnimap.el (nnimap-get-flags): Use the same marks parsing code as the rest of nnimap.
nnimap.el (nnmail-expiry-target-group): Say that every expiry target group is the "last".
nnir.el (nnir-engines): Fix too many arguments.
nnimap.el: Start implementing QRESYNC support.
gnus.el (gnus-group-set-parameter): Fix typo.
shr.el: Rework the way things are indented by <li> slightly.
spam.el (gnus-summary-mode-map): Bind to "$".
Diffstat (limited to 'lisp/gnus/shr.el')
| -rw-r--r-- | lisp/gnus/shr.el | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el index 8f246a06e36..0700621a912 100644 --- a/lisp/gnus/shr.el +++ b/lisp/gnus/shr.el @@ -230,7 +230,7 @@ redirects somewhere else." (defun shr-ensure-paragraph () (unless (bobp) - (if (bolp) + (if (<= (current-column) shr-indentation) (unless (save-excursion (forward-line -1) (looking-at " *$")) @@ -242,7 +242,8 @@ redirects somewhere else." (insert "\n\n"))))) (defun shr-indent () - (insert (make-string shr-indentation ? ))) + (when (> shr-indentation 0) + (insert (make-string shr-indentation ? )))) (defun shr-fontize-cont (cont &rest types) (let (shr-start) @@ -332,6 +333,7 @@ Return a string with image data." (defun shr-tag-p (cont) (shr-ensure-paragraph) + (shr-indent) (shr-generic cont) (shr-ensure-paragraph)) @@ -404,11 +406,13 @@ Return a string with image data." (defun shr-tag-pre (cont) (let ((shr-folding-mode 'none)) (shr-ensure-newline) + (shr-indent) (shr-generic cont) (shr-ensure-newline))) (defun shr-tag-blockquote (cont) (shr-ensure-paragraph) + (shr-indent) (let ((shr-indentation (+ shr-indentation 4))) (shr-generic cont)) (shr-ensure-paragraph)) @@ -426,7 +430,8 @@ Return a string with image data." (shr-ensure-paragraph)) (defun shr-tag-li (cont) - (shr-ensure-newline) + (shr-ensure-paragraph) + (shr-indent) (let* ((bullet (if (numberp shr-list-mode) (prog1 @@ -439,7 +444,8 @@ Return a string with image data." (defun shr-tag-br (cont) (unless (bobp) - (insert "\n")) + (insert "\n") + (shr-indent)) (shr-generic cont)) (defun shr-tag-h1 (cont) |