Commit 6d8cf830 authored by Karoly Lorentey's avatar Karoly Lorentey
Browse files

Merged from miles@gnu.org--gnu-2005 (patch 593-595)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-593
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-594
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-595
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-425
parents 734b6791 6507c4c7
2005-10-11 Sven Joachim <svenjoac@gmx.de>
2005-10-13 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* toolbar/diropen.xpm, toolbar/diropen.pbm: New versions made from
Gnome file-manager.png. Suggested by
Joachim Nilsson <joachim.nilsson@vmlinux.org>.
* toolbar/README: Add diropen.xpm.
2005-10-13 Bill Wohler <wohler@newt.com>
* makefile.w32-in (MH_E_SRC): Rename from MH-E-SRC per NMAKE
restrictions. Suggested by David Robinow <drobinow@gmail.com>.
2005-10-13 Stefan Monnier <monnier@iro.umontreal.ca>
* progmodes/mixal-mode.el (mixal-operation-codes-alist):
Don't waste the byte-compiler's time on constant data.
2005-10-13 Kenichi Handa <handa@m17n.org>
* international/utf-8.el (utf-8-compose): Display an invalid UTF-8
byte with `escape-glyph' face.
* international/fontset.el (ccl-encode-unicode-font):
Lookup utf-subst-table-for-encode, not ucs-mule-cjk-to-unicode.
Handle the case that ucs-mule-to-mule-unicode translates a character to
ASCII (usually for IPA characters).
2005-10-12 Bill Wohler <wohler@newt.com>
* makefile.w32-in (MH-E-SRC): New. Used by mh-autoloads.
(mh-autoloads): New. Builds mh-e/mh-loaddefs.el. Rebuilds if any
files in MH-E-SRC have been updated.
(updates, compile, recompile, bootstrap): Depend on mh-autoloads.
2005-10-12 Stefan Monnier <monnier@iro.umontreal.ca>
* progmodes/mixal-mode.el (mixal-operation-codes): Remove.
(mixal-mode-syntax-table): Add \n as end-comment.
(mixal-operation-codes-alist): Immediately initialize to full value.
(mixal-add-operation-code): Remove.
(mixal-describe-operation-code): Make the arg non-optional.
Use the interactive spec instead.
Use mixal-operation-codes-alist rather than mixal-operation-codes.
(mixal-font-lock-keywords): Don't highlight comments here any more.
(mixal-font-lock-syntactic-keywords): New var.
(mixal-mode): Use it. Fix comment-start-skip.
2005-10-12 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* startup.el (command-line-x-option-alist): -nb => -nbi
2005-10-12 Kim F. Storm <storm@cua.dk>
* startup.el (fancy-splash-default-action): Discard mouse click in
the spash screen window, as it has no sensible meaning in the
next window to be selected. Fixes error reported by Jan D.
2005-10-12 Reiner Steib <Reiner.Steib@gmx.de>
* desktop.el (desktop-load-file): Do nothing when FUNCTION is nil.
2005-10-11 Stefan Monnier <monnier@iro.umontreal.ca>
* progmodes/mixal-mode.el: Sync with version in the GNU MDK project.
Try to fix up minor layout issues like indentation, line break, etc...
(mixal-mode-syntax-table): Don't try to specify comment syntax,
because it doesn't work.
(mixal-operation-codes): Add some more codes.
(mixal-font-lock-keywords): Process comments here.
(mixal-mode): mixasm no longer needs -g option.
2005-10-11 Sven Joachim <svenjoac@gmx.de> (tiny change)
* progmodes/sh-script.el (sh-tmp-file):
Use mktemp -t. Finish support for es and rc shells.
......@@ -798,7 +870,7 @@
color rxvt terminals by using the code xterm.el used to use before
2005-04-09 in order to match the colors used by rxvt.
2005-09-24 Emanuele Giaquinta <emanuele.giaquinta@gmail.com> (tiny change)
2005-09-24 Emanuele Giaquinta <emanuele.giaquinta@gmail.com> (tiny change)
* term/rxvt.el (rxvt-register-default-colors): Add support for 88
colors rxvt-unicode terminals by using the same code as xterm.el.
......@@ -5940,8 +6012,8 @@
* log-view.el (log-view-file, log-view-message): Remove "-face"
suffix from face names.
(log-view-file-face, log-view-message-face): New
backward-compatibility aliases for renamed faces.
(log-view-file-face, log-view-message-face):
New backward-compatibility aliases for renamed faces.
(log-view-file-face, log-view-message-face): Use renamed log-view
faces.
......@@ -5961,8 +6033,8 @@
(ruler-mode-margins-face, ruler-mode-fringes-face)
(ruler-mode-column-number-face, ruler-mode-fill-column-face)
(ruler-mode-comment-column-face, ruler-mode-goal-column-face)
(ruler-mode-tab-stop-face, ruler-mode-current-column-face): New
backward-compatibility aliases for renamed faces.
(ruler-mode-tab-stop-face, ruler-mode-current-column-face):
New backward-compatibility aliases for renamed faces.
(ruler-mode-pad, ruler-mode-margins, ruler-mode-fringes)
(ruler-mode-column-number, ruler-mode-fill-column)
(ruler-mode-comment-column, ruler-mode-goal-column)
......@@ -6085,8 +6157,7 @@
* comint.el (comint-check-proc, make-comint-in-buffer)
(comint-source-default): Doc fixes.
* term.el (term-send-string): Improve argument/docstring
consistency.
* term.el (term-send-string): Improve argument/docstring consistency.
2005-06-09 Luc Teirlinck <teirllm@auburn.edu>
......@@ -6203,12 +6274,11 @@
XEmacs code.
(flyspell-word): Minor simplification.
(flyspell-math-tex-command-p): Quieten the byte-compiler.
(flyspell-external-point-words): Remove unused vars `size' and
`start'.
(flyspell-do-correct): Rename from flyspell-xemacs-correct. Merge
the corresponding Emacs code.
(flyspell-correct-word, flyspell-xemacs-popup): Use
flyspell-do-correct.
(flyspell-external-point-words): Remove unused vars `size' and `start'.
(flyspell-do-correct): Rename from flyspell-xemacs-correct.
Merge the corresponding Emacs code.
(flyspell-correct-word, flyspell-xemacs-popup):
Use flyspell-do-correct.
* emacs-lisp/debug.el (debug): Don't bury the buffer unless it's in
a dedicated window.
......@@ -6247,8 +6317,7 @@
Add a completion-base-size-function property.
* simple.el (completion-setup-function): Look for
completion-base-size-function property of
minibuffer-completion-table.
completion-base-size-function property of minibuffer-completion-table.
* files.el (locate-file-completion): Doc fix.
......
......@@ -963,10 +963,11 @@ directory DIRNAME."
(defun desktop-load-file (function)
"Load the file where auto loaded FUNCTION is defined."
(let ((fcell (symbol-function function)))
(when (and (listp fcell)
(eq 'autoload (car fcell)))
(load (cadr fcell)))))
(when function
(let ((fcell (symbol-function function)))
(when (and (listp fcell)
(eq 'autoload (car fcell)))
(load (cadr fcell))))))
;; ----------------------------------------------------------------------------
;; Create a buffer, load its file, set its mode, ...;
......
......@@ -3666,23 +3666,23 @@ the variable `Info-file-list-for-emacs'."
((equal tag "Up") Info-up-link-keymap))))))
(when Info-use-header-line
(goto-char (point-min))
(let ((header-end (line-end-position))
header)
;; If we find neither Next: nor Prev: link, show the entire
;; node header. Otherwise, don't show the File: and Node:
;; parts, to avoid wasting precious space on information that
;; is available in the mode line.
(if (re-search-forward
"\\(next\\|up\\|prev[ious]*\\): "
header-end t)
(progn
(goto-char (match-beginning 1))
(setq header (buffer-substring (point) header-end)))
(if (re-search-forward "node:[ \t]*[^ \t]+[ \t]*" header-end t)
(setq header
(let* ((header-end (line-end-position))
(header
;; If we find neither Next: nor Prev: link, show the entire
;; node header. Otherwise, don't show the File: and Node:
;; parts, to avoid wasting precious space on information that
;; is available in the mode line.
(if (re-search-forward
"\\(next\\|up\\|prev[ious]*\\): "
header-end t)
(progn
(goto-char (match-beginning 1))
(buffer-substring (point) header-end))
(if (re-search-forward "node:[ \t]*[^ \t]+[ \t]*"
header-end t)
(concat "No next, prev or up links -- "
(buffer-substring (point) header-end)))
(setq header (buffer-substring (point) header-end))))
(buffer-substring (point) header-end))
(buffer-substring (point) header-end)))))
(put-text-property (point-min) (1+ (point-min))
'header-line
(replace-regexp-in-string
......@@ -3698,9 +3698,15 @@ the variable `Info-file-list-for-emacs'."
;; Fontify titles
(goto-char (point-min))
(when not-fontified-p
(while (re-search-forward "\n\\([^ \t\n].+\\)\n\\(\\*\\*+\\|==+\\|--+\\|\\.\\.+\\)$"
nil t)
(when (and font-lock-mode not-fontified-p)
(while (and (re-search-forward "\n\\([^ \t\n].+\\)\n\\(\\*\\*+\\|==+\\|--+\\|\\.\\.+\\)$"
nil t)
;; Only consider it as an underlined title if the ASCII
;; underline has the same size as the text. A typical
;; counter example is when a continuation "..." is alone
;; on a line.
(= (- (match-end 1) (match-beginning 1))
(- (match-end 2) (match-beginning 2))))
(let* ((c (preceding-char))
(face
(cond ((= c ?*) 'info-title-1)
......
......@@ -173,39 +173,42 @@
((if (r2 >= 0)
;; This is a 2D charset.
(r1 = ((r1 << 7) | r2)))
(lookup-character ucs-mule-cjk-to-unicode r0 r1)
(lookup-character utf-subst-table-for-encode r0 r1)
(if r7
;; We got it!
((r1 = (r0 >> 8))
(r2 = (r0 & #xFF)))
;; Look for a translation for non-ASCII chars.
((translate-character ucs-mule-to-mule-unicode r0 r1)
(if (r0 == ,(charset-id 'latin-iso8859-1))
((r2 = (r1 + 128))
(if (r0 == ,(charset-id 'ascii))
((r2 = r1)
(r1 = 0))
((r2 = (r1 & #x7F))
(r1 >>= 7)
(if (r0 == ,(charset-id 'mule-unicode-0100-24ff))
((r1 *= 96)
(r1 += r2)
(r1 += ,(- #x100 (* 32 96) 32))
(r1 >8= 0)
(r2 = r7))
(if (r0 == ,(charset-id 'mule-unicode-2500-33ff))
((r1 *= 96)
(r1 += r2)
(r1 += ,(- #x2500 (* 32 96) 32))
(r1 >8= 0)
(r2 = r7))
(if (r0 == ,(charset-id 'mule-unicode-e000-ffff))
((r1 *= 96)
(r1 += r2)
(r1 += ,(- #xe000 (* 32 96) 32))
(r1 >8= 0)
(r2 = r7))
;; No way, use the glyph for U+FFFD.
((r1 = #xFF)
(r2 = #xFD)))))))))))))
((if (r0 == ,(charset-id 'latin-iso8859-1))
((r2 = (r1 + 128))
(r1 = 0))
((r2 = (r1 & #x7F))
(r1 >>= 7)
(if (r0 == ,(charset-id 'mule-unicode-0100-24ff))
((r1 *= 96)
(r1 += r2)
(r1 += ,(- #x100 (* 32 96) 32))
(r1 >8= 0)
(r2 = r7))
(if (r0 == ,(charset-id 'mule-unicode-2500-33ff))
((r1 *= 96)
(r1 += r2)
(r1 += ,(- #x2500 (* 32 96) 32))
(r1 >8= 0)
(r2 = r7))
(if (r0 == ,(charset-id 'mule-unicode-e000-ffff))
((r1 *= 96)
(r1 += r2)
(r1 += ,(- #xe000 (* 32 96) 32))
(r1 >8= 0)
(r2 = r7))
;; No way, use the glyph for U+FFFD.
((r1 = #xFF)
(r2 = #xFD)))))))))))))))
"Encode characters for display with iso10646 font.
Translate through the translation-hash-table named
`ucs-mule-cjk-to-unicode' and the translation-table named
......
......@@ -934,7 +934,8 @@ Move point to the end of the sequence."
'help-echo 'utf-8-help-echo)
(if (= l 2)
(put-text-property (point) (min (point-max) (+ l (point)))
'display (format "\\%03o" ch))
'display (propertize (format "\\%03o" ch)
'face 'escape-glyph))
(compose-region (point) (+ l (point)) ?$,3u=(B))
(forward-char l))
(forward-char 1))))
......
......@@ -176,7 +176,7 @@ update-subdirs-SH: doit
$(srcdir)/update-subdirs $$file; \
done;
updates: update-subdirs autoloads finder-data custom-deps
updates: update-subdirs autoloads mh-autoloads finder-data custom-deps
# Update the AUTHORS file.
......@@ -207,7 +207,7 @@ TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2)
# compiled find the right files.
# Need separate version for sh and native cmd.exe
compile: subdirs.el compile-$(SHELLTYPE) doit
compile: subdirs.el mh-autoloads compile-$(SHELLTYPE) doit
compile-CMD:
# -for %%f in ($(lisp) $(WINS)) do for %%g in (%%f\*.elc) do @attrib -r %%g
......@@ -282,9 +282,47 @@ compile-after-backup: backup-compiled-files compile-always
# Note that this doesn't create .elc files. It only recompiles if an
# .elc is present.
recompile: doit
recompile: mh-autoloads doit
$(emacs) -f batch-byte-recompile-directory $(lisp)
# Update MH-E internal autoloads. These are not to be confused with
# the autoloads for the MH-E entry points, which are already in
# loaddefs.el.
MH_E_SRC = $(lisp)/mh-e/mh-acros.el $(lisp)/mh-e/mh-alias.el \
$(lisp)/mh-e/mh-comp.el $(lisp)/mh-e/mh-customize.el \
$(lisp)/mh-e/mh-e.el $(lisp)/mh-e/mh-funcs.el \
$(lisp)/mh-e/mh-mime.el $(lisp)/mh-e/mh-pick.el \
$(lisp)/mh-e/mh-print.el $(lisp)/mh-e/mh-inc.el \
$(lisp)/mh-e/mh-init.el $(lisp)/mh-e/mh-index.el \
$(lisp)/mh-e/mh-identity.el $(lisp)/mh-e/mh-junk.el \
$(lisp)/mh-e/mh-seq.el $(lisp)/mh-e/mh-speed.el \
$(lisp)/mh-e/mh-utils.el
mh-autoloads: $(lisp)/mh-e/mh-loaddefs.el
$(lisp)/mh-e/mh-loaddefs.el: $(MH_E_SRC)
echo ";;; mh-loaddefs.el --- automatically extracted autoloads" > $@
echo ";;" >> $@
echo ";;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc." >> $@
echo ";;; Author: Bill Wohler <wohler@newt.com>" >> $@
echo ";;; Keywords: mail" >> $@
echo ";;; Commentary:" >> $@
echo ";;; Change Log:" >> $@
echo ";;; Code:" >> $@
$(EMACS) $(EMACSOPT) \
-l autoload \
--eval "(setq generate-autoload-cookie \";;;###mh-autoload\")" \
--eval "(setq generated-autoload-file \"$(lisp)/mh-e/mh-loaddefs.el\")" \
--eval "(setq make-backup-files nil)" \
-f batch-update-autoloads $(lisp)/mh-e
echo " " >> $@
echo "(provide 'mh-loaddefs)" >> $@
echo ";;; Local Variables:" >> $@
echo ";;; version-control: never" >> $@
echo ";;; no-byte-compile: t" >> $@
echo ";;; no-update-autoloads: t" >> $@
echo ";;; End:" >> $@
echo ";;; mh-loaddefs.el ends here" >> $@
# Prepare a bootstrap in the lisp subdirectory.
#
# Build loaddefs.el to make sure it's up-to-date. If it's not, that
......@@ -316,7 +354,7 @@ bootstrap-clean-SH:
# When done, remove bootstrap-emacs from ../bin, so that
# it will not be mistaken for an installed binary.
bootstrap: update-subdirs autoloads compile finder-data custom-deps
bootstrap: update-subdirs autoloads mh-autoloads compile finder-data custom-deps
- $(DEL) $(EMACS)
#
......
mh-autoloads.el
mh-loaddefs.el
This diff is collapsed.
......@@ -128,7 +128,7 @@ This is normally copied from `default-directory' when Emacs starts.")
("-bg" 1 x-handle-switch background-color)
("-background" 1 x-handle-switch background-color)
("-ms" 1 x-handle-switch mouse-color)
("-nb" 0 x-handle-switch icon-type nil)
("-nbi" 0 x-handle-switch icon-type nil)
("-iconic" 0 x-handle-iconic)
("-xrm" 1 x-handle-xrm-switch)
("-cr" 1 x-handle-switch cursor-color)
......@@ -1232,7 +1232,13 @@ This is an internal function used to turn off the splash screen after
the user caused an input event by hitting a key or clicking with the
mouse."
(interactive)
(push last-command-event unread-command-events)
(if (and (consp last-command-event)
(eq (posn-window (event-start last-command-event))
(selected-window)))
;; This is a mouse-down event in the spash screen window.
;; Ignore it and consume the corresponding mouse-up event.
(read-event)
(push last-command-event unread-command-events))
(throw 'exit nil))
......
......@@ -7,4 +7,6 @@ The following icons are from GTK+ 2.x:
back_arrow.xpm and fwd_arrow.xpm are slightly modified undo and redo.
diropen.xpm is file-manager.png from Gnome hicolor theme.
They are not part of Emacs, but distributed and used by Emacs.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
/* XPM */
static char * diropen_xpm[] = {
"24 24 188 2",
" c None",
". c #000000",
"+ c #010100",
"@ c #B5B8A5",
"# c #E4E7D2",
"$ c #878A76",
"% c #33342B",
"& c #0B0B0B",
"* c #E2E5CF",
"= c #CFD4AF",
"- c #CED3AE",
"; c #B2B696",
"> c #2D2D25",
", c #23241D",
"' c #9D9F90",
") c #C6CAA6",
"! c #C4C9A5",
"~ c #C6CBA7",
"{ c #C7CCA8",
"] c #C9CEA9",
"^ c #555847",
"/ c #1A1B15",
"( c #20201A",
"_ c #D4D6C2",
": c #BEC2A0",
"< c #B3B896",
"[ c #B0B595",
"} c #B3B797",
"| c #B6BB99",
"1 c #BBC09E",
"2 c #BCC19F",
"3 c #81856C",
"4 c #3E3F32",
"5 c #010101",
"6 c #DADDC8",
"7 c #AFB494",
"8 c #AAAF8F",
"9 c #A3A789",
"0 c #A6AA8B",
"a c #A9AD8E",
"b c #A7AB8D",
"c c #A4A88A",
"d c #A1A588",
"e c #AAAD96",
"f c #B3B5A5",
"g c #B8BBAA",
"h c #BABCAB",
"i c #40413B",
"j c #CACDBB",
"k c #BABDA8",
"l c #0C0C09",
"m c #DDDFCB",
"n c #969B7E",
"o c #9DA286",
"p c #95987C",
"q c #96997E",
"r c #9A9D81",
"s c #999D80",
"t c #9DA184",
"u c #A5AA8B",
"v c #A4A98A",
"w c #A3A889",
"x c #A2A588",
"y c #33352B",
"z c #9B9E83",
"A c #898D74",
"B c #D8DBC9",
"C c #84866E",
"D c #7D8169",
"E c #151612",
"F c #D7DAC9",
"G c #797D67",
"H c #3D3F34",
"I c #E0E0D9",
"J c #EBEDDD",
"K c #E8EBD9",
"L c #D8DBCA",
"M c #1A1A18",
"N c #0A0A09",
"O c #6E7067",
"P c #8D8F84",
"Q c #4A4B45",
"R c #2C2D29",
"S c #4B4C46",
"T c #E7EAD8",
"U c #E3E6D4",
"V c #DEE1D0",
"W c #DADCCC",
"X c #DADCD1",
"Y c #2B2C28",
"Z c #D7DAC6",
"` c #6F735E",
" . c #0D0D0D",
".. c #F4F4EC",
"+. c #606251",
"@. c #92957B",
"#. c #4A4C3E",
"$. c #434438",
"%. c #CACFAB",
"&. c #C6CBA8",
"*. c #C2C6A4",
"=. c #ABB091",
"-. c #23251E",
";. c #494B3D",
">. c #DCDCD4",
",. c #EAECDD",
"'. c #CDD2AD",
"). c #20201B",
"!. c #1C1C17",
"~. c #A4A88B",
"{. c #414337",
"]. c #BABF9D",
"^. c #B5B999",
"/. c #81836C",
"(. c #070806",
"_. c #D5D8C4",
":. c #161616",
"<. c #F2F2EA",
"[. c #CACFAA",
"}. c #050504",
"|. c #3C3D32",
"1. c #C9CEAA",
"2. c #C8CDA9",
"3. c #BFC4A2",
"4. c #3E4035",
"5. c #BCC09F",
"6. c #B6BB9A",
"7. c #B0B494",
"8. c #9DA185",
"9. c #535445",
"0. c #B6B8A7",
"a. c #747470",
"b. c #ECECE2",
"c. c #C3C8A5",
"d. c #C2C7A4",
"e. c #393B30",
"f. c #BFC4A1",
"g. c #BDC2A0",
"h. c #C0C5A2",
"i. c #3A3B31",
"j. c #A9AD8F",
"k. c #A3A78A",
"l. c #80836D",
"m. c #020201",
"n. c #A6A998",
"o. c #B8BC9B",
"p. c #1B1C17",
"q. c #181814",
"r. c #AFB394",
"s. c #ACB091",
"t. c #878A72",
"u. c #9B9F83",
"v. c #9A9D82",
"w. c #8A8D75",
"x. c #4F5243",
"y. c #070705",
"z. c #9E9F91",
"A. c #E5E6DA",
"B. c #ADB192",
"C. c #A6AA8C",
"D. c #A5A98C",
"E. c #4B4D3F",
"F. c #70735F",
"G. c #9FA286",
"H. c #999D81",
"I. c #35362D",
"J. c #2D2E26",
"K. c #8A8D74",
"L. c #71735F",
"M. c #080908",
"N. c #E3E5D9",
"O. c #C0C3AF",
"P. c #94987C",
"Q. c #8F9379",
"R. c #8B8F75",
"S. c #8A8E74",
"T. c #888C73",
"U. c #7D816A",
"V. c #0E0F0C",
"W. c #3E4034",
"X. c #4E5042",
"Y. c #282922",
"Z. c #121310",
"`. c #24251F",
" + c #71745F",
".+ c #6A6D59",
"++ c #434538",
"@+ c #080907",
" ",
" ",
" ",
" . . . . . . . ",
" + @ # # # # # $ % ",
" & * = = = - - ; > ",
", ' * ) ! ~ { ] ] ^ / . . ",
"( _ : < [ } | 1 2 3 4 5 . . . . . . . ",
", 6 7 8 9 0 8 a b c d e f g h . i j k . ",
"l m n o p q r s q t u v w x 9 . y z A . ",
". B C D E . . . . . . . . . . . . . . . 5 5 ",
". F G H I J K K L M N O P Q R . S T U V W X Y ",
". Z ` ...= = = +.. @.= = = #.. $.%.&.*.1 =.-. ",
". Z ;.>.,.'.- - ).!.'.'.'.'.~.. {.&.*.].^./.(. ",
". _.:.<.%.[.%.[.}.|.1.{ 2.2.3.. 4.5.6.7.8.9.l ",
". 0.a.b.c.d.d.*.}.e.f.g.h.g.} . i.[ j.k.l.m. ",
". n.>.o.o.^.} } p.q.r.r.r.s.t.. % u.v.w.x.y. ",
". z.A.B.j.C.D.k.E.. F.G.u.H.I.. J.K.K.L.M. ",
". N.O.P.Q.R.S.T.U.V.}.W.X.Y.Z.. `. +.+++@+ ",
" . . . . . . . . . . . . . . . . . . }. ",
" ",
" ",
" ",
" "};
"19 24 17 1",
" c None",
". c #000100",
"+ c #C6C9A6",
"@ c #D0D3AF",
"# c #93997C",
"$ c #E6E7D0",
"% c #BEC19E",
"& c #B4B895",
"* c #A7AA88",
"= c #6B6D59",
"- c #4A4E40",