[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-commit] emacs/lisp/mh-e mh-e.el mh-compat.el ChangeLog
From: |
Bill Wohler |
Subject: |
[Emacs-commit] emacs/lisp/mh-e mh-e.el mh-compat.el ChangeLog |
Date: |
Mon, 27 Feb 2006 22:25:08 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Branch:
Changes by: Bill Wohler <address@hidden> 06/02/27 22:25:07
Modified files:
lisp/mh-e : mh-e.el mh-compat.el ChangeLog
Log message:
* mh-compat.el (mh-display-color-cells): Return 2 if
device-color-cells returns nil (closes SF #1436924).
* mh-e.el (mh-compiling-flag): Delete. No longer needed by
mh-display-color-cells.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/mh-e.el.diff?tr1=1.75&tr2=1.76&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/mh-compat.el.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/ChangeLog.diff?tr1=1.159&tr2=1.160&r1=text&r2=text
Patches:
Index: emacs/lisp/mh-e/ChangeLog
diff -u emacs/lisp/mh-e/ChangeLog:1.159 emacs/lisp/mh-e/ChangeLog:1.160
--- emacs/lisp/mh-e/ChangeLog:1.159 Tue Feb 21 14:43:56 2006
+++ emacs/lisp/mh-e/ChangeLog Mon Feb 27 22:25:07 2006
@@ -1,3 +1,11 @@
+2006-02-27 Bill Wohler <address@hidden>
+
+ * mh-compat.el (mh-display-color-cells): Return 2 if
+ device-color-cells returns nil (closes SF #1436924).
+
+ * mh-e.el (mh-compiling-flag): Delete. No longer needed by
+ mh-display-color-cells.
+
2006-02-21 Eric Ding <address@hidden>
* mh-e.el (mh-invisible-header-fields-internal): Added entry
Index: emacs/lisp/mh-e/mh-compat.el
diff -u emacs/lisp/mh-e/mh-compat.el:1.7 emacs/lisp/mh-e/mh-compat.el:1.8
--- emacs/lisp/mh-e/mh-compat.el:1.7 Thu Feb 16 02:14:40 2006
+++ emacs/lisp/mh-e/mh-compat.el Mon Feb 27 22:25:07 2006
@@ -79,11 +79,11 @@
(mh-defun-compat mh-display-color-cells display-color-cells (&optional display)
"Return the number of color cells supported by DISPLAY.
-This function is used by XEmacs to always return 0 when compiling
-to avoid compiling errors. Otherwise uses `device-color-cells'."
- (if mh-compiling-flag
- 0
- (device-color-cells display)))
+This function is used by XEmacs to return 2 when
+`device-color-cells' returns nil. This happens when compiling or
+running on a tty and causes errors since `display-color-cells' is
+expected to return an integer."
+ (or (device-color-cells display) 2))
(defmacro mh-display-completion-list (completions &optional common-substring)
"Display the list of COMPLETIONS.
Index: emacs/lisp/mh-e/mh-e.el
diff -u emacs/lisp/mh-e/mh-e.el:1.75 emacs/lisp/mh-e/mh-e.el:1.76
--- emacs/lisp/mh-e/mh-e.el:1.75 Tue Feb 21 14:43:13 2006
+++ emacs/lisp/mh-e/mh-e.el Mon Feb 27 22:25:07 2006
@@ -101,12 +101,7 @@
(eval-and-compile
(defvar mh-xemacs-flag (featurep 'xemacs)
- "Non-nil means the current Emacs is XEmacs.")
- (defvar mh-compiling-flag nil
- "Non-nil means we're compiling."))
-
-(eval-when (compile)
- (setq mh-compiling-flag t))
+ "Non-nil means the current Emacs is XEmacs."))
(mh-do-in-xemacs
(require 'mh-xemacs))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-commit] emacs/lisp/mh-e mh-e.el mh-compat.el ChangeLog,
Bill Wohler <=