Mercurial > emacs
changeset 109408:4eded71f4215
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Tue, 15 Jun 2010 22:55:36 +0000 |
| parents | 51e15604baa1 (current diff) cf7a433d2eb6 (diff) |
| children | ff42e5c5f789 |
| files | |
| diffstat | 4 files changed, 13 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Jun 15 08:18:19 2010 +0000 +++ b/lisp/ChangeLog Tue Jun 15 22:55:36 2010 +0000 @@ -1,3 +1,7 @@ +2010-06-15 Juanma Barranquero <lekktu@gmail.com> + + * facemenu.el (list-colors-sort): Doc fix. + 2010-06-15 Bob Rogers <rogers-emacs@rgrjr.dyndns.org> (tiny change) * progmodes/sql.el (sql-connect-mysql): Fix typo.
--- a/lisp/facemenu.el Tue Jun 15 08:18:19 2010 +0000 +++ b/lisp/facemenu.el Tue Jun 15 22:55:36 2010 +0000 @@ -503,9 +503,9 @@ `nil' means default implementation-dependent order (defined in `x-colors'). `name' sorts by color name. `rgb' sorts by red, green, blue components. -`rgb-dist' sorts by the RGB distance to the specified color. +`(rgb-dist . COLOR)' sorts by the RGB distance to the specified color. `hsv' sorts by hue, saturation, value. -`hsv-dist' sorts by the HVS distance to the specified color +`(hsv-dist . COLOR)' sorts by the HSV distance to the specified color and excludes grayscale colors." :type '(choice (const :tag "Unsorted" nil) (const :tag "Color Name" name)
--- a/lisp/gnus/ChangeLog Tue Jun 15 08:18:19 2010 +0000 +++ b/lisp/gnus/ChangeLog Tue Jun 15 22:55:36 2010 +0000 @@ -1,3 +1,8 @@ +2010-06-15 Michael Albinus <michael.albinus@gmx.de> + + * auth-source.el (auth-source-pick): If choice does not contain a + questioned keyword, set the check to t. + 2010-06-12 Romain Francoise <romain@orebokech.com> * gnus-util.el (gnus-date-get-time): Move up before first use.
--- a/lisp/gnus/auth-source.el Tue Jun 15 08:18:19 2010 +0000 +++ b/lisp/gnus/auth-source.el Tue Jun 15 22:55:36 2010 +0000 @@ -229,7 +229,8 @@ ;; Check keywords. (dolist (k keys match) (let* ((v (plist-get spec k)) - (choicev (plist-get choice k))) + (choicev (if (plist-member choice k) + (plist-get choice k) t))) (setq match (and match (or