[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r106121: lisp/facemenu.el (list-color
From: |
Juanma Barranquero |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r106121: lisp/facemenu.el (list-colors-duplicates): Detect more duplicates on Windows. |
Date: |
Tue, 18 Oct 2011 16:31:27 +0200 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 106121
fixes bug(s): http://debbugs.gnu.org/9722
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Tue 2011-10-18 16:31:27 +0200
message:
lisp/facemenu.el (list-colors-duplicates): Detect more duplicates on Windows.
modified:
lisp/ChangeLog
lisp/facemenu.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-10-18 13:38:09 +0000
+++ b/lisp/ChangeLog 2011-10-18 14:31:27 +0000
@@ -1,3 +1,9 @@
+2011-10-18 Juanma Barranquero <address@hidden>
+
+ * facemenu.el (list-colors-duplicates): On Windows, detect more
+ duplicates by assuming that only colors matching "^System" are
+ special "system colors". (Bug#9722)
+
2011-10-18 Stefan Monnier <address@hidden>
* vc/log-edit.el (log-edit): Add "Author:" header to encourage people
@@ -26,7 +32,7 @@
* font-lock.el (font-lock-maximum-size): Mark as obsolete.
-2011-10-17 Ryan Barrett <address@hidden> (tiny change)
+2011-10-17 Ryan Barrett <address@hidden> (tiny change)
* dirtrack.el (dirtrack): Support shell buffers with path
prefixes, e.g. tramp-based remote shells. (Bug#9647)
@@ -465,8 +471,8 @@
* net/newst-reader.el (newsticker-html-renderer)
(newsticker-show-news): Automatically
- load html rendering package if newsticker-html-renderer is
- set. Fixes "Warning: defvar ignored because w3m-fill-column is
+ load html rendering package if newsticker-html-renderer is set.
+ Fixes "Warning: defvar ignored because w3m-fill-column is
let-bound" and the error "Symbol's value as variable is void:
w3m-fill-column".
=== modified file 'lisp/facemenu.el'
--- a/lisp/facemenu.el 2011-09-11 01:55:09 +0000
+++ b/lisp/facemenu.el 2011-10-18 14:31:27 +0000
@@ -639,8 +639,15 @@
(l list))
(while (cdr l)
(if (and (facemenu-color-equal (car (car l)) (car (car (cdr l))))
- (not (if (fboundp 'w32-default-color-map)
- (not (assoc (car (car l)) (w32-default-color-map))))))
+ ;; On MS-Windows, there are logical colors that might have
+ ;; the same value but different names and meanings. For
+ ;; example, `SystemMenuText' (the color w32 uses for the
+ ;; text in menu entries) and `SystemWindowText' (the default
+ ;; color w32 uses for the text in windows and dialogs) may
+ ;; be the same display color and be adjacent in the list.
+ ;; This makes them different to any other color. Bug#9722
+ (not (and (eq system-type 'windows-nt)
+ (string-match-p "^System" (car (car l))))))
(progn
(setcdr (car l) (cons (car (car (cdr l))) (cdr (car l))))
(setcdr l (cdr (cdr l))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r106121: lisp/facemenu.el (list-colors-duplicates): Detect more duplicates on Windows.,
Juanma Barranquero <=