summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Nicolaescu <dann@ics.uci.edu>2009-10-17 07:13:44 +0000
committerDan Nicolaescu <dann@ics.uci.edu>2009-10-17 07:13:44 +0000
commit4418646e99e56399b94a3dc8ad7c46f9921c0254 (patch)
tree2e6f2df0158c8b5727e2682129b14658783008d7
parent4062011e2f2b45c85cdafd27a30179d7e9f19778 (diff)
downloademacs-4418646e99e56399b94a3dc8ad7c46f9921c0254.tar.gz
* puresize.h (BASE_PURESIZE): Increase to 1310000.
* term/common-win.el (x-colors): Purecopy it.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/term/common-win.el5
-rw-r--r--src/ChangeLog4
-rw-r--r--src/puresize.h2
4 files changed, 12 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 434dcbaff89..32847c7059c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2009-10-17 Dan Nicolaescu <dann@ics.uci.edu>
+
+ * term/common-win.el (x-colors): Purecopy it.
+
2009-10-17 Stefan Monnier <monnier@iro.umontreal.ca>
* tar-mode.el (tar-data-swapped-p): Make the assertion a bit more
diff --git a/lisp/term/common-win.el b/lisp/term/common-win.el
index abf3afd1554..c6881395f7d 100644
--- a/lisp/term/common-win.el
+++ b/lisp/term/common-win.el
@@ -204,7 +204,8 @@ This function returns ARGS minus the arguments that have been processed."
;; of grey.
(defvar x-colors
- '("gray100" "gray99" "gray98" "gray97" "gray96" "gray95" "gray94" "gray93" "gray92"
+ (purecopy
+ '("gray100" "gray99" "gray98" "gray97" "gray96" "gray95" "gray94" "gray93" "gray92"
"gray91" "gray90" "gray89" "gray88" "gray87" "gray86" "gray85" "gray84" "gray83"
"gray82" "gray81" "gray80" "gray79" "gray78" "gray77" "gray76" "gray75" "gray74"
"gray73" "gray72" "gray71" "gray70" "gray69" "gray68" "gray67" "gray66" "gray65"
@@ -286,7 +287,7 @@ This function returns ARGS minus the arguments that have been processed."
"dark magenta" "dark violet" "medium blue" "blue" "deep sky blue"
"cyan" "medium spring green" "spring green" "green" "lawn green" "chartreuse"
"yellow" "gold" "orange" "dark orange" "orange red" "red" "white" "white smoke"
- "gainsboro" "light grey" "gray" "dark grey" "dim gray" "black" )
+ "gainsboro" "light grey" "gray" "dark grey" "dim gray" "black" ))
"List of basic colors available on color displays.
For X, the list comes from the `rgb.txt' file,v 10.41 94/02/20.
For Nextstep, this is a list of non-PANTONE colors returned by
diff --git a/src/ChangeLog b/src/ChangeLog
index 22452c7dcc0..7d72dc23038 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2009-10-17 Dan Nicolaescu <dann@ics.uci.edu>
+
+ * puresize.h (BASE_PURESIZE): Increase to 1310000.
+
2009-10-16 Juanma Barranquero <lekktu@gmail.com>
* buffer.c (Fbuffer_name): Doc fix. (Bug#4728)
diff --git a/src/puresize.h b/src/puresize.h
index 3d20d57584d..69555816b14 100644
--- a/src/puresize.h
+++ b/src/puresize.h
@@ -41,7 +41,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#endif
#ifndef BASE_PURESIZE
-#define BASE_PURESIZE (1290000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA)
+#define BASE_PURESIZE (1310000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA)
#endif
/* Increase BASE_PURESIZE by a ratio depending on the machine's word size. */