[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r105656: Merge changes made in Gnus t
From: |
Katsumi Yamaoka |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r105656: Merge changes made in Gnus trunk. |
Date: |
Sun, 04 Sep 2011 22:17:09 +0000 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 105656
author: Lars Magne Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Sun 2011-09-04 22:17:09 +0000
message:
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).
modified:
lisp/gnus/ChangeLog
lisp/gnus/gnus-art.el
lisp/gnus/gnus-score.el
lisp/gnus/gnus-spec.el
lisp/gnus/gnus.el
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2011-09-03 22:51:26 +0000
+++ b/lisp/gnus/ChangeLog 2011-09-04 22:17:09 +0000
@@ -1,3 +1,17 @@
+2011-09-04 Lars Magne Ingebrigtsen <address@hidden>
+
+ * 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 <address@hidden>
* nnimap.el (nnimap-open-connection-1): Use the correct port number in
=== modified file 'lisp/gnus/gnus-art.el'
--- a/lisp/gnus/gnus-art.el 2011-08-21 22:10:49 +0000
+++ b/lisp/gnus/gnus-art.el 2011-09-04 22:17:09 +0000
@@ -1657,14 +1657,14 @@
(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)
=== modified file 'lisp/gnus/gnus-score.el'
--- a/lisp/gnus/gnus-score.el 2011-08-13 08:55:53 +0000
+++ b/lisp/gnus/gnus-score.el 2011-09-04 22:17:09 +0000
@@ -522,9 +522,10 @@
(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 @@
(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))
=== modified file 'lisp/gnus/gnus-spec.el'
--- a/lisp/gnus/gnus-spec.el 2011-08-18 22:12:47 +0000
+++ b/lisp/gnus/gnus-spec.el 2011-09-04 22:17:09 +0000
@@ -264,11 +264,30 @@
(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 @@
'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
=== modified file 'lisp/gnus/gnus.el'
--- a/lisp/gnus/gnus.el 2011-08-04 22:14:04 +0000
+++ b/lisp/gnus/gnus.el 2011-09-04 22:17:09 +0000
@@ -1245,7 +1245,12 @@
(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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r105656: Merge changes made in Gnus trunk.,
Katsumi Yamaoka <=