Commit 052bd38a authored by Lars Magne Ingebrigtsen's avatar Lars Magne Ingebrigtsen Committed by Katsumi Yamaoka

Merge changes made in Gnus trunk.

gnus.el (gnus-home-directory): Add warning about setting in .gnus.el (bug#9405).
gnus-score.el (gnus-summary-increase-score): Doc clarification (bug#9421).
gnus-spec.el (gnus-face-0): Make all the face specs into defcustoms (bug#9425).
gnus-art.el (gnus-treatment-function-alist): Remove CRs as the first thing (bug#9426).
parent 86633eab
2011-09-04 Lars Magne Ingebrigtsen <larsi@gnus.org>
* gnus.el (gnus-home-directory): Add warning about setting in .gnus.el
(bug#9405).
* gnus-score.el (gnus-summary-increase-score): Doc clarification
(bug#9421).
* gnus-spec.el (gnus-face-0): Make all the face specs into defcustoms
(bug#9425).
* gnus-art.el (gnus-treatment-function-alist): Remove CRs as the first
thing (bug#9426).
2011-09-03 Lars Magne Ingebrigtsen <larsi@gnus.org>
* nnimap.el (nnimap-open-connection-1): Use the correct port number in
......
......@@ -1657,14 +1657,14 @@ regexp."
(defvar gnus-article-mime-handle-alist-1 nil)
(defvar gnus-treatment-function-alist
'((gnus-treat-x-pgp-sig gnus-article-verify-x-pgp-sig)
'((gnus-treat-strip-cr gnus-article-remove-cr)
(gnus-treat-x-pgp-sig gnus-article-verify-x-pgp-sig)
(gnus-treat-strip-banner gnus-article-strip-banner)
(gnus-treat-strip-headers-in-body gnus-article-strip-headers-in-body)
(gnus-treat-highlight-signature gnus-article-highlight-signature)
(gnus-treat-buttonize gnus-article-add-buttons)
(gnus-treat-fill-article gnus-article-fill-cited-article)
(gnus-treat-fill-long-lines gnus-article-fill-cited-long-lines)
(gnus-treat-strip-cr gnus-article-remove-cr)
(gnus-treat-unsplit-urls gnus-article-unsplit-urls)
(gnus-treat-display-x-face gnus-article-display-x-face)
(gnus-treat-display-face gnus-article-display-face)
......
......@@ -522,9 +522,10 @@ of the last successful match.")
(defun gnus-summary-lower-score (&optional score symp)
"Make a score entry based on the current article.
The user will be prompted for header to score on, match type,
permanence, and the string to be used. The numerical prefix will be
used as score. A symbolic prefix of `a' says to use the `all.SCORE'
file for the command instead of the current score file."
permanence, and the string to be used. The numerical prefix will
be used as SCORE. A symbolic prefix of `a' (the SYMP parameter)
says to use the `all.SCORE' file for the command instead of the
current score file."
(interactive (gnus-interactive "P\ny"))
(gnus-summary-increase-score (- (gnus-score-delta-default score)) symp))
......@@ -537,9 +538,10 @@ file for the command instead of the current score file."
(defun gnus-summary-increase-score (&optional score symp)
"Make a score entry based on the current article.
The user will be prompted for header to score on, match type,
permanence, and the string to be used. The numerical prefix will be
used as score. A symbolic prefix of `a' says to use the `all.SCORE'
file for the command instead of the current score file."
permanence, and the string to be used. The numerical prefix will
be used as SCORE. A symbolic prefix of `a' (the SYMP parameter)
says to use the `all.SCORE' file for the command instead of the
current score file."
(interactive (gnus-interactive "P\ny"))
(let* ((nscore (gnus-score-delta-default score))
(prefix (if (< nscore 0) ?L ?I))
......
......@@ -264,11 +264,30 @@ Return a list of updated types."
(push (cons 'version emacs-version) gnus-format-specs))
updated))
(defvar gnus-mouse-face-0 'highlight)
(defvar gnus-mouse-face-1 'highlight)
(defvar gnus-mouse-face-2 'highlight)
(defvar gnus-mouse-face-3 'highlight)
(defvar gnus-mouse-face-4 'highlight)
(defcustom gnus-mouse-face-0 'highlight
"The \"%(hello%)\" face."
:group 'gnus-format
:type 'face)
(defcustom gnus-mouse-face-1 'highlight
"The \"%1(hello%)\" face."
:group 'gnus-format
:type 'face)
(defcustom gnus-mouse-face-2 'highlight
"The \"%2(hello%)\" face."
:group 'gnus-format
:type 'face)
(defcustom gnus-mouse-face-3 'highlight
"The \"%3(hello%)\" face."
:group 'gnus-format
:type 'face)
(defcustom gnus-mouse-face-4 'highlight
"The \"%4(hello%)\" face."
:group 'gnus-format
:type 'face)
(defun gnus-mouse-face-function (form type)
`(gnus-put-text-property
......@@ -278,11 +297,30 @@ Return a list of updated types."
'gnus-mouse-face
`(quote ,(symbol-value (intern (format "gnus-mouse-face-%d" type)))))))
(defvar gnus-face-0 'bold)
(defvar gnus-face-1 'italic)
(defvar gnus-face-2 'bold-italic)
(defvar gnus-face-3 'bold)
(defvar gnus-face-4 'bold)
(defcustom gnus-face-0 'bold
"The \"%{hello%}\" face."
:group 'gnus-format
:type 'face)
(defcustom gnus-face-1 'italic
"The \"%1{hello%}\" face."
:group 'gnus-format
:type 'face)
(defcustom gnus-face-2 'bold-italic
"The \"%2{hello%}\" face."
:group 'gnus-format
:type 'face)
(defcustom gnus-face-3 'bold
"The \"%3{hello%}\" face."
:group 'gnus-format
:type 'face)
(defcustom gnus-face-4 'bold
"The \"%4{hello%}\" face."
:group 'gnus-format
:type 'face)
(defun gnus-face-face-function (form type)
`(gnus-add-text-properties
......
......@@ -1245,7 +1245,12 @@ REST is a plist of following:
(defcustom gnus-home-directory "~/"
"Directory variable that specifies the \"home\" directory.
All other Gnus file and directory variables are initialized from this variable."
All other Gnus file and directory variables are initialized from this variable.
Note that Gnus is mostly loaded when the `.gnus.el' file is read.
This means that other directory variables that are initialized
from this variable won't be set properly if you set this variable
in `.gnus.el'. Set this variable in `.emacs' instead."
:group 'gnus-files
:type 'directory)
......
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