From 71630f33d0acae88f1e551a8e78edc1c35ce04e1 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Thu, 9 Mar 2006 12:20:57 +0000 Subject: [PATCH 01/76] (DECODE_EMACS_MULE_COMPOSITION_CHAR): Fix decoding ASCII component of a composition. --- src/coding.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coding.c b/src/coding.c index b96ec82fc16..105d4038b1f 100644 --- a/src/coding.c +++ b/src/coding.c @@ -735,7 +735,7 @@ detect_coding_emacs_mule (src, src_end, multibytep) c = -1; \ else \ { \ - c -= 0xA0; \ + c -= 0x80; \ *p++ = c; \ } \ } \ From 53a5eba91d68e7465f1f9c9998eeb077b03b67d6 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Thu, 9 Mar 2006 12:43:08 +0000 Subject: [PATCH 02/76] *** empty log message *** --- src/ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index db10f46024b..16f5eff11e6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2006-03-09 Kenichi Handa + + * coding.c (DECODE_EMACS_MULE_COMPOSITION_CHAR): Fix decoding + ASCII component of a composition. + 2006-03-08 Luc Teirlinck * window.c: Declare preserve_y as a static global variable. From f945af424da538bc7363ac918122ac351b5b664b Mon Sep 17 00:00:00 2001 From: Luc Teirlinck Date: Thu, 9 Mar 2006 15:43:31 +0000 Subject: [PATCH 03/76] *** empty log message *** --- src/ChangeLog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 16f5eff11e6..6cf09be70fd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -8,7 +8,7 @@ * window.c: Declare preserve_y as a static global variable. (window_scroll_pixel_based): No longer declare preserve_y; it is global now. - (syms_of_window): set preserve_y to -1. + (syms_of_window): Set preserve_y to -1. 2006-03-08 YAMAMOTO Mitsuharu @@ -43,7 +43,7 @@ (mac_handle_command_event, mac_handle_window_event) (mac_handle_mouse_event): Check error code of GetEventParameter. (convert_fn_keycode) [MAC_OSX]: Likewise. - + 2006-03-05 Andreas Schwab * xselect.c (x_catch_errors_unwind): Fix missing return value. From 3f9c65caa44929c85caa57e1470667f1730a0f45 Mon Sep 17 00:00:00 2001 From: Reiner Steib Date: Thu, 9 Mar 2006 16:51:56 +0000 Subject: [PATCH 04/76] =?UTF-8?q?Replace=20"Schreiben"=20by=20"Dr=EF=BF=BD?= =?UTF-8?q?=20where=20appropriate.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- etc/ChangeLog | 4 ++++ etc/TUTORIAL.de | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/etc/ChangeLog b/etc/ChangeLog index 22558d050e8..4e45799c5fc 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,7 @@ +2006-03-09 Reiner Steib + + * TUTORIAL.de: Replace "Schreiben" by "Dr,A|(Bcken" where appropriate. + 2006-03-07 Carsten Dominik * orgcard.tex: Version number change only. diff --git a/etc/TUTORIAL.de b/etc/TUTORIAL.de index a571b15c545..4ccdd88523c 100644 --- a/etc/TUTORIAL.de +++ b/etc/TUTORIAL.de @@ -1090,9 +1090,9 @@ als ein Fenster zur gleichen Zeit auf dem Bildschirm darzustellen. >> Bewegen Sie den Cursor zu dieser Zeile und geben Sie C-u 0 C-l ein. ->> Schreiben Sie nun C-x 2, um den Bildschirm in zwei Fenster zu - teilen. Beide Fenster zeigen diese Einführung an, und der Cursor - bleibt im oberen. +>> Drücken Sie nun C-x 2, um den Bildschirm in zwei Fenster zu teilen. + Beide Fenster zeigen diese Einführung an, und der Cursor bleibt im + oberen. >> Verwenden Sie C-M-v, um im unteren Fenster zu blättern (Sie können statt dessen auch ESC C-v verwenden, falls Sie keine META-Taste @@ -1355,8 +1355,8 @@ Emacs-Befehle ist, haben Sie einen wirklichen Grund, sich in diesem Fall beim Systemadministrator zu beschweren. Alternativen zu C-h sind die F1-Taste und der lange Befehl M-x help .) -Die elementarste Hilfestellung gibt C-h c. Schreiben Sie C-h, dann -das Zeichen c, und dann einen Befehl: Emacs zeigt daraufhin eine kurze +Die elementarste Hilfestellung gibt C-h c. Drücken Sie C-h, dann das +Zeichen c, und dann einen Befehl: Emacs zeigt daraufhin eine kurze Beschreibung des Befehls an. >> Geben Sie C-h c C-p ein. From 349a450079672dcf0cb5bffb40feb388fa6879c9 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 9 Mar 2006 23:06:58 +0000 Subject: [PATCH 05/76] (USE_POSIX_MEMALIGN): New macro. (ABLOCKS_BASE, lisp_align_malloc, lisp_align_free): Use it. --- src/ChangeLog | 22 +++++++++++++--------- src/alloc.c | 10 +++++++--- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 6cf09be70fd..0a9d21b0c9b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2006-03-09 Stefan Monnier + + * alloc.c (USE_POSIX_MEMALIGN): New macro. + (ABLOCKS_BASE, lisp_align_malloc, lisp_align_free): Use it. + 2006-03-09 Kenichi Handa * coding.c (DECODE_EMACS_MULE_COMPOSITION_CHAR): Fix decoding @@ -28,10 +33,10 @@ (MAC_AQUA_SMALL_VERTICAL_SCROLL_BAR_WIDTH): New defines. * macfns.c (x_default_scroll_bar_color_parameter) - (x_set_scroll_bar_foreground, x_set_scroll_bar_background): Remove - unnecessary prototypes. - (x_set_scroll_bar_default_width): Use - MAC_AQUA_VERTICAL_SCROLL_BAR_WIDTH. + (x_set_scroll_bar_foreground, x_set_scroll_bar_background): + Remove unnecessary prototypes. + (x_set_scroll_bar_default_width): + Use MAC_AQUA_VERTICAL_SCROLL_BAR_WIDTH. (mac_set_scroll_bar_width): New function. (mac_frame_parm_handlers): Set it as handler for scroll-bar-width. @@ -57,9 +62,9 @@ lines, by distributing the rows evenly over the tool-bar screen area. (Vtool_bar_border): New variable. (syms_of_xdisp): DEFVAR_LISP it. - (display_tool_bar_line): Add HEIGHT arg for desired row height. Make - tool-bar row the desired height. Use default face for border below - tool-bar. + (display_tool_bar_line): Add HEIGHT arg for desired row height. + Make tool-bar row the desired height. Use default face for border + below tool-bar. (tool_bar_lines_needed): Add N_ROWS arg. Use it to return number of actual tool-bar rows. (redisplay_tool_bar): Calculate f->n_tool_bar_rows initially. @@ -86,8 +91,7 @@ 2006-02-26 Chong Yidong - * xterm.h, xterm.c (x_uncatch_errors): Delete unneccessary - argument. + * xterm.h, xterm.c (x_uncatch_errors): Delete unneccessary argument. * xterm.c: (x_load_font, x_term_init, XTmouse_position) (handle_one_xevent, x_connection_closed, x_list_fonts): No arg for diff --git a/src/alloc.c b/src/alloc.c index bb5f550d175..ee84bd2fb29 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -883,6 +883,10 @@ lisp_free (block) /* The entry point is lisp_align_malloc which returns blocks of at most */ /* BLOCK_BYTES and guarantees they are aligned on a BLOCK_ALIGN boundary. */ +/* Use posix_memalloc if the system has it and we're using the system's + malloc (because our gmalloc.c routines don't have posix_memalign although + its memalloc could be used). */ +#define USE_POSIX_MEMALIGN (HAVE_POSIX_MEMALIGN && SYSTEM_MALLOC) /* BLOCK_ALIGN has to be a power of 2. */ #define BLOCK_ALIGN (1 << 10) @@ -948,7 +952,7 @@ struct ablocks #define ABLOCKS_BUSY(abase) ((abase)->blocks[0].abase) /* Pointer to the (not necessarily aligned) malloc block. */ -#ifdef HAVE_POSIX_MEMALIGN +#ifdef USE_POSIX_MEMALIGN #define ABLOCKS_BASE(abase) (abase) #else #define ABLOCKS_BASE(abase) \ @@ -989,7 +993,7 @@ lisp_align_malloc (nbytes, type) mallopt (M_MMAP_MAX, 0); #endif -#ifdef HAVE_POSIX_MEMALIGN +#ifdef USE_POSIX_MEMALIGN { int err = posix_memalign (&base, BLOCK_ALIGN, ABLOCKS_BYTES); if (err) @@ -1105,7 +1109,7 @@ lisp_align_free (block) } eassert ((aligned & 1) == aligned); eassert (i == (aligned ? ABLOCKS_SIZE : ABLOCKS_SIZE - 1)); -#ifdef HAVE_POSIX_MEMALIGN +#ifdef USE_POSIX_MEMALIGN eassert ((unsigned long)ABLOCKS_BASE (abase) % BLOCK_ALIGN == 0); #endif free (ABLOCKS_BASE (abase)); From 05c31df2ea7a76ee63b254b4efbe8cec5696972e Mon Sep 17 00:00:00 2001 From: Nick Roberts Date: Fri, 10 Mar 2006 02:35:22 +0000 Subject: [PATCH 06/76] *** empty log message *** --- lisp/ChangeLog | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 647122caada..31df6e9f72c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,15 @@ +2006-03-10 Nick Roberts + + * progmodes/gdb-ui.el (gdba): Don't call gdb-init-1 explicitly as + it gets called in gdb-prompt anyway. + (gdb-use-separate-io-buffer): Only restore window arrangement for + gdb-many-windows. + (gdb-enqueue-input): Make it harder to send GDB input when program + is running. + (gdb-buffer-list): New variable. + (gdb-remove-mouse-face): New function. + (gdb-starting): Use it when GDB input won't get sent. + 2006-03-08 Juanma Barranquero * help.el (view-lossage): Remove trailing whitespace before From 4a7d75e8b27895a1239a01b13acd9ff827eab992 Mon Sep 17 00:00:00 2001 From: Nick Roberts Date: Fri, 10 Mar 2006 02:40:31 +0000 Subject: [PATCH 07/76] (gdba): Don't call gdb-init-1 explicitly as it gets called in gdb-prompt anyway. (gdb-use-separate-io-buffer): Only restore window arrangement for gdb-many-windows. (gdb-enqueue-input): Make it harder to send GDB input when program is running. (gdb-buffer-list): New variable. (gdb-remove-mouse-face): New function. (gdb-starting): Use it when GDB input won't get sent. --- lisp/progmodes/gdb-ui.el | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el index 4340892a9cc..a252884e448 100644 --- a/lisp/progmodes/gdb-ui.el +++ b/lisp/progmodes/gdb-ui.el @@ -257,8 +257,7 @@ detailed description of this mode. (interactive (list (gud-query-cmdline 'gdba))) ;; ;; Let's start with a basic gud-gdb buffer and then modify it a bit. - (gdb command-line) - (gdb-init-1)) + (gdb command-line)) (defcustom gdb-debug-ring-max 128 "Maximum size of `gdb-debug-ring'." @@ -322,7 +321,7 @@ With arg, use separate IO iff arg is positive." (buffer-name gud-comint-buffer)) (condition-case nil (if gdb-use-separate-io-buffer - (gdb-restore-windows) + (if gdb-many-windows (gdb-restore-windows)) (kill-buffer (gdb-inferior-io-name))) (error nil)))) @@ -1037,7 +1036,7 @@ This filter may simply queue input for a later time." ;; is a query, or other non-top-level prompt. (defun gdb-enqueue-input (item) - (if gdb-prompting + (if (and gdb-prompting (not gud-running)) (progn (gdb-send-item item) (setq gdb-prompting nil)) @@ -1192,6 +1191,7 @@ not GDB." ((eq sink 'user) (progn (setq gud-running t) + (gdb-remove-mouse-face) (if gdb-use-separate-io-buffer (setq gdb-output-sink 'inferior)))) (t @@ -1299,6 +1299,18 @@ happens to be appropriate." (gdb-resync) (error "Phase error in gdb-post-prompt (got %s)" sink))))) +(defconst gdb-buffer-list +'(gdb-stack-buffer gdb-locals-buffer gdb-registers-buffer gdb-threads-buffer)) + +(defun gdb-remove-mouse-face () + (dolist (buffertype gdb-buffer-list) + (let ((buffer (gdb-get-buffer buffertype))) + (if buffer + (with-current-buffer buffer + (let ((inhibit-read-only t)) + (remove-text-properties + (point-min) (point-max) '(mouse-face)))))))) + ;; GUD displays the selected GDB frame. This might might not be the current ;; GDB frame (after up, down etc). If no GDB frame is visible but the last ;; visited breakpoint is, use that window. From e678b91b703631bb43e3a6ce262d72d1106d956a Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 10 Mar 2006 08:04:11 +0000 Subject: [PATCH 08/76] (calendar-holidays): Doc fix. --- lisp/calendar/calendar.el | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el index 9516e02c5e1..734a9b27e1f 100644 --- a/lisp/calendar/calendar.el +++ b/lisp/calendar/calendar.el @@ -1192,11 +1192,15 @@ of `general-holidays', `local-holidays' `christian-holidays', `oriental-holidays', or `solar-holidays' to nil in your .emacs file, you can eliminate unwanted categories of holidays. -Note that these variables are only used to initialize the default -value of `calendar-holidays'. In other words, they only have an -effect on the displayed holidays if set before the calendar is -loaded. After the calendar has been loaded, you must customize -`calendar-holidays' directly. +The aforementioned variables control the holiday choices offered +by the function `list-holidays' when it is called interactively. + +They are also used to initialize the default value of +`calendar-holidays', which is the default list of holidays used +by the function `list-holidays' in the non-interactive case. +Note that these variables have no effect on `calendar-holidays' +after it has been set (e.g. after the calendar is loaded). In +that case, customize `calendar-holidays' directly. The intention is that (in the US) `local-holidays' be set in site-init.el and `other-holidays' be set by the user. From cae09deae8d746bb05749be6400402d089b5c30c Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 10 Mar 2006 08:04:27 +0000 Subject: [PATCH 09/76] (list-holidays): Doc fix. --- lisp/calendar/holidays.el | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el index c9a1a0f17e5..1aaf226d21d 100644 --- a/lisp/calendar/holidays.el +++ b/lisp/calendar/holidays.el @@ -119,8 +119,12 @@ This function is suitable for execution in a .emacs file." (defun list-holidays (y1 y2 &optional l label) "Display holidays for years Y1 to Y2 (inclusive). -The optional list of holidays L defaults to `calendar-holidays'. See the -documentation for that variable for a description of holiday lists. +The optional list of holidays L defaults to `calendar-holidays'. +When called interactively, this command offers a choice of +holidays, based on the variables `solar-holidays' etc. See the +documentation of `calendar-holidays' for a list of the variables +that control the choices, as well as a description of the format +of a holiday list. The optional LABEL is used to label the buffer created." (interactive From 5a473319ae57f548e61b403c2e696a84e2555659 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 10 Mar 2006 08:06:45 +0000 Subject: [PATCH 10/76] *** empty log message *** --- etc/TODO | 7 ++++++- lisp/ChangeLog | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/etc/TODO b/etc/TODO index 9b7a0b0a1b0..34dec4f1de2 100644 --- a/etc/TODO +++ b/etc/TODO @@ -437,11 +437,16 @@ but which can also be used as a modifier). e.g auto-mode-alist, the right face. [nickrob@snap.net.nz has a patch for this for inclusion after 22.1]. +** Possibly make `list-holidays' eval items in the calendar-holidays variable. + See thread + . + [rgm@gnu.org will look at this after 22.1] + * Internal changes ** Replace gmalloc.c with the modified Doug Lea code from the current GNU libc so that the special mmapping of buffers can be removed -- - that apparently loses under Solaris, at least. [fx has mostly done + that apparently loses under Solaris, at least. [fx has mostly done this.] ** Rewrite make-docfile to be clean and maintainable. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 31df6e9f72c..8ce3d8af6c5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2006-03-10 Glenn Morris + + * calendar/calendar.el (calendar-holidays): Doc fix. + * calendar/holidays.el (list-holidays): Doc fix. + 2006-03-10 Nick Roberts * progmodes/gdb-ui.el (gdba): Don't call gdb-init-1 explicitly as From 68f632a816cd33ea82266d8b83ba74bac71a1ea8 Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Fri, 10 Mar 2006 08:08:55 +0000 Subject: [PATCH 11/76] *** empty log message *** --- src/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 0a9d21b0c9b..082be6c8cf5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2006-03-10 Kim F. Storm + + * alloc.c (USE_POSIX_MEMALIGN): Fix last change. + 2006-03-09 Stefan Monnier * alloc.c (USE_POSIX_MEMALIGN): New macro. From b4181b015a221c98cbd2b973a9db7b04e7242e29 Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Fri, 10 Mar 2006 08:10:24 +0000 Subject: [PATCH 12/76] (USE_POSIX_MEMALIGN): Fix last change. --- src/alloc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/alloc.c b/src/alloc.c index ee84bd2fb29..e3b65c1a4f4 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -886,7 +886,9 @@ lisp_free (block) /* Use posix_memalloc if the system has it and we're using the system's malloc (because our gmalloc.c routines don't have posix_memalign although its memalloc could be used). */ -#define USE_POSIX_MEMALIGN (HAVE_POSIX_MEMALIGN && SYSTEM_MALLOC) +#if defined (HAVE_POSIX_MEMALIGN) && defined (SYSTEM_MALLOC) +#define USE_POSIX_MEMALIGN 1 +#endif /* BLOCK_ALIGN has to be a power of 2. */ #define BLOCK_ALIGN (1 << 10) From 8775bef73be6f975fde0fc4099804f9bf72892b8 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 10 Mar 2006 08:10:33 +0000 Subject: [PATCH 13/76] (calendar-holidays): Make previous doc-fix less passive. --- lisp/calendar/calendar.el | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el index 734a9b27e1f..1383b8bac16 100644 --- a/lisp/calendar/calendar.el +++ b/lisp/calendar/calendar.el @@ -1195,12 +1195,12 @@ you can eliminate unwanted categories of holidays. The aforementioned variables control the holiday choices offered by the function `list-holidays' when it is called interactively. -They are also used to initialize the default value of -`calendar-holidays', which is the default list of holidays used -by the function `list-holidays' in the non-interactive case. -Note that these variables have no effect on `calendar-holidays' -after it has been set (e.g. after the calendar is loaded). In -that case, customize `calendar-holidays' directly. +They also initialize the default value of `calendar-holidays', +which is the default list of holidays used by the function +`list-holidays' in the non-interactive case. Note that these +variables have no effect on `calendar-holidays' after it has been +set (e.g. after the calendar is loaded). In that case, customize +`calendar-holidays' directly. The intention is that (in the US) `local-holidays' be set in site-init.el and `other-holidays' be set by the user. From 0c32f8c691129965c0d67c2f1cef9cd75e9544bf Mon Sep 17 00:00:00 2001 From: Bill Wohler Date: Fri, 10 Mar 2006 16:56:16 +0000 Subject: [PATCH 14/76] (mh-profile-component): Drop `s' from mhparam -components for Mailutils compatibility (closes SF #1446985). --- lisp/mh-e/ChangeLog | 5 +++++ lisp/mh-e/mh-e.el | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index 0a097cb2f02..35a1b1495f1 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -1,3 +1,8 @@ +2006-03-10 Bill Wohler + + * mh-e.el (mh-profile-component): Drop `s' from mhparam + -components for Mailutils compatibility (closes SF #1446985). + 2006-03-06 Bill Wohler * mh-e.el (Version, mh-version): Add +cvs to version. diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el index 64b625f3ab6..0b8961470a7 100644 --- a/lisp/mh-e/mh-e.el +++ b/lisp/mh-e/mh-e.el @@ -808,7 +808,9 @@ Currently known variants are 'MH, 'nmh, and 'mu-mh." (defun mh-profile-component (component) "Return COMPONENT value from mhparam, or nil if unset." (save-excursion - (mh-exec-cmd-quiet nil "mhparam" "-components" component) + ;; MH and nmh use -components, Mailutils uses -component. Since MH + ;; and nmh work with an unambiguous prefix, the `s' is dropped here. + (mh-exec-cmd-quiet nil "mhparam" "-component" component) (mh-profile-component-value component))) (defun mh-profile-component-value (component) From 3cf61a4fd62cc0188122c5842acb1c48a585e6a6 Mon Sep 17 00:00:00 2001 From: Nick Roberts Date: Fri, 10 Mar 2006 19:59:19 +0000 Subject: [PATCH 15/76] *** empty log message *** --- lisp/ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8ce3d8af6c5..000011e2de3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2006-03-11 Nick Roberts + + * progmodes/gdb-ui.el (gdb-remove-text-properties): Rename from + gdb-remove-mouse-face and remove help-echo too. + (gdb-enqueue-input): Correct conditional clause. + 2006-03-10 Glenn Morris * calendar/calendar.el (calendar-holidays): Doc fix. From a2c7d24fafbfb091fc9f74afa1e1c77d51047768 Mon Sep 17 00:00:00 2001 From: Nick Roberts Date: Fri, 10 Mar 2006 20:06:33 +0000 Subject: [PATCH 16/76] (gdb-remove-text-properties): Rename from gdb-remove-mouse-face and remove help-echo too. (gdb-enqueue-input): Correct conditional clause. --- lisp/progmodes/gdb-ui.el | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el index a252884e448..e3e2e2f23c1 100644 --- a/lisp/progmodes/gdb-ui.el +++ b/lisp/progmodes/gdb-ui.el @@ -1036,11 +1036,12 @@ This filter may simply queue input for a later time." ;; is a query, or other non-top-level prompt. (defun gdb-enqueue-input (item) - (if (and gdb-prompting (not gud-running)) - (progn - (gdb-send-item item) + (if (not gud-running) + (if gdb-prompting + (progn + (gdb-send-item item) (setq gdb-prompting nil)) - (push item gdb-input-queue))) + (push item gdb-input-queue)))) (defun gdb-dequeue-input () (let ((queue gdb-input-queue)) @@ -1191,7 +1192,7 @@ not GDB." ((eq sink 'user) (progn (setq gud-running t) - (gdb-remove-mouse-face) + (gdb-remove-text-properties) (if gdb-use-separate-io-buffer (setq gdb-output-sink 'inferior)))) (t @@ -1302,14 +1303,14 @@ happens to be appropriate." (defconst gdb-buffer-list '(gdb-stack-buffer gdb-locals-buffer gdb-registers-buffer gdb-threads-buffer)) -(defun gdb-remove-mouse-face () +(defun gdb-remove-text-properties () (dolist (buffertype gdb-buffer-list) (let ((buffer (gdb-get-buffer buffertype))) (if buffer (with-current-buffer buffer (let ((inhibit-read-only t)) (remove-text-properties - (point-min) (point-max) '(mouse-face)))))))) + (point-min) (point-max) '(mouse-face nil help-echo nil)))))))) ;; GUD displays the selected GDB frame. This might might not be the current ;; GDB frame (after up, down etc). If no GDB frame is visible but the last From 7c565097d15d61cef15fe7474da44a2bc9e87725 Mon Sep 17 00:00:00 2001 From: Bill Wohler Date: Fri, 10 Mar 2006 22:52:26 +0000 Subject: [PATCH 17/76] (image-load-path-for-library): Merge at least three functions from Gnus and MH-E into this one function that can now be shared. --- lisp/ChangeLog | 6 ++++ lisp/image.el | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 000011e2de3..7892a9b6d22 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2006-03-10 Bill Wohler + + * image.el (image-load-path-for-library): Merge at least three + functions from Gnus and MH-E into this one function that can now + be shared. + 2006-03-11 Nick Roberts * progmodes/gdb-ui.el (gdb-remove-text-properties): Rename from diff --git a/lisp/image.el b/lisp/image.el index 316896cabce..4acff8d251b 100644 --- a/lisp/image.el +++ b/lisp/image.el @@ -77,6 +77,80 @@ value is used as a list of directories to search.") (list (file-name-as-directory (expand-file-name "images" data-directory)) 'data-directory 'load-path))) +(defun image-load-path-for-library (library image &optional path) + "Return a suitable search path for images relative to LIBRARY. + +Images for LIBRARY are searched for in \"../../etc/images\" and +\"../etc/images\" relative to the files in \"lisp/LIBRARY\" as +well as in `image-load-path' and `load-path'. + +This function returns the value of `load-path' augmented with the +path to IMAGE. If PATH is given, it is used instead of +`load-path'. + +Here is an example that uses a common idiom to provide +compatibility with versions of Emacs that lack the variable +`image-load-path': + + (let ((load-path + (image-load-path-for-library \"mh-e\" \"mh-logo.xpm\")) + (image-load-path + (image-load-path-for-library \"mh-e\" \"mh-logo.xpm\" 'image-load-path))) + (mh-tool-bar-folder-buttons-init))" + (unless library (error "No library specified")) + (unless image (error "No image specified")) + (let ((image-directory)) + (cond + ;; Try relative setting. + ((let (library-name d1ei d2ei) + ;; First, find library in the load-path. + (setq library-name (locate-library library)) + (if (not library-name) + (error "Cannot find library %s in load-path" library)) + ;; And then set image-directory relative to that. + (setq + ;; Go down 2 levels. + d2ei (expand-file-name + (concat (file-name-directory library-name) "../../etc/images")) + ;; Go down 1 level. + d1ei (expand-file-name + (concat (file-name-directory library-name) "../etc/images"))) + (setq image-directory + ;; Set it to nil if image is not found. + (cond ((file-exists-p (expand-file-name image d2ei)) d2ei) + ((file-exists-p (expand-file-name image d1ei)) d1ei))))) + ;; Check for images in image-load-path or load-path. + ((let ((img image) + (dir (or + ;; Images in image-load-path. + (image-search-load-path image) + ;; Images in load-path. + (locate-library image))) + parent) + ;; Since the image might be in a nested directory (for + ;; example, mail/attach.pbm), adjust `image-directory' + ;; accordingly. + (and dir + (setq dir (file-name-directory dir)) + (progn + (while (setq parent (file-name-directory img)) + (setq img (directory-file-name parent) + dir (expand-file-name "../" dir))) + (setq image-directory dir))))) + (t + (error "Could not find image %s for library %s" image library))) + + ;; Return augmented `image-load-path' or `load-path'. + (cond ((and path (symbolp path)) + (nconc (list image-directory) + (delete image-directory + (if (boundp path) + (copy-sequence (symbol-value path)) + nil)))) + (t + (nconc (list image-directory) + (delete image-directory (copy-sequence load-path))))))) + (defun image-jpeg-p (data) "Value is non-nil if DATA, a string, consists of JFIF image data. We accept the tag Exif because that is the same format." From af467e285ed142761527612f2c40fd6dfd02d345 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Fri, 10 Mar 2006 23:22:30 +0000 Subject: [PATCH 18/76] * files.el (hack-local-variables-confirm): Don't prompt for ! if enable-local-variables is set to always query, or there is no savable variable. --- lisp/ChangeLog | 6 ++++++ lisp/files.el | 33 +++++++++++++++++++++------------ 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7892a9b6d22..96aae2ec1c4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2006-03-10 Chong Yidong + + * files.el (hack-local-variables-confirm): Don't prompt for ! if + enable-local-variables is set to always query, or there is no + savable variable. + 2006-03-10 Bill Wohler * image.el (image-load-path-for-library): Merge at least three diff --git a/lisp/files.el b/lisp/files.el index fc6267fd002..91a434dd33f 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -2349,6 +2349,7 @@ asking you for confirmation." (let ((name (if buffer-file-name (file-name-nondirectory buffer-file-name) (concat "buffer " (buffer-name)))) + (offer-save (and (eq enable-local-variables t) unsafe-vars)) prompt char) (save-window-excursion (let ((buf (get-buffer-create "*Local Variables*"))) @@ -2367,9 +2368,12 @@ asking you for confirmation." (insert "A local variables list is specified in " name "."))) (insert "\n\nDo you want to apply it? You can type y -- to apply the local variables list. -n -- to ignore the local variables list. +n -- to ignore the local variables list.") + (if offer-save + (insert " ! -- to apply the local variables list, and mark these values (*) as safe (in the future, they can be set automatically.)\n\n") + (insert "\n\n")) (dolist (elt vars) (cond ((member elt unsafe-vars) (insert " * ")) @@ -2381,12 +2385,17 @@ n -- to ignore the local variables list. (insert " : ") (princ (cdr elt) buf) (insert "\n")) - (if (< (line-number-at-pos) (window-body-height)) - (setq prompt "Please type y, n, or !: ") - (goto-char (point-min)) - (setq prompt "Please type y, n, or !, or C-v to scroll: ")) + (setq prompt + (format "Please type %s%s: " + (if offer-save "y, n, or !" "y or n") + (if (< (line-number-at-pos) (window-body-height)) + "" + ", or C-v to scroll"))) + (goto-char (point-min)) (let ((inhibit-quit t) (cursor-in-echo-area t) + (exit-chars + (if offer-save '(?! ?y ?n ?\s ?\C-g) '(?y ?n ?\s ?\C-g))) done) (while (not done) (message prompt) @@ -2396,21 +2405,21 @@ n -- to ignore the local variables list. (condition-case nil (scroll-up) (error (goto-char (point-min)))) - (setq done (memq (downcase char) - '(?! ?y ?n ?\s ?\C-g)))))) + (setq done (memq (downcase char) exit-chars))))) (if (= char ?\C-g) (setq quit-flag nil))) (setq char (downcase char)) - (when (and (= char ?!) unsafe-vars) + (when (and offer-save (= char ?!) unsafe-vars) (dolist (elt unsafe-vars) (add-to-list 'safe-local-variable-values elt)) ;; When this is called from desktop-restore-file-buffer, ;; coding-system-for-read may be non-nil. Reset it before ;; writing to .emacs. - (let ((coding-system-for-read nil)) - (customize-save-variable - 'safe-local-variable-values - safe-local-variable-values))) + (if (or custom-file user-init-file) + (let ((coding-system-for-read nil)) + (customize-save-variable + 'safe-local-variable-values + safe-local-variable-values)))) (kill-buffer buf) (or (= char ?!) (= char ?\s) From ea8ae7654a60bf4598a6b6269fe75fb859b91651 Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Fri, 10 Mar 2006 23:43:54 +0000 Subject: [PATCH 19/76] Revision: emacs@sv.gnu.org/emacs--devo--0--patch-147 Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 56) - Update from CVS --- lisp/gnus/ChangeLog | 24 ++++++++++++++++++++ lisp/gnus/gnus-group.el | 5 ++++- lisp/gnus/gnus-nocem.el | 18 ++++++++++----- lisp/gnus/gnus-start.el | 9 +++++--- lisp/gnus/gnus.el | 18 +++++++++++++-- lisp/gnus/smiley.el | 40 +++++++++++++++++++++++---------- man/ChangeLog | 9 ++++++++ man/gnus.texi | 49 +++++++++++++++++++++++++---------------- 8 files changed, 129 insertions(+), 43 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 374c3da2994..8023af47bfd 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,27 @@ +2006-03-10 Reiner Steib + + * smiley.el: Add more test smileys. + (smiley-data-directory, smiley-regexp-alist) + (gnus-smiley-file-types): Fix doc strings. + (smiley-update-cache): Clear smiley-cached-regexp-alist before + adding new elements. + (smiley-mouse-map): Unused code. Make it a comment. + +2006-03-10 Katsumi Yamaoka + + * gnus-nocem.el (gnus-nocem-scan-groups): Add autoload cookie; + scan latest NoCeM messages instead of old ones. + (gnus-nocem-check-article): Fix regexps so as to match to PGP + delimiters that are recently used. + (gnus-nocem-load-cache): Add autoload cookie. + + * gnus.el (gnus-use-nocem): Enable it to be set to also a number. + + * gnus-start.el (gnus-setup-news): Scan NoCeM messages if a group + level which is larger than gnus-use-nocem is specified. + + * gnus-group.el (gnus-group-get-new-news): Ditto. + 2006-03-08 Reiner Steib * gnus-util.el (gnus-tool-bar-update): New function. diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el index 3d20af8b0df..0ed72433115 100644 --- a/lisp/gnus/gnus-group.el +++ b/lisp/gnus/gnus-group.el @@ -3622,7 +3622,10 @@ re-scanning. If ARG is non-nil and not a number, this will force ;; We might read in new NoCeM messages here. (when (and gnus-use-nocem - (null arg)) + (or (and (numberp gnus-use-nocem) + (numberp arg) + (>= arg gnus-use-nocem)) + (not arg))) (gnus-nocem-scan-groups)) ;; If ARG is not a number, then we read the active file. (when (and arg (not (numberp arg))) diff --git a/lisp/gnus/gnus-nocem.el b/lisp/gnus/gnus-nocem.el index b17c33a5d7f..e75b25282b0 100644 --- a/lisp/gnus/gnus-nocem.el +++ b/lisp/gnus/gnus-nocem.el @@ -136,6 +136,7 @@ valid issuer, which is much faster if you are selective about the issuers." (gnus-sethash group t gnus-nocem-real-group-hashtb)) gnus-newsrc-alist)) +;;;###autoload (defun gnus-nocem-scan-groups () "Scan all NoCeM groups for new NoCeM messages." (interactive) @@ -206,10 +207,10 @@ valid issuer, which is much faster if you are selective about the issuers." (not (member (mail-header-message-id header) gnus-nocem-seen-message-ids)))) (push header check-headers))) - (let* ((i 0) - (check-headers - (last check-headers gnus-nocem-check-article-limit)) - (len (length check-headers))) + (setq check-headers (last (nreverse check-headers) + gnus-nocem-check-article-limit)) + (let ((i 0) + (len (length check-headers))) (dolist (h check-headers) (gnus-message 7 "Checking article %d in %s for NoCeM (%d of %d)..." @@ -235,9 +236,13 @@ valid issuer, which is much faster if you are selective about the issuers." (days-to-time gnus-nocem-expiry-wait))) (gnus-request-article-this-buffer (mail-header-number header) group) (goto-char (point-min)) - (when (re-search-forward "-----BEGIN PGP MESSAGE-----" nil t) + (when (re-search-forward + "-----BEGIN PGP\\( SIGNED\\)? MESSAGE-----" + nil t) (delete-region (point-min) (match-beginning 0))) - (when (re-search-forward "-----END PGP MESSAGE-----\n?" nil t) + (when (re-search-forward + "-----END PGP \\(MESSAGE\\|SIGNATURE\\)-----\n?" + nil t) (delete-region (match-end 0) (point-max))) (goto-char (point-min)) ;; The article has to have proper NoCeM headers. @@ -334,6 +339,7 @@ valid issuer, which is much faster if you are selective about the issuers." gnus-nocem-alist)) t))) +;;;###autoload (defun gnus-nocem-load-cache () "Load the NoCeM cache." (interactive) diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el index 465ce0627b7..00defe58943 100644 --- a/lisp/gnus/gnus-start.el +++ b/lisp/gnus/gnus-start.el @@ -1047,9 +1047,12 @@ If LEVEL is non-nil, the news will be set up at level LEVEL." (gnus-check-bogus-newsgroups)) ;; We might read in new NoCeM messages here. - (when (and gnus-use-nocem - (not level) - (not dont-connect)) + (when (and (not dont-connect) + gnus-use-nocem + (or (and (numberp gnus-use-nocem) + (numberp level) + (>= level gnus-use-nocem)) + (not level))) (gnus-nocem-scan-groups)) ;; Read any slave files. diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el index 2caccc0b70e..7a04c61151a 100644 --- a/lisp/gnus/gnus.el +++ b/lisp/gnus/gnus.el @@ -1580,9 +1580,23 @@ articles. This is not a good idea." :value t))) (defcustom gnus-use-nocem nil - "*If non-nil, Gnus will read NoCeM cancel messages." + "*If non-nil, Gnus will read NoCeM cancel messages. +You can also set this variable to a positive number as a group level. +In that case, Gnus scans NoCeM messages when checking new news if this +value is not exceeding a group level that you specify as the prefix +argument to some commands, e.g. `gnus', `gnus-group-get-new-news', etc. +Otherwise, Gnus does not scan NoCeM messages if you specify a group +level to those commands." :group 'gnus-meta - :type 'boolean) + :type '(choice + (const :tag "off" nil) + (const :tag "on" t) + (list :convert-widget + (lambda (widget) + (list 'integer :tag "group level" + :value (if (boundp 'gnus-level-default-subscribed) + gnus-level-default-subscribed + 3)))))) (defcustom gnus-suppress-duplicates nil "*If non-nil, Gnus will mark duplicate copies of the same article as read." diff --git a/lisp/gnus/smiley.el b/lisp/gnus/smiley.el index d7657e444b8..e8afe9dd10d 100644 --- a/lisp/gnus/smiley.el +++ b/lisp/gnus/smiley.el @@ -31,8 +31,21 @@ ;; I'm not sure we need that degree of rococoness and defaults like a ;; yellow background. Also, using PBM means we can display the images ;; more generally. -- fx +;; `smiley.el' was replaced by `smiley-ems.el' on 2002-01-26 (after fx' +;; comment). -;;; Test smileys: :-) :-\ :-( :-/ +;; Test smileys: +;; smile ^:-) ^:) +;; blink ;-) ;) +;; forced :-] +;; braindamaged 8-) +;; indifferent :-| +;; wry :-/ :-\ +;; sad :-( +;; evil >:-) +;; cry ;-( +;; dead X-) +;; grin :-D ;;; Code: @@ -45,8 +58,9 @@ :group 'gnus-visual) ;; Maybe this should go. -(defcustom smiley-data-directory (nnheader-find-etc-directory "images/smilies") - "*Location of the smiley faces files." +(defcustom smiley-data-directory + (nnheader-find-etc-directory "images/smilies") + "Location of the smiley faces files." :type 'directory :group 'smiley) @@ -61,8 +75,8 @@ ("\\(:-(\\)\\W" 1 "sad") ("\\(:-{\\)\\W" 1 "frown")) "*A list of regexps to map smilies to images. -The elements are (REGEXP MATCH FILE), where MATCH is the submatch in -regexp to replace with IMAGE. IMAGE is the name of a PBM file in +The elements are (REGEXP MATCH IMAGE), where MATCH is the submatch in +regexp to replace with IMAGE. IMAGE is the name of an image file in `smiley-data-directory'." :type '(repeat (list regexp (integer :tag "Regexp match number") @@ -78,7 +92,7 @@ regexp to replace with IMAGE. IMAGE is the name of a PBM file in (when (gnus-image-type-available-p 'xpm) (push "xpm" types)) types) - "*List of suffixes on picon file names to try." + "*List of suffixes on smiley file names to try." :version "22.1" :type '(repeat string) :group 'smiley) @@ -86,6 +100,7 @@ regexp to replace with IMAGE. IMAGE is the name of a PBM file in (defvar smiley-cached-regexp-alist nil) (defun smiley-update-cache () + (setq smiley-cached-regexp-alist nil) (dolist (elt (if (symbolp smiley-regexp-alist) (symbol-value smiley-regexp-alist) smiley-regexp-alist)) @@ -104,12 +119,13 @@ regexp to replace with IMAGE. IMAGE is the name of a PBM file in (push (list (car elt) (cadr elt) image) smiley-cached-regexp-alist))))))) -(defvar smiley-mouse-map - (let ((map (make-sparse-keymap))) - (define-key map [down-mouse-2] 'ignore) ; override widget - (define-key map [mouse-2] - 'smiley-mouse-toggle-buffer) - map)) +;; Not implemented: +;; (defvar smiley-mouse-map +;; (let ((map (make-sparse-keymap))) +;; (define-key map [down-mouse-2] 'ignore) ; override widget +;; (define-key map [mouse-2] +;; 'smiley-mouse-toggle-buffer) +;; map)) ;;;###autoload (defun smiley-region (start end) diff --git a/man/ChangeLog b/man/ChangeLog index c0060317a5c..ca301d27c03 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,12 @@ +2006-03-10 Katsumi Yamaoka + + * gnus.texi (NoCeM): Mention gnus-use-nocem can also be a number. + +2006-03-10 Reiner Steib + + * gnus.texi (Fancy Mail Splitting): Improve sentences so as to be + easy to understand. + 2006-03-09 Katsumi Yamaoka * gnus.texi: Markup fix. diff --git a/man/gnus.texi b/man/gnus.texi index 72596ed26ce..c64305a3a66 100644 --- a/man/gnus.texi +++ b/man/gnus.texi @@ -14007,18 +14007,21 @@ If the split is a string, that will be taken as a group name. Normal regexp match expansion will be done. See below for examples. @c Don't fold this line. -@item (@var{field} @var{value} [- @var{restrict} [@dots{}] ] @var{split} [@var{invert-match-partial-words}]) -If the split is a list, the first element of which is a string, then -store the message as specified by @var{split}, if header @var{field} -(a regexp) contains @var{value} (also a regexp). If @var{restrict} -(yet another regexp) matches some string after @var{field} and before -the end of the matched @var{value}, the @var{split} is ignored. If -none of the @var{restrict} clauses match, @var{split} is processed. +@item (@var{field} @var{value} [- @var{restrict} [@dots{}] ] @var{split} [@var{invert-partial}]) +The split can be a list containing at least three elements. If the +first element @var{field} (a regexp matching a header) contains +@var{value} (also a regexp) then store the message as specified by +@var{split}. -The last element @var{invert-match-partial-words} is optional. If it is -not omitted and the value is non-@code{nil}, the match-partial-words -behavior controlled by the @code{nnmail-split-fancy-match-partial-words} -variable (see below) will be inverted. (New in Gnus 5.10.7) +If @var{restrict} (yet another regexp) matches some string after +@var{field} and before the end of the matched @var{value}, the +@var{split} is ignored. If none of the @var{restrict} clauses match, +@var{split} is processed. + +The last element @var{invert-partial} is optional. If it is +non-@code{nil}, the match-partial-words behavior controlled by the +variable @code{nnmail-split-fancy-match-partial-words} (see below) is +be inverted. (New in Gnus 5.10.7) @item (| @var{split} @dots{}) If the split is a list, and the first element is @code{|} (vertical @@ -14108,14 +14111,13 @@ in the rear of a word will be ignored. For example, the @var{value} @code{".*@@example\\.com"} does. @item -You can set the @var{invert-match-partial-words} flag in your split -rules of the @samp{(@var{field} @var{value} @dots{})} types, -aforementioned in this section. If the flag is set, word boundaries on -both sides of a word are ignored even if -@code{nnmail-split-fancy-match-partial-words} is @code{nil}. -Contrarily, if the flag is set, word boundaries are not ignored even if -@code{nnmail-split-fancy-match-partial-words} is non-@code{nil}. (New -in Gnus 5.10.7) +You can set the @var{invert-partial} flag in your split rules of the +@samp{(@var{field} @var{value} @dots{})} types, aforementioned in this +section. If the flag is set, word boundaries on both sides of a word +are ignored even if @code{nnmail-split-fancy-match-partial-words} is +@code{nil}. Contrarily, if the flag is set, word boundaries are not +ignored even if @code{nnmail-split-fancy-match-partial-words} is +non-@code{nil}. (New in Gnus 5.10.7) @end enumerate @vindex nnmail-split-abbrev-alist @@ -21793,6 +21795,15 @@ There are some variables to customize, of course: Set this variable to @code{t} to set the ball rolling. It is @code{nil} by default. +You can also set this variable to a positive number as a group level. +In that case, Gnus scans NoCeM messages when checking new news if this +value is not exceeding a group level that you specify as the prefix +argument to some commands, e.g. @code{gnus}, +@code{gnus-group-get-new-news}, etc. Otherwise, Gnus does not scan +NoCeM messages if you specify a group level to those commands. For +example, if you use 1 or 2 on the mail groups and the levels on the news +groups remain the default, 3 is the best choice. + @item gnus-nocem-groups @vindex gnus-nocem-groups Gnus will look for NoCeM messages in the groups in this list. The From 4a732ae9652dfdbb83530b1bb6221de06b4b0e61 Mon Sep 17 00:00:00 2001 From: Bill Wohler Date: Sat, 11 Mar 2006 01:34:45 +0000 Subject: [PATCH 20/76] (mh-replace-regexp-in-string): Pass the literal flag to replace-in-string. This was badly needed by mh-quote-pick-expr in order to properly quote subjects when using / s on XEmacs (closes SF #1447598). --- lisp/mh-e/ChangeLog | 5 +++++ lisp/mh-e/mh-compat.el | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index 35a1b1495f1..eecba3767f4 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -1,5 +1,10 @@ 2006-03-10 Bill Wohler + * mh-compat.el (mh-replace-regexp-in-string): Pass the literal + flag to replace-in-string. This was badly needed by + mh-quote-pick-expr in order to properly quote subjects when using + / s on XEmacs (closes SF #1447598). + * mh-e.el (mh-profile-component): Drop `s' from mhparam -components for Mailutils compatibility (closes SF #1446985). diff --git a/lisp/mh-e/mh-compat.el b/lisp/mh-e/mh-compat.el index 77e39de35f5..f048308ae30 100644 --- a/lisp/mh-e/mh-compat.el +++ b/lisp/mh-e/mh-compat.el @@ -232,8 +232,9 @@ The argument STRING is ignored." "Replace REGEXP with REP everywhere in STRING and return result. This function is used by XEmacs that lacks `replace-regexp-in-string'. The function `replace-in-string' is used instead. -The arguments FIXEDCASE, LITERAL, SUBEXP, and START are ignored." - (replace-in-string string regexp rep)) +The arguments FIXEDCASE, SUBEXP, and START, used by +`replace-in-string' are ignored." + (replace-in-string string regexp rep literal)) ;; Copy of constant from url-util.el in Emacs 22; needed by Emacs 21. (if (not (boundp 'url-unreserved-chars)) From 08f99a547c509e958a25782893251da277ea606f Mon Sep 17 00:00:00 2001 From: Bill Wohler Date: Sat, 11 Mar 2006 01:59:13 +0000 Subject: [PATCH 21/76] (mh-image-load-path-for-library): Merged changes from Reiner. Add no-error argument. If path t, just return directory. --- lisp/mh-e/ChangeLog | 2 ++ lisp/mh-e/mh-compat.el | 22 +++++++++++++++++----- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index eecba3767f4..ffb73d5425d 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -4,6 +4,8 @@ flag to replace-in-string. This was badly needed by mh-quote-pick-expr in order to properly quote subjects when using / s on XEmacs (closes SF #1447598). + (mh-image-load-path-for-library): Merged changes from Reiner. Add + no-error argument. If path t, just return directory. * mh-e.el (mh-profile-component): Drop `s' from mhparam -components for Mailutils compatibility (closes SF #1446985). diff --git a/lisp/mh-e/mh-compat.el b/lisp/mh-e/mh-compat.el index f048308ae30..d6bded8726e 100644 --- a/lisp/mh-e/mh-compat.el +++ b/lisp/mh-e/mh-compat.el @@ -116,7 +116,7 @@ introduced in Emacs 22." `(face-background ,face ,frame ,inherit))) (mh-defun-compat mh-image-load-path-for-library - image-load-path-for-library (library image &optional path) + image-load-path-for-library (library image &optional path no-error) "Return a suitable search path for images relative to LIBRARY. Images for LIBRARY are searched for in \"../../etc/images\" and @@ -124,8 +124,12 @@ Images for LIBRARY are searched for in \"../../etc/images\" and well as in `image-load-path' and `load-path'. This function returns the value of `load-path' augmented with the -path to IMAGE. If PATH is given, it is used instead of -`load-path'. +directory containing IMAGE. If PATH is given, it is used instead +of `load-path'. If PATH is t, just return the directory that +contains IMAGE. + +If NO-ERROR is non-nil, return nil if a suitable path can't be +found rather than signaling an error. Here is an example that uses a common idiom to provide compatibility with versions of Emacs that lack the variable @@ -179,11 +183,19 @@ This function is used by Emacs versions that don't have (setq img (directory-file-name parent) dir (expand-file-name "../" dir))) (setq image-directory dir))))) + (no-error + ;; In this case we will return nil. + (message "Could not find image %s for library %s" image library)) (t (error "Could not find image %s for library %s" image library))) - ;; Return augmented `image-load-path' or `load-path'. - (cond ((and path (symbolp path)) + ;; Return the directory, nil if no-error was non-nil and a + ;; suitable path could not be found, or an augmented + ;; `image-load-path' or `load-path'. + (cond ((or (null image-directory) + (eq path t)) + image-directory) + ((and path (symbolp path)) (nconc (list image-directory) (delete image-directory (if (boundp path) From 20c65d08634a204bcf34b6ba29336f8223d15395 Mon Sep 17 00:00:00 2001 From: Bill Wohler Date: Sat, 11 Mar 2006 02:04:08 +0000 Subject: [PATCH 22/76] (image-load-path-for-library): Merged changes from Reiner. Add no-error argument. If path t, just return directory. --- lisp/image.el | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/lisp/image.el b/lisp/image.el index 4acff8d251b..2d7aea6fa0c 100644 --- a/lisp/image.el +++ b/lisp/image.el @@ -77,7 +77,7 @@ value is used as a list of directories to search.") (list (file-name-as-directory (expand-file-name "images" data-directory)) 'data-directory 'load-path))) -(defun image-load-path-for-library (library image &optional path) +(defun image-load-path-for-library (library image &optional path no-error) "Return a suitable search path for images relative to LIBRARY. Images for LIBRARY are searched for in \"../../etc/images\" and @@ -85,8 +85,12 @@ Images for LIBRARY are searched for in \"../../etc/images\" and well as in `image-load-path' and `load-path'. This function returns the value of `load-path' augmented with the -path to IMAGE. If PATH is given, it is used instead of -`load-path'. +directory containing IMAGE. If PATH is given, it is used instead +of `load-path'. If PATH is t, just return the directory that +contains IMAGE. + +If NO-ERROR is non-nil, return nil if a suitable path can't be +found rather than signaling an error. Here is an example that uses a common idiom to provide compatibility with versions of Emacs that lack the variable @@ -137,11 +141,19 @@ compatibility with versions of Emacs that lack the variable (setq img (directory-file-name parent) dir (expand-file-name "../" dir))) (setq image-directory dir))))) + (no-error + ;; In this case we will return nil. + (message "Could not find image %s for library %s" image library)) (t (error "Could not find image %s for library %s" image library))) - ;; Return augmented `image-load-path' or `load-path'. - (cond ((and path (symbolp path)) + ;; Return the directory, nil if no-error was non-nil and a + ;; suitable path could not be found, or an augmented + ;; `image-load-path' or `load-path'. + (cond ((or (null image-directory) + (eq path t)) + image-directory) + ((and path (symbolp path)) (nconc (list image-directory) (delete image-directory (if (boundp path) From d50404042199ace4ac03dfce6912825d56aa570c Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Mar 2006 11:42:58 +0000 Subject: [PATCH 23/76] (auto-mode-alist): Add .odt (OpenOffice's open document) files. Mention in the doc string the need to sync with auto-coding-alist. --- lisp/files.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lisp/files.el b/lisp/files.el index 91a434dd33f..c093a5222b2 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -1872,7 +1872,7 @@ in that case, this function acts as if `enable-local-variables' were t." ;; `auto-coding-alist' with `no-conversion' coding system. ("\\.\\(arc\\|zip\\|lzh\\|zoo\\|[jew]ar\\|xpi\\)\\'" . archive-mode) ("\\.\\(ARC\\|ZIP\\|LZH\\|ZOO\\|[JEW]AR\\|XPI\\)\\'" . archive-mode) - ("\\.sx[dmicw]\\'" . archive-mode) ; OpenOffice.org + ("\\.\\(sx[dmicw]\\|odt\\)\\'" . archive-mode) ; OpenOffice.org ;; Mailer puts message to be edited in ;; /tmp/Re.... or Message ("\\`/tmp/Re" . text-mode) @@ -1955,6 +1955,9 @@ REGEXP and search the list again for another match. If the file name matches `inhibit-first-line-modes-regexps', then `auto-mode-alist' is not processed. +The extensions whose FUNCTION is `archive-mode' should also +appear in `auto-coding-alist' with `no-conversion' coding system. + See also `interpreter-mode-alist', which detects executable script modes based on the interpreters they specify to run, and `magic-mode-alist', which determines modes based on file contents.") From 86167621648ca8e575df526f97bb8a04fb0960b2 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Mar 2006 11:43:27 +0000 Subject: [PATCH 24/76] (auto-coding-alist): Add .odt (OpenOffice's open document) files. --- lisp/international/mule.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/international/mule.el b/lisp/international/mule.el index ba4fcef628b..d356736071d 100644 --- a/lisp/international/mule.el +++ b/lisp/international/mule.el @@ -1569,7 +1569,7 @@ text, and convert it in the temporary buffer. Otherwise, convert in-place." (defcustom auto-coding-alist '(("\\.\\(arc\\|zip\\|lzh\\|zoo\\|[jew]ar\\|xpi\\)\\'" . no-conversion) ("\\.\\(ARC\\|ZIP\\|LZH\\|ZOO\\|[JEW]AR\\|XPI\\)\\'" . no-conversion) - ("\\.\\(sx[dmicw]\\|tar\\|tgz\\)\\'" . no-conversion) + ("\\.\\(sx[dmicw]\\|odt\\|tar\\|tgz\\)\\'" . no-conversion) ("\\.\\(gz\\|Z\\|bz\\|bz2\\|gpg\\)\\'" . no-conversion) ("\\.\\(jpe?g\\|png\\|gif\\|tiff?\\|p[bpgn]m\\)\\'" . no-conversion) ("/#[^/]+#\\'" . emacs-mule)) From 8cb56728dda0b94f3b93f039414f56b24d188c19 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Mar 2006 12:02:05 +0000 Subject: [PATCH 25/76] (get_phys_cursor_geometry): Don't decrease height by 1. --- src/xdisp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xdisp.c b/src/xdisp.c index be40d7652ac..20e34d9417c 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -2029,7 +2029,7 @@ get_phys_cursor_geometry (w, row, glyph, heightp) } } - *heightp = h - 1; + *heightp = h; return WINDOW_TO_FRAME_PIXEL_Y (w, y); } From 97b5ae784da87d61fac93904f11aed356d9215f5 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Mar 2006 12:03:12 +0000 Subject: [PATCH 26/76] (mac_draw_rectangle): Don't add 1 to width and height. (x_draw_glyph_string_foreground) (x_draw_composite_glyph_string_foreground) (x_draw_image_foreground): Don't subtract 1 from width and height arguments to mac_draw_rectangle. (x_draw_hollow_cursor): Add 1 to w->phys_cursor_width. --- src/ChangeLog | 11 +++++++++++ src/macterm.c | 14 +++++++------- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 082be6c8cf5..2ed0b9b133c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,14 @@ +2006-03-11 Eli Zaretskii + + * xdisp.c (get_phys_cursor_geometry): Don't decrease height by 1. + + * macterm.c (mac_draw_rectangle): Don't add 1 to width and height. + (x_draw_glyph_string_foreground) + (x_draw_composite_glyph_string_foreground) + (x_draw_image_foreground): Don't subtract 1 from width and height + arguments to mac_draw_rectangle. + (x_draw_hollow_cursor): Add 1 to w->phys_cursor_width. + 2006-03-10 Kim F. Storm * alloc.c (USE_POSIX_MEMALIGN): Fix last change. diff --git a/src/macterm.c b/src/macterm.c index 985421b12c5..649bfb43ef5 100644 --- a/src/macterm.c +++ b/src/macterm.c @@ -598,7 +598,7 @@ mac_draw_rectangle (f, gc, x, y, width, height) SetPortWindowPort (FRAME_MAC_WINDOW (f)); RGBForeColor (GC_FORE_COLOR (gc)); - SetRect (&r, x, y, x + width + 1, y + height + 1); + SetRect (&r, x, y, x + width, y + height); mac_begin_clip (gc); FrameRect (&r); /* using foreground color of gc */ @@ -2436,7 +2436,7 @@ x_draw_glyph_string_foreground (s) { struct glyph *g = s->first_glyph + i; mac_draw_rectangle (s->f, s->gc, x, s->y, - g->pixel_width - 1, s->height - 1); + g->pixel_width, s->height); x += g->pixel_width; } } @@ -2515,7 +2515,7 @@ x_draw_composite_glyph_string_foreground (s) { if (s->gidx == 0) mac_draw_rectangle (s->f, s->gc, x, s->y, - s->width - 1, s->height - 1); + s->width, s->height); } else { @@ -3068,15 +3068,15 @@ x_draw_image_foreground (s) int r = s->img->relief; if (r < 0) r = -r; mac_draw_rectangle (s->f, s->gc, x - r, y - r, - s->slice.width + r*2 - 1, - s->slice.height + r*2 - 1); + s->slice.width + r*2, + s->slice.height + r*2); } } } else /* Draw a rectangle if image could not be loaded. */ mac_draw_rectangle (s->f, s->gc, x, y, - s->slice.width - 1, s->slice.height - 1); + s->slice.width, s->slice.height); } @@ -5245,7 +5245,7 @@ x_draw_hollow_cursor (w, row) /* Compute frame-relative coordinates for phys cursor. */ x = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x); y = get_phys_cursor_geometry (w, row, cursor_glyph, &h); - wd = w->phys_cursor_width; + wd = w->phys_cursor_width + 1; /* The foreground of cursor_gc is typically the same as the normal background color, which can cause the cursor box to be invisible. */ From 005a80de11fb0efe39b4fb5ad636396a3b86d281 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Mar 2006 12:04:41 +0000 Subject: [PATCH 27/76] (x_draw_hollow_cursor): Subtract 1 from the last argument of XDrawRectangle. --- src/xterm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xterm.c b/src/xterm.c index 7b952e1f45f..c0941b7cbdb 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -7178,7 +7178,7 @@ x_draw_hollow_cursor (w, row) /* Set clipping, draw the rectangle, and reset clipping again. */ x_clip_to_row (w, row, TEXT_AREA, gc); - XDrawRectangle (dpy, FRAME_X_WINDOW (f), gc, x, y, wd, h); + XDrawRectangle (dpy, FRAME_X_WINDOW (f), gc, x, y, wd, h - 1); XSetClipMask (dpy, gc, None); } From 7325e71441117761c91bd75c18d2cda79c330bc8 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Mar 2006 12:05:09 +0000 Subject: [PATCH 28/76] *** empty log message *** --- lisp/ChangeLog | 9 +++++++++ src/ChangeLog | 3 +++ 2 files changed, 12 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 96aae2ec1c4..d05b8b83d0d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2006-03-11 Eli Zaretskii + + * international/mule.el (auto-coding-alist): Add .odt + (OpenOffice's open document) files. + + * files.el (auto-mode-alist): Add .odt (OpenOffice's open + document) files. Mention in the doc string the need to sync with + auto-coding-alist. + 2006-03-10 Chong Yidong * files.el (hack-local-variables-confirm): Don't prompt for ! if diff --git a/src/ChangeLog b/src/ChangeLog index 2ed0b9b133c..99e8ab7cb44 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2006-03-11 Eli Zaretskii + * xterm.c (x_draw_hollow_cursor): Subtract 1 from the last + argument of XDrawRectangle. + * xdisp.c (get_phys_cursor_geometry): Don't decrease height by 1. * macterm.c (mac_draw_rectangle): Don't add 1 to width and height. From 29c8385073b8c0448b4429a01c198f05807f1c57 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Mar 2006 12:16:32 +0000 Subject: [PATCH 29/76] (list-holidays): Doc fix. --- lisp/calendar/holidays.el | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el index 1aaf226d21d..5a29bf8fff1 100644 --- a/lisp/calendar/holidays.el +++ b/lisp/calendar/holidays.el @@ -120,6 +120,15 @@ This function is suitable for execution in a .emacs file." "Display holidays for years Y1 to Y2 (inclusive). The optional list of holidays L defaults to `calendar-holidays'. +If you want to control what holidays are displayed, use a +different list. For example, + + (list-holidays 2006 2006 + (append general-holidays local-holidays other-holidays)) + +will display holidays for the year 2006 defined in the 3 +mentioned lists, and nothing else. + When called interactively, this command offers a choice of holidays, based on the variables `solar-holidays' etc. See the documentation of `calendar-holidays' for a list of the variables From 8890220d927ff4c24530dc47c8b3df433e2c9432 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Mar 2006 12:33:03 +0000 Subject: [PATCH 30/76] Remove duplicate prototypes. Make the prototype of getloadavg be conditioned on HAVE_GETLOADAVG being undefined. --- src/lisp.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/lisp.h b/src/lisp.h index 99ed0575280..2eaa0987057 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -2732,7 +2732,6 @@ EXFUN (Fbobp, 0); EXFUN (Fformat, MANY); EXFUN (Fmessage, MANY); extern Lisp_Object format2 P_ ((char *, Lisp_Object, Lisp_Object)); -extern Lisp_Object make_buffer_string P_ ((int, int, int)); EXFUN (Fbuffer_substring, 2); EXFUN (Fbuffer_string, 0); extern Lisp_Object save_excursion_save P_ ((void)); @@ -2751,7 +2750,6 @@ extern Lisp_Object make_buffer_string P_ ((int, int, int)); extern Lisp_Object make_buffer_string_both P_ ((int, int, int, int, int)); extern void init_editfns P_ ((void)); extern void syms_of_editfns P_ ((void)); -EXFUN (Fcurrent_message, 0); extern Lisp_Object Vinhibit_field_text_motion; EXFUN (Fconstrain_to_field, 5); EXFUN (Ffield_string, 1); @@ -2849,7 +2847,6 @@ extern Lisp_Object close_file_unwind P_ ((Lisp_Object)); extern void report_file_error P_ ((const char *, Lisp_Object)); extern int internal_delete_file P_ ((Lisp_Object)); extern void syms_of_fileio P_ ((void)); -EXFUN (Fmake_temp_name, 1); extern void init_fileio_once P_ ((void)); extern Lisp_Object make_temp_name P_ ((Lisp_Object, int)); EXFUN (Fmake_symbolic_link, 3); @@ -3139,7 +3136,6 @@ extern void sys_subshell P_ ((void)); extern void sys_suspend P_ ((void)); extern void discard_tty_input P_ ((void)); extern void init_sys_modes P_ ((void)); -extern void reset_sys_modes P_ ((void)); extern void get_frame_size P_ ((int *, int *)); extern void wait_for_termination P_ ((int)); extern void flush_pending_output P_ ((int)); @@ -3192,8 +3188,10 @@ EXFUN (Fset_fontset_font, 4); /* Defined in xfaces.c */ extern void syms_of_xfaces P_ ((void)); +#ifndef HAVE_GETLOADAVG /* Defined in getloadavg.c */ extern int getloadavg P_ ((double *, int)); +#endif #ifdef HAVE_X_WINDOWS /* Defined in xfns.c */ @@ -3214,9 +3212,6 @@ extern void syms_of_xselect P_ ((void)); /* Defined in xterm.c */ extern void syms_of_xterm P_ ((void)); -/* Defined in getloadavg.c */ -extern int getloadavg P_ ((double [], int)); - #ifdef MSDOS /* Defined in msdos.c */ EXFUN (Fmsdos_downcase_filename, 1); From 306cea3aee712f8b2d19b2bfd4011a2ecc9c1c2f Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Mar 2006 12:33:37 +0000 Subject: [PATCH 31/76] *** empty log message *** --- lisp/ChangeLog | 2 ++ src/ChangeLog | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d05b8b83d0d..aa50978f5e8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2006-03-11 Eli Zaretskii + * calendar/holidays.el (list-holidays): Doc fix. + * international/mule.el (auto-coding-alist): Add .odt (OpenOffice's open document) files. diff --git a/src/ChangeLog b/src/ChangeLog index 99e8ab7cb44..b66d8bbf58b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2006-03-11 Giorgos Keramidas (tiny change) + + * lisp.h: Remove duplicate prototypes. Make the prototype of + getloadavg be conditioned on HAVE_GETLOADAVG being undefined. + 2006-03-11 Eli Zaretskii * xterm.c (x_draw_hollow_cursor): Subtract 1 from the last From 635a349655891c7c24221d8ca65ad69437c3e03e Mon Sep 17 00:00:00 2001 From: Romain Francoise Date: Sat, 11 Mar 2006 14:42:17 +0000 Subject: [PATCH 32/76] (Vprocess_adaptive_read_buffering): Doc fix. --- src/ChangeLog | 4 ++++ src/process.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index b66d8bbf58b..6d7ef065cf8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2006-03-11 Romain Francoise + + * process.c (Vprocess_adaptive_read_buffering): Doc fix. + 2006-03-11 Giorgos Keramidas (tiny change) * lisp.h: Remove duplicate prototypes. Make the prototype of diff --git a/src/process.c b/src/process.c index 1c0b196b3cf..cf0845fd7af 100644 --- a/src/process.c +++ b/src/process.c @@ -6981,7 +6981,7 @@ On some systems, when Emacs reads the output from a subprocess, the output data is read in very small blocks, potentially resulting in very poor performance. This behavior can be remedied to some extent by setting this variable to a non-nil value, as it will automatically delay reading from such processes, to -allowing them to produce more output before Emacs tries to read it. +allow them to produce more output before Emacs tries to read it. If the value is t, the delay is reset after each write to the process; any other non-nil value means that the delay is not reset on write. The variable takes effect when `start-process' is called. */); From f71d8cffc73c3a44086ce31c40abb378fd2c0350 Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Sat, 11 Mar 2006 15:02:13 +0000 Subject: [PATCH 33/76] *** empty log message *** --- nt/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nt/ChangeLog b/nt/ChangeLog index 097f1f1e2af..12b8cf20967 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,7 @@ +2006-03-11 Jason Rumney + + * runemacs.c (WinMain): Set screen buffer to 80x25. + 2005-12-24 Eli Zaretskii * gmake.defs (TEMACS_EXTRA_LINK): Remove redundant -g. From 3bb69bbdbab33bb301d7b60271c0cdb410485206 Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Sat, 11 Mar 2006 15:02:34 +0000 Subject: [PATCH 34/76] (WinMain): Set screen buffer to 80x25. --- nt/runemacs.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nt/runemacs.c b/nt/runemacs.c index a998134ec72..c43c7b61366 100644 --- a/nt/runemacs.c +++ b/nt/runemacs.c @@ -138,8 +138,12 @@ WinMain (HINSTANCE hSelf, HINSTANCE hPrev, LPSTR cmdline, int nShow) memset (&start, 0, sizeof (start)); start.cb = sizeof (start); - start.dwFlags = STARTF_USESHOWWINDOW; + start.dwFlags = STARTF_USESHOWWINDOW | STARTF_USECOUNTCHARS; start.wShowWindow = SW_HIDE; + /* Ensure that we don't waste memory if the user has specified a huge + default screen buffer for command windows. */ + start.dwXCountChars = 80; + start.dwYCountChars = 25; sec_attrs.nLength = sizeof (sec_attrs); sec_attrs.lpSecurityDescriptor = NULL; From 55faab0a19c18ed34bd85a3f89c7bc1acf12c47b Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Mar 2006 15:07:32 +0000 Subject: [PATCH 35/76] (flyspell-external-point-words, flyspell-process-localwords): Fix last changes. --- lisp/ChangeLog | 5 +++++ lisp/textmodes/flyspell.el | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index aa50978f5e8..7bc82634547 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2006-03-11 Agustin Martin + + * textmodes/flyspell.el (flyspell-external-point-words) + (flyspell-process-localwords): Fix last changes. + 2006-03-11 Eli Zaretskii * calendar/holidays.el (list-holidays): Doc fix. diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el index 96862b9c671..54b67a258a6 100644 --- a/lisp/textmodes/flyspell.el +++ b/lisp/textmodes/flyspell.el @@ -1323,7 +1323,7 @@ The buffer to mark them in is `flyspell-large-region-buffer'." (let (words-not-found (ispell-otherchars (ispell-get-otherchars)) (buffer-scan-pos flyspell-large-region-beg) - (case-fold-search nil)) + case-fold-search) (with-current-buffer flyspell-external-ispell-buffer (goto-char (point-min)) ;; Loop over incorrect words, in the order they were reported, @@ -1409,8 +1409,7 @@ The buffer to mark them in is `flyspell-large-region-buffer'." ;;* declared correct. */ ;;*---------------------------------------------------------------------*/ (defun flyspell-process-localwords (misspellings-buffer) - (let (localwords - (case-fold-search nil) + (let (localwords case-fold-search (ispell-casechars (ispell-get-casechars))) ;; Get localwords from the original buffer (save-excursion From 76815b2a6df7ae69ddb2f34e4db409ed180e96af Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sat, 11 Mar 2006 15:08:42 +0000 Subject: [PATCH 36/76] (battery-echo-area-format): Doc fix. (battery-mode-line-format): Likewise. (battery-linux-proc-apm, battery-linux-proc-acpi): Likewise. (battery-linux-proc-acpi): Ignore batteries that say "charged". --- lisp/battery.el | 42 ++++++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/lisp/battery.el b/lisp/battery.el index fa816c585b4..65b8baff66c 100644 --- a/lisp/battery.el +++ b/lisp/battery.el @@ -77,7 +77,18 @@ introduced by a `%' character in a control string." Ordinary characters in the control string are printed as-is, while conversion specifications introduced by a `%' character in the control string are substituted as defined by the current value of the variable -`battery-status-function'." +`battery-status-function'. Here are the ones generally available: +%c Current capacity (mAh or mWh) +%r Current rate of charge or discharge +%B Battery status (verbose) +%b Battery status: empty means high, `-' means low, + `!' means critical, and `+' means charging +%d Temperature (in degrees Celsius) +%L AC line status (verbose) +%p Battery load percentage +%m Remaining time (to charge or discharge) in minutes +%h Remaining time (to charge or discharge) in hours +%t Remaining time (to charge or discharge) in the form `h:min'" :type '(choice string (const nil)) :group 'battery) @@ -96,7 +107,18 @@ string are substituted as defined by the current value of the variable Ordinary characters in the control string are printed as-is, while conversion specifications introduced by a `%' character in the control string are substituted as defined by the current value of the variable -`battery-status-function'." +`battery-status-function'. Here are the ones generally available: +%c Current capacity (mAh or mWh) +%r Current rate of charge or discharge +%B Battery status (verbose) +%b Battery status: empty means high, `-' means low, + `!' means critical, and `+' means charging +%d Temperature (in degrees Celsius) +%L AC line status (verbose) +%p Battery load percentage +%m Remaining time (to charge or discharge) in minutes +%h Remaining time (to charge or discharge) in hours +%t Remaining time (to charge or discharge) in the form `h:min'" :type '(choice string (const nil)) :group 'battery) @@ -196,10 +218,10 @@ The following %-sequences are provided: %b Battery status, empty means high, `-' means low, `!' means critical, and `+' means charging %p Battery load percentage -%s Remaining time in seconds -%m Remaining time in minutes -%h Remaining time in hours -%t Remaining time in the form `h:min'" +%s Remaining time (to charge or discharge) in seconds +%m Remaining time (to charge or discharge) in minutes +%h Remaining time (to charge or discharge) in hours +%t Remaining time (to charge or discharge) in the form `h:min'" (let (driver-version bios-version bios-interface line-status battery-status battery-status-symbol load-percentage seconds minutes hours remaining-time tem) @@ -267,9 +289,9 @@ The following %-sequences are provided: %d Temperature (in degrees Celsius) %L AC line status (verbose) %p Battery load percentage -%m Remaining time in minutes -%h Remaining time in hours -%t Remaining time in the form `h:min'" +%m Remaining time (to charge or discharge) in minutes +%h Remaining time (to charge or discharge) in hours +%t Remaining time (to charge or discharge) in the form `h:min'" (let ((design-capacity 0) (last-full-capacity 0) full-capacity @@ -287,7 +309,7 @@ The following %-sequences are provided: (ignore-errors (insert-file-contents (expand-file-name "state" dir))) (when (re-search-forward "present: +yes$" nil t) (and (re-search-forward "charging state: +\\(.*\\)$" nil t) - (member charging-state '("unknown" nil)) + (member charging-state '("unknown" "charged" nil)) ;; On most multi-battery systems, most of the time only one ;; battery is "charging"/"discharging", the others are ;; "unknown". From 66e9b2b244a03a1cb973ef1e1a909c8d232dcc82 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sat, 11 Mar 2006 15:09:48 +0000 Subject: [PATCH 37/76] (kill-region, yank): Doc fix. --- lisp/simple.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/simple.el b/lisp/simple.el index 685e6f2788b..9ffd974311d 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -2506,8 +2506,8 @@ yanking point; just return the Nth kill forward." (put 'text-read-only 'error-message "Text is read-only") (defun kill-region (beg end &optional yank-handler) - "Kill between point and mark. -The text is deleted but saved in the kill ring. + "Kill (\"cut\") text between point and mark. +This deletes the text from the buffer and saves it in the kill ring. The command \\[yank] can retrieve it from there. \(If you want to kill and then yank immediately, use \\[kill-ring-save].) @@ -2690,7 +2690,7 @@ doc string for `insert-for-yank-1', which see." nil) (defun yank (&optional arg) - "Reinsert the last stretch of killed text. + "Reinsert (\"past") the last stretch of killed text. More precisely, reinsert the stretch of killed text most recently killed OR yanked. Put point at end, and set mark at beginning. With just \\[universal-argument] as argument, same but put point at beginning (and mark at end). From 0c93f71581de89217200927488d337425ef4fdb3 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Mar 2006 15:11:09 +0000 Subject: [PATCH 38/76] (octave-indent-for-comment): Behave according to do string. --- lisp/ChangeLog | 5 +++++ lisp/progmodes/octave-mod.el | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7bc82634547..cf9ecfee24f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2006-03-11 Kurt Hornik + + * progmodes/octave-mod.el (octave-indent-for-comment): Behave + according to do string. + 2006-03-11 Agustin Martin * textmodes/flyspell.el (flyspell-external-point-words) diff --git a/lisp/progmodes/octave-mod.el b/lisp/progmodes/octave-mod.el index 5f52e6f4d3c..57941db9691 100644 --- a/lisp/progmodes/octave-mod.el +++ b/lisp/progmodes/octave-mod.el @@ -732,7 +732,10 @@ If there is no comment already on this line, create a code-level comment comment (started by one comment character) otherwise. Point is left after the start of the comment which is properly aligned." (interactive) - (indent-for-comment) + (beginning-of-line) + (if (looking-at "^\\s-*$") + (insert octave-block-comment-start) + (indent-for-comment)) (indent-according-to-mode)) (defun octave-indent-line (&optional arg) From dcc25b7e7f6145a0e710e1cd54ac6eb8e95465b1 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sat, 11 Mar 2006 15:13:19 +0000 Subject: [PATCH 39/76] (eshell-prefer-to-shell): Variable deleted; the way it is implemented is too unclean. --- lisp/eshell/eshell.el | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el index ed9e3e56c9e..cfc2f05b931 100644 --- a/lisp/eshell/eshell.el +++ b/lisp/eshell/eshell.el @@ -323,24 +323,6 @@ the tasks accomplished by such tools." (= (file-modes eshell-directory-name) eshell-private-directory-modes))) -(defcustom eshell-prefer-to-shell nil - "*If non-nil, \\[shell-command] will use Eshell instead of shell-mode." - :set (lambda (symbol value) - ;; modifying the global keymap directly is odious, but how - ;; else to achieve the takeover? - (if value - (progn - (define-key global-map [(meta ?!)] 'eshell-command) -;;; (define-key global-map [(meta ?|)] 'eshell-command-on-region) - ) - (define-key global-map [(meta ?!)] 'shell-command) -;;; (define-key global-map [(meta ?|)] 'shell-command-on-region) - ) - (set symbol value)) - :type 'boolean - :require 'eshell - :group 'eshell) - ;;;_* Running Eshell ;; ;; There are only three commands used to invoke Eshell. The first two From f7878d663bd4f3f4b6b8f3402f2e33224dfcc3cb Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sat, 11 Mar 2006 15:13:47 +0000 Subject: [PATCH 40/76] (rmail-ignored-headers): Discard DomainKey-Signature. --- lisp/mail/rmail.el | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 13856096e28..935e7d1b92c 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -268,7 +268,7 @@ It is useful to set this variable in the site customization file.") "\\|^list-id:\\|^list-unsubscribe:\\|^list-archive:" "\\|^content-length:\\|^nntp-posting-date:\\|^user-agent" "\\|^importance:\\|^envelope-to:\\|^delivery-date\\|^openpgp:" - "\\|^mbox-line:\\|^cancel-lock:" + "\\|^mbox-line:\\|^cancel-lock:\\|^DomainKey-Signature:" "\\|^resent-face:\\|^resent-x.*:\\|^resent-organization:\\|^resent-openpgp:" "\\|^x-.*:") @@ -319,8 +319,14 @@ See also `rmail-highlight-face'." :type 'regexp :group 'rmail-headers) +(defface rmail-highlight + '((t :default highlight)) + "Face to use for highlighting the most important header fields." + :group 'rmail-headers + :version "22.1") + ;;;###autoload -(defcustom rmail-highlight-face nil "\ +(defcustom rmail-highlight-face 'rmail-highlight "\ *Face used by Rmail for highlighting headers." :type '(choice (const :tag "Default" nil) face) From 88019a632801faf4b322b997971658a83274f33d Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sat, 11 Mar 2006 15:19:31 +0000 Subject: [PATCH 41/76] (unwind_to_catch): Call x_fully_uncatch_errors. (internal_condition_case_1, internal_condition_case_2): Abort if within unclosed x_catch_errors. --- src/eval.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/src/eval.c b/src/eval.c index a84948981f4..435667e4d50 100644 --- a/src/eval.c +++ b/src/eval.c @@ -1259,6 +1259,10 @@ unwind_to_catch (catch, value) } while (! last_time); + /* If x_catch_errors was done, turn it off now. + (First we give unbind_to a chance to do that.) */ + x_fully_uncatch_errors (); + byte_stack_list = catch->byte_stack; gcprolist = catch->gcpro; #ifdef DEBUG_GCPRO @@ -1435,10 +1439,10 @@ internal_condition_case (bfun, handlers, hfun) struct catchtag c; struct handler h; -#if 0 /* We now handle interrupt_input_blocked properly. - What we still do not handle is exiting a signal handler. */ + /* Since Fsignal will close off all calls to x_catch_errors, + we will get the wrong results if some are not closed now. */ + if (x_catching_errors ()) abort (); -#endif c.tag = Qnil; c.val = Qnil; @@ -1481,6 +1485,11 @@ internal_condition_case_1 (bfun, arg, handlers, hfun) struct catchtag c; struct handler h; + /* Since Fsignal will close off all calls to x_catch_errors, + we will get the wrong results if some are not closed now. */ + if (x_catching_errors ()) + abort (); + c.tag = Qnil; c.val = Qnil; c.backlist = backtrace_list; @@ -1525,6 +1534,11 @@ internal_condition_case_2 (bfun, nargs, args, handlers, hfun) struct catchtag c; struct handler h; + /* Since Fsignal will close off all calls to x_catch_errors, + we will get the wrong results if some are not closed now. */ + if (x_catching_errors ()) + abort (); + c.tag = Qnil; c.val = Qnil; c.backlist = backtrace_list; From e6feb692fb27773fd062a63e2b30aef4db5d4bac Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sat, 11 Mar 2006 15:20:09 +0000 Subject: [PATCH 42/76] (x_fully_uncatch_errors, x_catching_errors): New functions. --- src/xterm.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/xterm.c b/src/xterm.c index c0941b7cbdb..92b245f2b32 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -7590,6 +7590,23 @@ x_clear_errors (dpy) x_error_message->string[0] = 0; } +/* Close off all unclosed x_catch_errors calls. */ + +void +x_fully_uncatch_errors () +{ + while (x_error_message) + x_uncatch_errors (); +} + +/* Nonzero if x_catch_errors has been done and not yet canceled. */ + +int +x_catching_errors () +{ + return x_error_message != 0; +} + #if 0 static unsigned int x_wire_count; x_trace_wire () From 02b370adb2780a76ef926b7a8f394fe32a72b7ee Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sat, 11 Mar 2006 15:21:13 +0000 Subject: [PATCH 43/76] (get_lim_data, lim_data, data_space_start): Moved to vm-limit.c. --- src/mem-limits.h | 86 ------------------------------------------------ 1 file changed, 86 deletions(-) diff --git a/src/mem-limits.h b/src/mem-limits.h index 292293b2f98..45dabca3ac5 100644 --- a/src/mem-limits.h +++ b/src/mem-limits.h @@ -112,91 +112,5 @@ extern char etext; #endif /* not _LIBC */ -/* start of data space; can be changed by calling malloc_init */ -static POINTER data_space_start; - -/* Number of bytes of writable memory we can expect to be able to get */ -static unsigned long lim_data; - -#ifdef NO_LIM_DATA -static void -get_lim_data () -{ - lim_data = -1; -} -#else /* not NO_LIM_DATA */ - -#ifdef USG - -static void -get_lim_data () -{ - extern long ulimit (); - - lim_data = -1; - - /* Use the ulimit call, if we seem to have it. */ -#if !defined (ULIMIT_BREAK_VALUE) || defined (GNU_LINUX) - lim_data = ulimit (3, 0); -#endif - - /* If that didn't work, just use the macro's value. */ -#ifdef ULIMIT_BREAK_VALUE - if (lim_data == -1) - lim_data = ULIMIT_BREAK_VALUE; -#endif - - lim_data -= (long) data_space_start; -} - -#else /* not USG */ -#ifdef WINDOWSNT - -static void -get_lim_data () -{ - extern unsigned long reserved_heap_size; - lim_data = reserved_heap_size; -} - -#else -#if !defined (BSD4_2) && !defined (__osf__) - -#ifdef MSDOS -void -get_lim_data () -{ - _go32_dpmi_meminfo info; - - _go32_dpmi_get_free_memory_information (&info); - lim_data = info.available_memory; -} -#else /* not MSDOS */ -static void -get_lim_data () -{ - lim_data = vlimit (LIM_DATA, -1); -} -#endif /* not MSDOS */ - -#else /* BSD4_2 */ - -static void -get_lim_data () -{ - struct rlimit XXrlimit; - - getrlimit (RLIMIT_DATA, &XXrlimit); -#ifdef RLIM_INFINITY - lim_data = XXrlimit.rlim_cur & RLIM_INFINITY; /* soft limit */ -#else - lim_data = XXrlimit.rlim_cur; /* soft limit */ -#endif -} -#endif /* BSD4_2 */ -#endif /* not WINDOWSNT */ -#endif /* not USG */ -#endif /* not NO_LIM_DATA */ - /* arch-tag: fe39244e-e54f-4208-b7aa-02556f7841c5 (do not change this comment) */ From 395d3972b1ffbcbe1a81052163be27345d0ca8fb Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sat, 11 Mar 2006 15:24:02 +0000 Subject: [PATCH 44/76] (get_lim_data, lim_data, data_space_start): Moved from mem-limits.h. (enum warnlevel): New data type. (check_memory_limits): Rewrite the logic about warnings. Use standard `struct rlimit'. Check return values for nonsense. (memory_warnings): Always clear lim_data. --- src/ChangeLog | 18 +++++ src/vm-limit.c | 203 ++++++++++++++++++++++++++++++++++++------------- 2 files changed, 169 insertions(+), 52 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 6d7ef065cf8..e83940cecd6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,21 @@ +2006-03-11 Richard Stallman + + * vm-limit.c (get_lim_data, lim_data, data_space_start): + Moved from mem-limits.h. + (enum warnlevel): New data type. + (check_memory_limits): Rewrite the logic about warnings. + Use standard `struct rlimit'. Check return values for nonsense. + (memory_warnings): Always clear lim_data. + + * mem-limits.h (get_lim_data, lim_data, data_space_start): + Moved to vm-limit.c. + + * xterm.c (x_fully_uncatch_errors, x_catching_errors): New functions. + + * eval.c (unwind_to_catch): Call x_fully_uncatch_errors. + (internal_condition_case_1, internal_condition_case_2): + Abort if within unclosed x_catch_errors. + 2006-03-11 Romain Francoise * process.c (Vprocess_adaptive_read_buffering): Doc fix. diff --git a/src/vm-limit.c b/src/vm-limit.c index 48d13c323ae..de31eda0cec 100644 --- a/src/vm-limit.c +++ b/src/vm-limit.c @@ -32,6 +32,9 @@ typedef void *POINTER; #endif #include "mem-limits.h" +#include + +#define HAVE_GETRLIMIT #ifdef HAVE_GETRLIMIT #include @@ -44,13 +47,102 @@ typedef void *POINTER; 2 -- 85% warning already issued. 3 -- 95% warning issued; keep warning frequently. */ -static int warnlevel; +enum warnlevel { not_warned, warned_75, warned_85, warned_95 }; + +static enum warnlevel warnlevel; /* Function to call to issue a warning; 0 means don't issue them. */ static void (*warn_function) (); -/* Get more memory space, complaining if we're near the end. */ +/* Start of data space; can be changed by calling malloc_init. */ +static POINTER data_space_start; + +/* Number of bytes of writable memory we can expect to be able to get. */ +static unsigned long lim_data; + + +#ifdef NO_LIM_DATA +static void +get_lim_data () +{ + lim_data = -1; +} +#else /* not NO_LIM_DATA */ + +#ifdef USG + +static void +get_lim_data () +{ + extern long ulimit (); + + lim_data = -1; + + /* Use the ulimit call, if we seem to have it. */ +#if !defined (ULIMIT_BREAK_VALUE) || defined (GNU_LINUX) + lim_data = ulimit (3, 0); +#endif + + /* If that didn't work, just use the macro's value. */ +#ifdef ULIMIT_BREAK_VALUE + if (lim_data == -1) + lim_data = ULIMIT_BREAK_VALUE; +#endif + + lim_data -= (long) data_space_start; +} + +#else /* not USG */ +#ifdef WINDOWSNT + +static void +get_lim_data () +{ + extern unsigned long reserved_heap_size; + lim_data = reserved_heap_size; +} + +#else +#if !defined (BSD4_2) && !defined (__osf__) + +#ifdef MSDOS +void +get_lim_data () +{ + _go32_dpmi_meminfo info; + + _go32_dpmi_get_free_memory_information (&info); + lim_data = info.available_memory; +} +#else /* not MSDOS */ +static void +get_lim_data () +{ + lim_data = vlimit (LIM_DATA, -1); +} +#endif /* not MSDOS */ + +#else /* BSD4_2 */ + +static void +get_lim_data () +{ + struct rlimit XXrlimit; + + getrlimit (RLIMIT_DATA, &XXrlimit); +#ifdef RLIM_INFINITY + lim_data = XXrlimit.rlim_cur & RLIM_INFINITY; /* soft limit */ +#else + lim_data = XXrlimit.rlim_cur; /* soft limit */ +#endif +} +#endif /* BSD4_2 */ +#endif /* not WINDOWSNT */ +#endif /* not USG */ +#endif /* not NO_LIM_DATA */ + +/* Verify amount of memory available, complaining if we're near the end. */ static void check_memory_limits () @@ -64,14 +156,19 @@ check_memory_limits () register POINTER cp; unsigned long five_percent; unsigned long data_size; + enum warnlevel new_warnlevel; #ifdef HAVE_GETRLIMIT - struct rlimit { - rlim_t rlim_cur; - rlim_t rlim_max; - } rlimit; + struct rlimit rlimit; - getrlimit (RLIMIT_DATA, &rlimit); + getrlimit (RLIMIT_AS, &rlimit); + + if (RLIM_INFINITY == rlimit.rlim_max) + return; + + /* This is a nonsensical case, but it happens -- rms. */ + if (rlimit.rlim_cur > rlimit.rlim_max) + return; five_percent = rlimit.rlim_max / 20; data_size = rlimit.rlim_cur; @@ -93,57 +190,61 @@ check_memory_limits () #endif /* not HAVE_GETRLIMIT */ - if (warn_function) - switch (warnlevel) - { - case 0: - if (data_size > five_percent * 15) - { - warnlevel++; - (*warn_function) ("Warning: past 75% of memory limit"); - } - break; + if (!warn_function) + return; - case 1: - if (data_size > five_percent * 17) - { - warnlevel++; - (*warn_function) ("Warning: past 85% of memory limit"); - } - break; + /* What level of warning does current memory usage demand? */ + if (data_size > five_percent * 19) + new_warnlevel = warned_95; + else if (data_size > five_percent * 17) + new_warnlevel = warned_85; + else if (data_size > five_percent * 15) + new_warnlevel = warned_75; + else + new_warnlevel = not_warned; - case 2: - if (data_size > five_percent * 19) - { - warnlevel++; - (*warn_function) ("Warning: past 95% of memory limit"); - } - break; + /* If we have gone up a level, give the appropriate warning. */ + if (new_warnlevel > warnlevel || new_warnlevel == warned_95) + { + warnlevel = new_warnlevel; + switch (warnlevel) + { + case warned_75: + (*warn_function) ("Warning: past 75% of memory limit"); + break; - default: - (*warn_function) ("Warning: past acceptable memory limits"); - break; - } + case warned_85: + (*warn_function) ("Warning: past 85% of memory limit"); + break; - /* If we go down below 70% full, issue another 75% warning - when we go up again. */ - if (data_size < five_percent * 14) - warnlevel = 0; - /* If we go down below 80% full, issue another 85% warning - when we go up again. */ - else if (warnlevel > 1 && data_size < five_percent * 16) - warnlevel = 1; - /* If we go down below 90% full, issue another 95% warning - when we go up again. */ - else if (warnlevel > 2 && data_size < five_percent * 18) - warnlevel = 2; + case warned_95: + (*warn_function) ("Warning: past 95% of memory limit"); + } + } + /* Handle going down in usage levels, with some hysteresis. */ + else + { + /* If we go down below 70% full, issue another 75% warning + when we go up again. */ + if (data_size < five_percent * 14) + warnlevel = not_warned; + /* If we go down below 80% full, issue another 85% warning + when we go up again. */ + else if (warnlevel > warned_75 && data_size < five_percent * 16) + warnlevel = warned_75; + /* If we go down below 90% full, issue another 95% warning + when we go up again. */ + else if (warnlevel > warned_85 && data_size < five_percent * 18) + warnlevel = warned_85; + } if (EXCEEDS_LISP_PTR (cp)) (*warn_function) ("Warning: memory in use exceeds lisp pointer size"); } - -/* Cause reinitialization based on job parameters; - also declare where the end of pure storage is. */ + +/* Enable memory usage warnings. + START says where the end of pure storage is. + WARNFUN specifies the function to call to issue a warning. */ void memory_warnings (start, warnfun) @@ -160,10 +261,8 @@ memory_warnings (start, warnfun) warn_function = warnfun; __after_morecore_hook = check_memory_limits; -#ifdef WINDOWSNT /* Force data limit to be recalculated on each run. */ lim_data = 0; -#endif } /* arch-tag: eab04eda-1f69-447a-8d9f-95f0a3983ca5 From 7857982c9fdd085806380117936fec0f529894e8 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sat, 11 Mar 2006 15:25:03 +0000 Subject: [PATCH 45/76] (describe_map): Shorten string to indicate shadowed binding. --- src/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/keymap.c b/src/keymap.c index 03b36d525b6..d25bf150b88 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -3371,7 +3371,7 @@ describe_map (map, prefix, elt_describer, partial, shadow, if (vect[i].shadowed) { SET_PT (PT - 1); - insert_string (" (binding currently shadowed)"); + insert_string (" (shadowed)"); SET_PT (PT + 1); } } From 5a893bff84978977970c442f868d16fa06bf53a2 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sat, 11 Mar 2006 15:25:13 +0000 Subject: [PATCH 46/76] *** empty log message *** --- etc/TODO | 4 ++++ lisp/ChangeLog | 14 ++++++++++++++ src/ChangeLog | 2 ++ 3 files changed, 20 insertions(+) diff --git a/etc/TODO b/etc/TODO index 34dec4f1de2..2f7951e2b4c 100644 --- a/etc/TODO +++ b/etc/TODO @@ -60,6 +60,10 @@ to the FSF. ** M-! M-n should fetch the buffer-file-name as the default. +** Redesign the load-history data structure so it can cope better + with evaluating definitions of the same function from different files, + recording which file the latest definition came from. + * Important features: ** Provide user-friendly ways to list all available font families, diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cf9ecfee24f..4d0af22c06d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,17 @@ +2006-03-11 Richard Stallman + + * mail/rmail.el (rmail-ignored-headers): Discard DomainKey-Signature. + + * eshell/eshell.el (eshell-prefer-to-shell): Variable deleted; + the way it is implemented is too unclean. + + * simple.el (kill-region, yank): Doc fix. + + * battery.el (battery-echo-area-format): Doc fix. + (battery-mode-line-format): Likewise. + (battery-linux-proc-apm, battery-linux-proc-acpi): Likewise. + (battery-linux-proc-acpi): Ignore batteries that say "charged". + 2006-03-11 Kurt Hornik * progmodes/octave-mod.el (octave-indent-for-comment): Behave diff --git a/src/ChangeLog b/src/ChangeLog index e83940cecd6..f11202c3064 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2006-03-11 Richard Stallman + * keymap.c (describe_map): Shorten string to indicate shadowed binding. + * vm-limit.c (get_lim_data, lim_data, data_space_start): Moved from mem-limits.h. (enum warnlevel): New data type. From 17849b4ae27f4609bf2ddc1aa7117c4f55f3e379 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Mar 2006 15:29:52 +0000 Subject: [PATCH 47/76] (ispell-menu-map-needed) [ispell-message]: Be visible only if major mode is Mail Mode. --- lisp/textmodes/ispell.el | 1 + 1 file changed, 1 insertion(+) diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el index b78ec1a8a92..cf82dbdd3db 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el @@ -1086,6 +1086,7 @@ The variable `ispell-library-directory' defines the library location." :help "Spell-check text in marked region")) (define-key ispell-menu-map [ispell-message] '(menu-item "Spell-Check Message" ispell-message + :visible (eq major-mode 'mail-mode) :help "Skip headers and included message text")) (define-key ispell-menu-map [ispell-buffer] '(menu-item "Spell-Check Buffer" ispell-buffer From 918555b804bef8d1a8121b9b7688affa35719540 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Mar 2006 15:36:15 +0000 Subject: [PATCH 48/76] (ispell-find-aspell-dictionaries): Add aliases before merging elements from the standard ispell-dictionary-alist. (ispell-aspell-add-aliases): Add aliases to the passed dictionary alist, and return the new alist. --- lisp/textmodes/ispell.el | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el index cf82dbdd3db..1991a73e8e2 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el @@ -899,14 +899,15 @@ and added as a submenu of the \"Edit\" menu.") (found (delq nil (mapcar #'ispell-aspell-find-dictionary dictionaries)))) + ;; Ensure aspell's alias dictionary will override standard + ;; definitions. + (setq found (ispell-aspell-add-aliases found)) ;; Merge into FOUND any elements from the standard ispell-dictionary-alist ;; which have no element in FOUND at all. (dolist (dict ispell-dictionary-alist) (unless (assoc (car dict) found) (setq found (nconc found (list dict))))) (setq ispell-dictionary-alist found) - - (ispell-aspell-add-aliases) ;; Add a default entry (let* ((english-dict (assoc "en" ispell-dictionary-alist)) (default-dict @@ -973,8 +974,9 @@ Assumes that value contains no whitespace." (file-error nil)))) -(defun ispell-aspell-add-aliases () - "Find aspell's dictionary aliases and add them to `ispell-dictionary-alist'." +(defun ispell-aspell-add-aliases (alist) + "Find aspell's dictionary aliases and add them to dictionary ALIST. +Return the new dictionary alist." (let ((aliases (file-expand-wildcards (concat (or ispell-aspell-dict-dir (setq ispell-aspell-dict-dir @@ -987,11 +989,12 @@ Assumes that value contains no whitespace." (when (search-forward-regexp "^add \\([^.]+\\)\\.multi" nil t) (let* ((aliasname (file-name-sans-extension (file-name-nondirectory alias-file))) - (already-exists-p (assoc aliasname ispell-dictionary-alist)) + (already-exists-p (assoc aliasname alist)) (realname (match-string 1)) - (realdict (assoc realname ispell-dictionary-alist))) + (realdict (assoc realname alist))) (when (and realdict (not already-exists-p)) - (push (cons aliasname (cdr realdict)) ispell-dictionary-alist)))))))) + (push (cons aliasname (cdr realdict)) alist)))))) + alist)) (defun ispell-valid-dictionary-list () "Returns a list of valid dictionaries. From a2f959632a58341e08d7bfccb85f8f8fb2587165 Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Sat, 11 Mar 2006 15:44:19 +0000 Subject: [PATCH 49/76] (yank): Escape double quote in doc string. --- lisp/simple.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/simple.el b/lisp/simple.el index 9ffd974311d..ac96798f8fa 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -2690,7 +2690,7 @@ doc string for `insert-for-yank-1', which see." nil) (defun yank (&optional arg) - "Reinsert (\"past") the last stretch of killed text. + "Reinsert (\"past\") the last stretch of killed text. More precisely, reinsert the stretch of killed text most recently killed OR yanked. Put point at end, and set mark at beginning. With just \\[universal-argument] as argument, same but put point at beginning (and mark at end). From d0ade325435264931e8e81bdee9dab83d1aa601e Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Mar 2006 15:45:47 +0000 Subject: [PATCH 50/76] [HAVE_GETRLIMIT]: Don't define unconditionally. Don't include sys/resource.h unless HAVE_GETRLIMIT is defined. --- src/vm-limit.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/vm-limit.c b/src/vm-limit.c index de31eda0cec..cadfb4cc95a 100644 --- a/src/vm-limit.c +++ b/src/vm-limit.c @@ -32,9 +32,6 @@ typedef void *POINTER; #endif #include "mem-limits.h" -#include - -#define HAVE_GETRLIMIT #ifdef HAVE_GETRLIMIT #include From 9257b6273afb9f97b64fa331623ffc0afdeb5382 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Mar 2006 15:46:24 +0000 Subject: [PATCH 51/76] *** empty log message *** --- etc/PROBLEMS | 4 ++++ src/ChangeLog | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/etc/PROBLEMS b/etc/PROBLEMS index 490c59aa922..de0dc31edff 100644 --- a/etc/PROBLEMS +++ b/etc/PROBLEMS @@ -1217,6 +1217,10 @@ resources to load all the colors it needs. A solution is to exit the offending X programs before starting Emacs. +"undefined color" messages can also occur if the RgbPath entry in the +X configuration file is incorrect, or the rgb.txt file is not where +X expects to find it. + *** Improving performance with slow X connections. There are several ways to improve this performance, any subset of which can diff --git a/src/ChangeLog b/src/ChangeLog index f11202c3064..cfac9120ce6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2006-03-11 Eli Zaretskii + + * vm-limit.c [HAVE_GETRLIMIT]: Don't define unconditionally. + Don't include sys/resource.h unless defined. + 2006-03-11 Richard Stallman * keymap.c (describe_map): Shorten string to indicate shadowed binding. From a2a103bbe128dd10d70607e6e40882781154aade Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Mar 2006 16:00:50 +0000 Subject: [PATCH 52/76] (unwind_to_catch): Call x_fully_uncatch_errors only if HAVE_X_WINDOWS. (internal_condition_case, internal_condition_case_1) (internal_condition_case_2): Call x_catching_errors only if HAVE_X_WINDOWS. --- src/eval.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/eval.c b/src/eval.c index 435667e4d50..86ee384896c 100644 --- a/src/eval.c +++ b/src/eval.c @@ -1259,9 +1259,11 @@ unwind_to_catch (catch, value) } while (! last_time); +#if HAVE_X_WINDOWS /* If x_catch_errors was done, turn it off now. (First we give unbind_to a chance to do that.) */ x_fully_uncatch_errors (); +#endif byte_stack_list = catch->byte_stack; gcprolist = catch->gcpro; @@ -1441,8 +1443,10 @@ internal_condition_case (bfun, handlers, hfun) /* Since Fsignal will close off all calls to x_catch_errors, we will get the wrong results if some are not closed now. */ +#if HAVE_X_WINDOWS if (x_catching_errors ()) abort (); +#endif c.tag = Qnil; c.val = Qnil; @@ -1487,8 +1491,10 @@ internal_condition_case_1 (bfun, arg, handlers, hfun) /* Since Fsignal will close off all calls to x_catch_errors, we will get the wrong results if some are not closed now. */ +#if HAVE_X_WINDOWS if (x_catching_errors ()) abort (); +#endif c.tag = Qnil; c.val = Qnil; @@ -1536,8 +1542,10 @@ internal_condition_case_2 (bfun, nargs, args, handlers, hfun) /* Since Fsignal will close off all calls to x_catch_errors, we will get the wrong results if some are not closed now. */ +#if HAVE_X_WINDOWS if (x_catching_errors ()) abort (); +#endif c.tag = Qnil; c.val = Qnil; From 8887e8ecde2627de182150b9f29221db71a9567e Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Mar 2006 16:01:21 +0000 Subject: [PATCH 53/76] *** empty log message *** --- lisp/ChangeLog | 3 +++ src/ChangeLog | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4d0af22c06d..346d947e99e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -19,6 +19,9 @@ 2006-03-11 Agustin Martin + * textmodes/ispell.el (ispell-menu-map-needed) [ispell-message]: + Be visible only if major mode is Mail Mode. + * textmodes/flyspell.el (flyspell-external-point-words) (flyspell-process-localwords): Fix last changes. diff --git a/src/ChangeLog b/src/ChangeLog index cfac9120ce6..60137731f84 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,11 @@ 2006-03-11 Eli Zaretskii + * eval.c (unwind_to_catch): Call x_fully_uncatch_errors only if + HAVE_X_WINDOWS. + (internal_condition_case, internal_condition_case_1) + (internal_condition_case_2): Call x_catching_errors only if + HAVE_X_WINDOWS. + * vm-limit.c [HAVE_GETRLIMIT]: Don't define unconditionally. Don't include sys/resource.h unless defined. From 16ca6226363d54b7b21df93311cc684a563e6a05 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Mar 2006 16:02:38 +0000 Subject: [PATCH 54/76] Add x_fully_uncatch_errors and x_catching_errors to the list of unused display error handling functions. --- src/w32term.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/w32term.c b/src/w32term.c index 37139614e24..3ffe00dd314 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -5236,6 +5236,8 @@ x_error_catcher (display, error) x_catch_errors (dpy) x_catch_errors_unwind (old_val) x_check_errors (dpy, format) +x_fully_uncatch_errors () +x_catching_errors () x_had_errors_p (dpy) x_clear_errors (dpy) x_uncatch_errors (dpy, count) From db3c0e9c358cbea65121d8aef50060537a8c6844 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Mar 2006 16:03:03 +0000 Subject: [PATCH 55/76] *** empty log message *** --- lisp/ChangeLog | 7 +++++++ src/ChangeLog | 3 +++ 2 files changed, 10 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 346d947e99e..51c59046cc2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2006-03-11 David Ponce + + * ispell.el (ispell-find-aspell-dictionaries): Add aliases before + merging elements from the standard ispell-dictionary-alist. + (ispell-aspell-add-aliases): Add aliases to the passed dictionary + alist, and return the new alist. + 2006-03-11 Richard Stallman * mail/rmail.el (rmail-ignored-headers): Discard DomainKey-Signature. diff --git a/src/ChangeLog b/src/ChangeLog index 60137731f84..59657be1d56 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2006-03-11 Eli Zaretskii + * w32term.c: Add x_fully_uncatch_errors and x_catching_errors to + the list of unused display error handling functions. + * eval.c (unwind_to_catch): Call x_fully_uncatch_errors only if HAVE_X_WINDOWS. (internal_condition_case, internal_condition_case_1) From 710cb0d0553152ab4236b4f5c449b14d47d03fa5 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Mar 2006 16:18:20 +0000 Subject: [PATCH 56/76] (rmail-summary-next-msg): Skip deleted messages, where "D" is the 6th character. --- lisp/mail/rmailsum.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el index 539a1769386..c029e6e2268 100644 --- a/lisp/mail/rmailsum.el +++ b/lisp/mail/rmailsum.el @@ -535,7 +535,7 @@ messages, or backward if NUMBER is negative." (search (if (> number 0) 're-search-forward 're-search-backward)) (non-del-msg-found nil)) (while (and (> count 0) (setq non-del-msg-found - (or (funcall search "^....[^D]" nil t) + (or (funcall search "^.....[^D]" nil t) non-del-msg-found))) (setq count (1- count)))) (beginning-of-line) From e6a0d3ebc8c2bc59f1d98abbc04090e66c0e8d77 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Mar 2006 16:25:36 +0000 Subject: [PATCH 57/76] (x_create_tip_frame): Preserve received parms by copying them. --- src/xfns.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/xfns.c b/src/xfns.c index ede53262f5f..2ab185a3c2d 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -4637,6 +4637,7 @@ x_create_tip_frame (dpyinfo, parms, text) check_x (); + parms = Fcopy_alist (parms); #ifdef MULTI_KBOARD kb = dpyinfo->kboard; From f161146b7eddd861ef6f0537ee5a851a659b2137 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Mar 2006 16:26:31 +0000 Subject: [PATCH 58/76] *** empty log message *** --- lisp/ChangeLog | 4 ++++ src/ChangeLog | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 51c59046cc2..15805e16afb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2006-03-11 Eli Zaretskii + + * simple.el (yank): Fix last change. + 2006-03-11 David Ponce * ispell.el (ispell-find-aspell-dictionaries): Add aliases before diff --git a/src/ChangeLog b/src/ChangeLog index 59657be1d56..80eb880df73 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2006-03-11 David Ponce + + * xfns.c (x_create_tip_frame): Preserve received parms by copying + them. + 2006-03-11 Eli Zaretskii * w32term.c: Add x_fully_uncatch_errors and x_catching_errors to From b48f927687d9ec3dc9e9903a059fb471f4b2d165 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Mar 2006 16:31:39 +0000 Subject: [PATCH 59/76] (w32_wnd_proc): Ignore middle and extra button events if a menu is already active (the menubar_active flag is on). --- src/w32fns.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/w32fns.c b/src/w32fns.c index 34450fd5219..c116c51603b 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -3250,6 +3250,11 @@ w32_wnd_proc (hwnd, msg, wParam, lParam) BOOL up; int button; + /* Ignore middle and extra buttons as long as the menu is active. */ + f = x_window_to_frame (dpyinfo, hwnd); + if (f && f->output_data.w32->menubar_active) + return 0; + if (parse_button (msg, HIWORD (wParam), &button, &up)) { if (up) ReleaseCapture (); From 2c1bd367aad6bd4229f769ef4a50b2e2888bf958 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Mar 2006 16:32:09 +0000 Subject: [PATCH 60/76] *** empty log message *** --- lisp/ChangeLog | 5 +++++ src/ChangeLog | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 15805e16afb..db6be0a6e99 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2006-03-11 Ryan Yeske + + * mail/rmailsum.el (rmail-summary-next-msg): Skip deleted + messages, where "D" is the 6th character. + 2006-03-11 Eli Zaretskii * simple.el (yank): Fix last change. diff --git a/src/ChangeLog b/src/ChangeLog index 80eb880df73..bef64046ae1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2006-03-11 Eli Zaretskii + + * w32fns.c (w32_wnd_proc): Ignore middle and extra button events + if a menu is already active (the menubar_active flag is on). + 2006-03-11 David Ponce * xfns.c (x_create_tip_frame): Preserve received parms by copying From 66fe93d1c2e84e08577b6bd8666abff0cfcb50dd Mon Sep 17 00:00:00 2001 From: Luc Teirlinck Date: Sat, 11 Mar 2006 16:46:38 +0000 Subject: [PATCH 61/76] Rename preserve_y to window_scroll_pixel_based_preserve_y. (window_scroll_pixel_based, syms_of_window): Adapt to above change. --- src/window.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/window.c b/src/window.c index cc453941304..c8067f9035d 100644 --- a/src/window.c +++ b/src/window.c @@ -217,7 +217,7 @@ int window_deletion_count; /* Used by the function window_scroll_pixel_based */ -static int preserve_y; +static int window_scroll_pixel_based_preserve_y; #if 0 /* This isn't used anywhere. */ /* Nonzero means we can split a frame even if it is "unsplittable". */ @@ -4795,17 +4795,17 @@ window_scroll_pixel_based (window, n, whole, noerror) calls to scroll-up or scroll-down. This avoids the possibility of point becoming "stuck" on a tall line when scrolling by one line. */ - if (preserve_y < 0 + if (window_scroll_pixel_based_preserve_y < 0 || (current_kboard->Vlast_command != Qscroll_up && current_kboard->Vlast_command != Qscroll_down)) { start_display (&it, w, start); move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS); - preserve_y = it.current_y; + window_scroll_pixel_based_preserve_y = it.current_y; } } else - preserve_y = -1; + window_scroll_pixel_based_preserve_y = -1; /* Move iterator it from start the specified distance forward or backward. The result is the new window start. */ @@ -4935,12 +4935,13 @@ window_scroll_pixel_based (window, n, whole, noerror) || EQ (Vscroll_preserve_screen_position, Qt))) /* We found PT at a legitimate height. Leave it alone. */ ; - else if (preserve_y >= 0) + else if (window_scroll_pixel_based_preserve_y >= 0) { /* If we have a header line, take account of it. This is necessary because we set it.current_y to 0, above. */ move_it_to (&it, -1, -1, - preserve_y - (WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0 ), + window_scroll_pixel_based_preserve_y + - (WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0 ), -1, MOVE_TO_Y); SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it)); } @@ -4961,7 +4962,8 @@ window_scroll_pixel_based (window, n, whole, noerror) int charpos, bytepos; int partial_p; - /* Save our position, for the preserve_y case. */ + /* Save our position, for the + window_scroll_pixel_based_preserve_y case. */ charpos = IT_CHARPOS (it); bytepos = IT_BYTEPOS (it); @@ -4991,14 +4993,15 @@ window_scroll_pixel_based (window, n, whole, noerror) || EQ (Vscroll_preserve_screen_position, Qt))) /* We found PT before we found the display margin, so PT is ok. */ ; - else if (preserve_y >= 0) + else if (window_scroll_pixel_based_preserve_y >= 0) { SET_TEXT_POS_FROM_MARKER (start, w->start); start_display (&it, w, start); /* It would be wrong to subtract CURRENT_HEADER_LINE_HEIGHT here because we called start_display again and did not alter it.current_y this time. */ - move_it_to (&it, -1, -1, preserve_y, -1, MOVE_TO_Y); + move_it_to (&it, -1, -1, window_scroll_pixel_based_preserve_y, -1, + MOVE_TO_Y); SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it)); } else @@ -7025,7 +7028,7 @@ syms_of_window () minibuf_selected_window = Qnil; staticpro (&minibuf_selected_window); - preserve_y = -1; + window_scroll_pixel_based_preserve_y = -1; DEFVAR_LISP ("temp-buffer-show-function", &Vtemp_buffer_show_function, doc: /* Non-nil means call as function to display a help buffer. From f372bd5b0faf05a3e82bcd79d9bd215aad58d6cb Mon Sep 17 00:00:00 2001 From: Luc Teirlinck Date: Sat, 11 Mar 2006 17:00:13 +0000 Subject: [PATCH 62/76] *** empty log message *** --- lisp/ChangeLog | 4 ++++ src/ChangeLog | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index db6be0a6e99..146398f2de3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2006-03-11 Luc Teirlinck + + * simple.el (yank): Fix typo in docstring. + 2006-03-11 Ryan Yeske * mail/rmailsum.el (rmail-summary-next-msg): Skip deleted diff --git a/src/ChangeLog b/src/ChangeLog index bef64046ae1..389538b1617 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2006-03-11 Luc Teirlinck + + * window.c: Rename preserve_y to window_scroll_pixel_based_preserve_y. + (window_scroll_pixel_based, syms_of_window): Adapt to above change. + 2006-03-11 Eli Zaretskii * w32fns.c (w32_wnd_proc): Ignore middle and extra button events @@ -39,7 +44,7 @@ * xterm.c (x_fully_uncatch_errors, x_catching_errors): New functions. * eval.c (unwind_to_catch): Call x_fully_uncatch_errors. - (internal_condition_case_1, internal_condition_case_2): + (internal_condition_case_1, internal_condition_case_2): Abort if within unclosed x_catch_errors. 2006-03-11 Romain Francoise From f894e67124f1775e479d69078b67e7e5c15c94ff Mon Sep 17 00:00:00 2001 From: Luc Teirlinck Date: Sat, 11 Mar 2006 17:01:47 +0000 Subject: [PATCH 63/76] (yank): Fix typo in docstring. --- lisp/simple.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/simple.el b/lisp/simple.el index ac96798f8fa..73a28072a78 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -2690,7 +2690,7 @@ doc string for `insert-for-yank-1', which see." nil) (defun yank (&optional arg) - "Reinsert (\"past\") the last stretch of killed text. + "Reinsert (\"paste\") the last stretch of killed text. More precisely, reinsert the stretch of killed text most recently killed OR yanked. Put point at end, and set mark at beginning. With just \\[universal-argument] as argument, same but put point at beginning (and mark at end). From 77e463b09b1497c8b9195a74b6f928956fa0bef5 Mon Sep 17 00:00:00 2001 From: Luc Teirlinck Date: Sat, 11 Mar 2006 21:18:15 +0000 Subject: [PATCH 64/76] (Regexps): Use @samp for regexp that is not in Lisp syntax. --- man/search.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/search.texi b/man/search.texi index 4afcba837e9..a38f56e3f26 100644 --- a/man/search.texi +++ b/man/search.texi @@ -689,7 +689,7 @@ never remove the special meaning of @samp{-} or @samp{]}. So you should not quote these characters when they have no special meaning either. This would not clarify anything, since backslashes can legitimately precede these characters where they @emph{have} special -meaning, as in @code{[^\]} (@code{"[^\\]"} for Lisp string syntax), +meaning, as in @samp{[^\]} (@code{"[^\\]"} for Lisp string syntax), which matches any single character except a backslash. @node Regexp Backslash From 6f49b4c5137e1857d542fc416714107ecdb61092 Mon Sep 17 00:00:00 2001 From: Luc Teirlinck Date: Sat, 11 Mar 2006 21:21:57 +0000 Subject: [PATCH 65/76] *** empty log message *** --- lispref/ChangeLog | 5 +++++ man/ChangeLog | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/lispref/ChangeLog b/lispref/ChangeLog index 253c858f608..7b9d8ca6589 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog @@ -1,3 +1,8 @@ +2006-03-11 Luc Teirlinck + + * searching.texi (Regexp Special): Use @samp for regular + expressions that are not in Lisp syntax. + 2006-03-08 Luc Teirlinck * searching.texi (Regexp Special): Put remark between parentheses diff --git a/man/ChangeLog b/man/ChangeLog index ca301d27c03..385a8c81ea0 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,8 @@ +2006-03-11 Luc Teirlinck + + * search.texi (Regexps): Use @samp for regexp that is not in Lisp + syntax. + 2006-03-10 Katsumi Yamaoka * gnus.texi (NoCeM): Mention gnus-use-nocem can also be a number. @@ -85,7 +90,7 @@ (Electric Keys): Add a justification for electric indentation. (Hungry WS Deletion): Clear up the names and complications of the BACKSPACE and DELETE keys. - + 2006-02-23 Juri Linkov * faq.texi (Common requests): Move `Turning on auto-fill by @@ -130,7 +135,7 @@ * emacs.texi: Use @smallbook. (Top): Update ref to Emacs paper, delete ref to Cookbook. Update subnode menu. - + * building.texi (Lisp Interaction): Minor addition. 2006-02-18 Nick Roberts From ba44fca9cd7716cb93ec4fc914f917dd3fad1442 Mon Sep 17 00:00:00 2001 From: Luc Teirlinck Date: Sat, 11 Mar 2006 21:23:11 +0000 Subject: [PATCH 66/76] (Regexp Special): Use @samp for regular expressions that are not in Lisp syntax. --- lispref/searching.texi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lispref/searching.texi b/lispref/searching.texi index 88009152cc0..9b80fdfd930 100644 --- a/lispref/searching.texi +++ b/lispref/searching.texi @@ -476,7 +476,7 @@ never remove the special meaning of @samp{-} or @samp{]}. So you should not quote these characters when they have no special meaning either. This would not clarify anything, since backslashes can legitimately precede these characters where they @emph{have} special -meaning, as in @code{[^\]} (@code{"[^\\]"} for Lisp string syntax), +meaning, as in @samp{[^\]} (@code{"[^\\]"} for Lisp string syntax), which matches any single character except a backslash. In practice, most @samp{]} that occur in regular expressions close a @@ -485,8 +485,8 @@ regular expression may try to match a complex pattern of literal @samp{[} and @samp{]}. In such situations, it sometimes may be necessary to carefully parse the regexp from the start to determine which square brackets enclose a character alternative. For example, -@code{[^][]]} consists of the complemented character alternative -@code{[^][]} (which matches any single character that is not a square +@samp{[^][]]} consists of the complemented character alternative +@samp{[^][]} (which matches any single character that is not a square bracket), followed by a literal @samp{]}. The exact rules are that at the beginning of a regexp, @samp{[} is From c93b1b4b30b107b1b54c663e5de092a1641e93b9 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Sat, 11 Mar 2006 22:34:46 +0000 Subject: [PATCH 67/76] (battery-linux-proc-acpi): Check `capacity' for non-nil before comparing with `low' and `warn'. --- lisp/battery.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/battery.el b/lisp/battery.el index 65b8baff66c..34f74aa9932 100644 --- a/lisp/battery.el +++ b/lisp/battery.el @@ -391,8 +391,8 @@ The following %-sequences are provided: rate-type)) "N/A")) (cons ?B (or charging-state "N/A")) (cons ?b (or (and (string= charging-state "charging") "+") - (and (< capacity low) "!") - (and (< capacity warn) "-") + (and capacity (< capacity low) "!") + (and capacity (< capacity warn) "-") "")) (cons ?h (or (and hours (number-to-string hours)) "N/A")) (cons ?m (or (and minutes (number-to-string minutes)) "N/A")) From 2d19a2a4368d4d0d55f6bcb4e0680a555c3adf14 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Sat, 11 Mar 2006 22:35:51 +0000 Subject: [PATCH 68/76] (Info-dir-remove-duplicates): Move point to the beginning of the current line after deleting the entries from redundant heading. Use marker for `limit' and compare it with point before calling `re-search-forward'. --- lisp/ChangeLog | 10 ++++++++++ lisp/info.el | 11 +++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 146398f2de3..50aa28d3b4a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2006-03-12 Juri Linkov + + * battery.el (battery-linux-proc-acpi): Check `capacity' for non-nil + before comparing with `low' and `warn'. + + * info.el (Info-dir-remove-duplicates): Move point to the + beginning of the current line after deleting the entries from + redundant heading. Use marker for `limit' and compare it with + point before calling `re-search-forward'. + 2006-03-11 Luc Teirlinck * simple.el (yank): Fix typo in docstring. diff --git a/lisp/info.el b/lisp/info.el index 43ee5cabcbc..a4cae949977 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -1196,7 +1196,9 @@ a case-insensitive match is tried." (point) (if (re-search-forward "^[^* \n\t]" nil t) (match-beginning 0) - (or limit (point-max)))) entries)))) + (or limit (point-max)))) + entries) + (forward-line 0)))) ;; Insert the entries just found. (while (= (line-beginning-position 0) (1- (point))) (backward-char)) @@ -1207,10 +1209,11 @@ a case-insensitive match is tried." ;; Now remove duplicate entries under the same heading. (let ((seen nil) - (limit (point))) + (limit (point-marker))) (goto-char start) - (while (re-search-forward "^* \\([^:\n]+:\\(:\\|[^.\n]+\\).\\)" - limit 'move) + (while (and (> limit (point)) + (re-search-forward "^* \\([^:\n]+:\\(:\\|[^.\n]+\\).\\)" + limit 'move)) ;; Fold case straight away; `member-ignore-case' here wasteful. (let ((x (downcase (match-string 1)))) (if (member x seen) From 2d14c9bf50c2a042f0f7bda8f15aeafe43c110d8 Mon Sep 17 00:00:00 2001 From: Luc Teirlinck Date: Sat, 11 Mar 2006 22:37:08 +0000 Subject: [PATCH 69/76] *** empty log message *** --- lispref/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lispref/ChangeLog b/lispref/ChangeLog index 7b9d8ca6589..9dbcd41f5a0 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog @@ -1,5 +1,9 @@ 2006-03-11 Luc Teirlinck + * text.texi (Adaptive Fill): Fix Texinfo usage. + + * strings.texi (Creating Strings): Fix Texinfo usage. + * searching.texi (Regexp Special): Use @samp for regular expressions that are not in Lisp syntax. From 2c676341953c28fb8194b197966d90e2277fe920 Mon Sep 17 00:00:00 2001 From: Bill Wohler Date: Sat, 11 Mar 2006 22:39:35 +0000 Subject: [PATCH 70/76] (Defining Images): Add image-load-path-for-library. --- lispref/ChangeLog | 4 ++++ lispref/display.texi | 29 +++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/lispref/ChangeLog b/lispref/ChangeLog index 9dbcd41f5a0..23e6b78b130 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog @@ -1,3 +1,7 @@ +2006-03-11 Bill Wohler + + * display.texi (Defining Images): Add image-load-path-for-library. + 2006-03-11 Luc Teirlinck * text.texi (Adaptive Fill): Fix Texinfo usage. diff --git a/lispref/display.texi b/lispref/display.texi index b9d949a01dd..5053d7def39 100644 --- a/lispref/display.texi +++ b/lispref/display.texi @@ -4125,6 +4125,35 @@ should specify the image as follows: @end example @end defvar +@defun image-load-path-for-library library image &optional path no-error +Return a suitable search path for images relative to @var{library}. + +Images for @var{library} are searched for in @file{../../etc/images} +and @file{../etc/images} relative to the files in +@file{lisp/@var{library}} as well as in @code{image-load-path} and +@var{load-path}. + +This function returns the value of @code{load-path} augmented with the +directory containing @var{image}. If @var{path} is given, it is used +instead of @code{load-path}. If @code{path} is @code{t}, just return +the directory that contains @var{image}. + +If @var{no-error} is non-nil, this function returns @code{nil} if a +suitable path can't be found rather than signaling an error. + +Here is an example that uses a common idiom to provide compatibility +with versions of Emacs that lack the variable @code{image-load-path}: + +@example +(let ((load-path + (image-load-path-for-library "mh-e" "mh-logo.xpm")) + (image-load-path + (image-load-path-for-library "mh-e" "mh-logo.xpm" + 'image-load-path))) + (mh-tool-bar-folder-buttons-init)) +@end example +@end defun + @node Showing Images @subsection Showing Images From 3b42af63b15ff2fdc7242f450a327bfacb2cbdb1 Mon Sep 17 00:00:00 2001 From: Luc Teirlinck Date: Sat, 11 Mar 2006 22:41:41 +0000 Subject: [PATCH 71/76] (Adaptive Fill): Fix Texinfo usage. --- lispref/text.texi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lispref/text.texi b/lispref/text.texi index 7b384033c11..c68a55bedc7 100644 --- a/lispref/text.texi +++ b/lispref/text.texi @@ -1716,7 +1716,7 @@ Adaptive Fill mode matches this regular expression against the text starting after the left margin whitespace (if any) on a line; the characters it matches are that line's candidate for the fill prefix. -@w{@samp{"[ \t]*\\([-|#;>*]+[ \t]*\\|(?[0-9]+[.)][ \t]*\\)*"}} is the +@w{@code{"[ \t]*\\([-|#;>*]+[ \t]*\\|(?[0-9]+[.)][ \t]*\\)*"}} is the default value. This matches a number enclosed in parentheses or followed by a period, or certain punctuation characters, or any sequence of these intermingled with whitespace. In particular, it @@ -1731,7 +1731,7 @@ prefix: the candidate must match this regular expression, or match replaces the candidate with a string of spaces ``of the same width'' as it. -The default value of this variable is @w{@samp{"\\`[ \t]*\\'"}}, which +The default value of this variable is @w{@code{"\\`[ \t]*\\'"}}, which matches only a string of whitespace. The effect of this default is to force the fill prefixes found in one-line paragraphs always to be pure whitespace. From bed0f7b24625f0e2f6e6b3c8a222aac1165c00fc Mon Sep 17 00:00:00 2001 From: Luc Teirlinck Date: Sat, 11 Mar 2006 22:42:14 +0000 Subject: [PATCH 72/76] (Creating Strings): Fix Texinfo usage. --- lispref/strings.texi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lispref/strings.texi b/lispref/strings.texi index e722b74e54c..d7111eaa722 100644 --- a/lispref/strings.texi +++ b/lispref/strings.texi @@ -293,7 +293,7 @@ null strings are always omitted from the result. Thus: @result{} ("two" "words") @end example -The result is not @samp{("" "two" "words" "")}, which would rarely be +The result is not @code{("" "two" "words" "")}, which would rarely be useful. If you need such a result, use an explicit value for @var{separators}: @@ -355,7 +355,7 @@ practice: @defvar split-string-default-separators The default value of @var{separators} for @code{split-string}. Its -usual value is @w{@samp{"[ \f\t\n\r\v]+"}}. +usual value is @w{@code{"[ \f\t\n\r\v]+"}}. @end defvar @node Modifying Strings From 70594a46b1eaff93f7e94b5cc8f8d8ed19ef4e7e Mon Sep 17 00:00:00 2001 From: Bill Wohler Date: Sat, 11 Mar 2006 22:43:44 +0000 Subject: [PATCH 73/76] (Defining Images): Add @tindex for image-load-path-for-library. --- lispref/display.texi | 1 + 1 file changed, 1 insertion(+) diff --git a/lispref/display.texi b/lispref/display.texi index 5053d7def39..cd46be95b05 100644 --- a/lispref/display.texi +++ b/lispref/display.texi @@ -4126,6 +4126,7 @@ should specify the image as follows: @end defvar @defun image-load-path-for-library library image &optional path no-error +@tindex image-load-path-for-library Return a suitable search path for images relative to @var{library}. Images for @var{library} are searched for in @file{../../etc/images} From d5b083767469f6fa414fa6ce1bae28c5a7f73be2 Mon Sep 17 00:00:00 2001 From: Bill Wohler Date: Sat, 11 Mar 2006 22:49:40 +0000 Subject: [PATCH 74/76] Document `image-load-path-for-library'. Note that all images have been moved from lisp into etc/images in `find-image' item. Fix typo in `copy-tree' --- etc/ChangeLog | 6 ++++++ etc/NEWS | 11 ++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/etc/ChangeLog b/etc/ChangeLog index 4e45799c5fc..624e38d5e81 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,9 @@ +2006-03-11 Bill Wohler + + * NEWS: Document `image-load-path-for-library'. Note that all + images have been moved from lisp into etc/images in `find-image' + item. Fix typo in `copy-tree' + 2006-03-09 Reiner Steib * TUTORIAL.de: Replace "Schreiben" by "Dr,A|(Bcken" where appropriate. diff --git a/etc/NEWS b/etc/NEWS index ae7ae7f649e..b7d93fe51bb 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -3491,7 +3491,7 @@ associates a numeric ordering of each element added to the list. +++ *** New function `copy-tree' makes a copy of a tree. -It recursively copyies through both CARs and CDRs. +It recursively copies through both CARs and CDRs. +++ *** New function `delete-dups' deletes `equal' duplicate elements from a list. @@ -4884,6 +4884,15 @@ explicitly; for example, if an image is put in etc/images/foo/bar.xpm: (defimage foo-image '((:type xpm :file "foo/bar.xpm"))) +Note that all images formerly located in the lisp directory have been +moved to etc/images. + ++++ +*** New function `image-load-path-for-library' returns a suitable +search path for images relative to library. This function is useful in +external packages to save users from having to update +`image-load-path'. + +++ *** The new variable `max-image-size' defines the maximum size of images that Emacs will load and display. From 5996fb093492a145304766270f8099582114c7f5 Mon Sep 17 00:00:00 2001 From: Bill Wohler Date: Sat, 11 Mar 2006 22:50:06 +0000 Subject: [PATCH 75/76] Add period to last sentence added. --- etc/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/ChangeLog b/etc/ChangeLog index 624e38d5e81..2a49b574ce6 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -2,7 +2,7 @@ * NEWS: Document `image-load-path-for-library'. Note that all images have been moved from lisp into etc/images in `find-image' - item. Fix typo in `copy-tree' + item. Fix typo in `copy-tree'. 2006-03-09 Reiner Steib From 8cf1c5a44266bbd0f9919e854deee1d7361facd1 Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Sat, 11 Mar 2006 23:42:49 +0000 Subject: [PATCH 76/76] Revision: emacs@sv.gnu.org/emacs--devo--0--patch-151 Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 57) - Copy/update icons from Gnus trunk --- etc/ChangeLog | 23 ++ etc/images/attach.xpm | 126 ++++++++++ etc/images/connect.xpm | 85 +++++++ etc/images/contact.xpm | 129 +++++++++++ etc/images/delete.xpm | 270 ++++++++++++++++++++++ etc/images/describe.xpm | 95 ++++++++ etc/images/disconnect.xpm | 69 ++++++ etc/images/exit.xpm | 201 +++++++++++++--- etc/images/gnus/toggle-subscription.xpm | 58 +++++ etc/images/lock-broken.xpm | 231 +++++++++++++++++++ etc/images/lock-ok.xpm | 215 +++++++++++++++++ etc/images/lock.xpm | 227 ++++++++++++++++++ etc/images/mail/compose.xpm | 262 +++++++++++++++++---- etc/images/mail/copy.xpm | 104 +++++++++ etc/images/mail/forward.xpm | 92 ++++++++ etc/images/mail/inbox.xpm | 103 +++++++++ etc/images/mail/move.xpm | 103 +++++++++ etc/images/mail/not-spam.xpm | 149 ++++++++++++ etc/images/mail/outbox.xpm | 96 ++++++++ etc/images/mail/preview.xpm | 178 +++++++++++++++ etc/images/mail/reply-all.xpm | 212 ++++++++++++++--- etc/images/mail/reply.xpm | 118 +++++++--- etc/images/mail/save-draft.xpm | 99 ++++++++ etc/images/mail/save.xpm | 291 ++++++++++++++++++++++++ etc/images/mail/send.xpm | 122 ++++++---- etc/images/mail/spam.xpm | 217 ++++++++++++++++++ etc/images/next-page.xpm | 119 ++++++++++ etc/images/refresh.xpm | 2 +- etc/images/separator.xpm | 29 +++ etc/images/sort-ascending.xpm | 33 +++ etc/images/sort-column-ascending.xpm | 29 +++ etc/images/sort-criteria.xpm | 55 +++++ etc/images/sort-descending.xpm | 33 +++ etc/images/sort-row-ascending.xpm | 22 ++ 34 files changed, 4017 insertions(+), 180 deletions(-) create mode 100644 etc/images/attach.xpm create mode 100644 etc/images/connect.xpm create mode 100644 etc/images/contact.xpm create mode 100644 etc/images/delete.xpm create mode 100644 etc/images/describe.xpm create mode 100644 etc/images/disconnect.xpm create mode 100644 etc/images/gnus/toggle-subscription.xpm create mode 100644 etc/images/lock-broken.xpm create mode 100644 etc/images/lock-ok.xpm create mode 100644 etc/images/lock.xpm create mode 100644 etc/images/mail/copy.xpm create mode 100644 etc/images/mail/forward.xpm create mode 100644 etc/images/mail/inbox.xpm create mode 100644 etc/images/mail/move.xpm create mode 100644 etc/images/mail/not-spam.xpm create mode 100644 etc/images/mail/outbox.xpm create mode 100644 etc/images/mail/preview.xpm create mode 100644 etc/images/mail/save-draft.xpm create mode 100644 etc/images/mail/save.xpm create mode 100644 etc/images/mail/spam.xpm create mode 100644 etc/images/next-page.xpm create mode 100644 etc/images/separator.xpm create mode 100644 etc/images/sort-ascending.xpm create mode 100644 etc/images/sort-column-ascending.xpm create mode 100644 etc/images/sort-criteria.xpm create mode 100644 etc/images/sort-descending.xpm create mode 100644 etc/images/sort-row-ascending.xpm diff --git a/etc/ChangeLog b/etc/ChangeLog index 2a49b574ce6..eb85856cdb0 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,26 @@ +2006-03-11 Miles Bader + + * images/mail: New directory. + * images/attach.xpm, images/connect.xpm: + * images/contact.xpm, images/delete.xpm: + * images/describe.xpm, images/disconnect.xpm: + * images/exit.xpm, images/gnus/toggle-subscription.xpm: + * images/lock-broken.xpm, images/lock-ok.xpm: + * images/lock.xpm, images/mail/compose.xpm: + * images/mail/copy.xpm, images/mail/forward.xpm: + * images/mail/inbox.xpm, images/mail/move.xpm: + * images/mail/not-spam.xpm, images/mail/outbox.xpm: + * images/mail/preview.xpm, images/mail/reply-all.xpm: + * images/mail/reply.xpm, images/mail/save-draft.xpm: + * images/mail/save.xpm, images/mail/send.xpm: + * images/mail/spam.xpm, images/next-page.xpm: + * images/refresh.xpm, images/separator.xpm: + * images/sort-ascending.xpm: + * images/sort-column-ascending.xpm: + * images/sort-criteria.xpm, images/sort-descending.xpm: + * images/sort-row-ascending.xpm: + New icons, copied from Gnus trunk (originally from Gnome 2.6). + 2006-03-11 Bill Wohler * NEWS: Document `image-load-path-for-library'. Note that all diff --git a/etc/images/attach.xpm b/etc/images/attach.xpm new file mode 100644 index 00000000000..e3298c910a6 --- /dev/null +++ b/etc/images/attach.xpm @@ -0,0 +1,126 @@ +/* XPM */ +static char * stock_attach_xpm[] = { +"24 24 99 2", +" c None", +". c #000000", +"+ c #010101", +"@ c #515151", +"# c #9A9A9A", +"$ c #CFCFCF", +"% c #6F6F6F", +"& c #464646", +"* c #A5A5A5", +"= c #E2E2E2", +"- c #FFFFFF", +"; c #F6F6F6", +"> c #8A8A8A", +", c #393939", +"' c #1C1C1C", +") c #8B8B8B", +"! c #E6E6E6", +"~ c #EEEEEE", +"{ c #E1E1E1", +"] c #F8F8F8", +"^ c #F7F7F7", +"/ c #CCCCCC", +"( c #565656", +"_ c #3E3E3E", +": c #818181", +"< c #D4D4D4", +"[ c #E7E7E7", +"} c #D7D7D7", +"| c #FAFAFA", +"1 c #F9F9F9", +"2 c #C2C2C2", +"3 c #CBCBCB", +"4 c #F5F5F5", +"5 c #D9D9D9", +"6 c #030303", +"7 c #545454", +"8 c #DEDEDE", +"9 c #B3B3B3", +"0 c #797979", +"a c #F4F4F4", +"b c #9D9D9D", +"c c #282828", +"d c #FBFBFB", +"e c #A6A6A6", +"f c #C5C5C5", +"g c #F0F0F0", +"h c #CACACA", +"i c #C7C7C7", +"j c #F2F2F2", +"k c #CECECE", +"l c #C4C4C4", +"m c #D5D5D5", +"n c #DADADA", +"o c #F3F3F3", +"p c #858585", +"q c #BEBEBE", +"r c #D3D3D3", +"s c #DCDCDC", +"t c #9C9C9C", +"u c #484848", +"v c #A7A7A7", +"w c #D6D6D6", +"x c #C8C8C8", +"y c #C6C6C6", +"z c #4C4C4C", +"A c #EAEAEA", +"B c #E5E5E5", +"C c #D8D8D8", +"D c #ADADAD", +"E c #BCBCBC", +"F c #E0E0E0", +"G c #F1F1F1", +"H c #909090", +"I c #686868", +"J c #A2A2A2", +"K c #C0C0C0", +"L c #C1C1C1", +"M c #787878", +"N c #AEAEAE", +"O c #151515", +"P c #D0D0D0", +"Q c #979797", +"R c #727272", +"S c #4A4A4A", +"T c #ECECEC", +"U c #ACACAC", +"V c #BABABA", +"W c #DDDDDD", +"X c #DBDBDB", +"Y c #B1B1B1", +"Z c #232323", +"` c #696969", +" . c #B7B7B7", +".. c #828282", +"+. c #404040", +"@. c #969696", +"#. c #323232", +"$. c #E8E8E8", +"%. c #121212", +" ", +" . . . . . ", +" . . . . ", +" . + @ # $ % . ", +" . . & * = - - ; > , ", +" . ' ) ! ~ { - ] ^ ; / ( ", +" . _ : < ' [ } | 1 ] 2 3 4 5 : . ", +" 6 7 ! - - - . } 8 9 0 . = ; 4 a b c ", +" . ; - - | | d . e f g ] . = 2 h a i ( ", +" . j ] 1 k l f . m 1 ] ] . 9 n a o o 0 . ", +" p - ] q 1 1 . r s 2 2 . = 4 a o j t c ", +" u - ^ ^ ] ] . v w ^ ; . = a l x j y z ", +" . A - ; q 2 . B C ; 4 . D E A F G A H . ", +" I - 4 ; ; J . K L . M w o j G G m N O ", +" , - a 4 4 n # . . 0 w j j G w P Q R S ", +" . T - a U V W o k X T } w Y : ( Z . ", +" ` - o o o o j j } ...+.Z . . ", +" c - o j j } q @.#.Z . ", +" . ! $./ # +.Z . . ", +" , .., %.. ", +" . . ", +" ", +" ", +" "}; diff --git a/etc/images/connect.xpm b/etc/images/connect.xpm new file mode 100644 index 00000000000..f58e8b3053d --- /dev/null +++ b/etc/images/connect.xpm @@ -0,0 +1,85 @@ +/* XPM */ +static char * stock_connect_xpm[] = { +"24 24 58 1", +" c None", +". c #000000", +"+ c #989389", +"@ c #807D74", +"# c #C6C2BA", +"$ c #34332D", +"% c #B7B3AA", +"& c #C4C2BD", +"* c #EAE8E3", +"= c #9C978D", +"- c #BCB9B2", +"; c #363433", +"> c #E2E1DD", +", c #F0EFEC", +"' c #AAA7A0", +") c #F0EEEB", +"! c #B2B0AB", +"~ c #F9F9F8", +"{ c #C5C3BD", +"] c #0F0F0D", +"^ c #F2F0ED", +"/ c #EBEAE6", +"( c #8A857B", +"_ c #ECEBE8", +": c #EEECEA", +"< c #9F9C93", +"[ c #F3F2F0", +"} c #E8E7E4", +"| c #E3E1DD", +"1 c #78756B", +"2 c #BEBBB5", +"3 c #B3B1AA", +"4 c #7D786E", +"5 c #E1DFDB", +"6 c #D1D0CC", +"7 c #938E84", +"8 c #C8C5BF", +"9 c #A7A298", +"0 c #010101", +"a c #8C8981", +"b c #A6A29B", +"c c #726D63", +"d c #CECAC3", +"e c #A7A49E", +"f c #7E7A70", +"g c #A09D94", +"h c #817D73", +"i c #6C685E", +"j c #3C3933", +"k c #8B877E", +"l c #706C62", +"m c #B1ADA4", +"n c #97938A", +"o c #625E54", +"p c #6A655B", +"q c #37342D", +"r c #646056", +"s c #8B877D", +" ", +" ", +" ", +" ", +" ", +" ", +" .. .. ", +" ..+@.#@.. ", +" $%&*@.*@=-; ", +" .>,'*@.)@!~{] ", +"......@>,'*@.)@!~{@.....", +"*******^/(_@.:@<[}|*****", +"@@@@@1123451.6@789@@@@@@", +".....01abcd1.e@fghi.....", +" ]abcd1.e@fgh] ", +" ]jklmi.n@opq. ", +" ]]+r.s@.. ", +" ]] ]. ", +" ", +" ", +" ", +" ", +" ", +" "}; diff --git a/etc/images/contact.xpm b/etc/images/contact.xpm new file mode 100644 index 00000000000..b3cf61f5fd4 --- /dev/null +++ b/etc/images/contact.xpm @@ -0,0 +1,129 @@ +/* XPM */ +static char * stock_contact_xpm[] = { +"24 24 102 2", +" c None", +". c #000000", +"+ c #E3E1DE", +"@ c #ECEBE7", +"# c #F0EEEB", +"$ c #D2CFC9", +"% c #81817F", +"& c #4C4C4A", +"* c #ECEAE6", +"= c #ECEAE5", +"- c #EBE9E5", +"; c #D2CEC8", +"> c #D9C7B8", +", c #D9C7B9", +"' c #D8C5B8", +") c #D1C0B3", +"! c #D6C5B7", +"~ c #EBEAE5", +"{ c #D3D0C9", +"] c #CDBCAC", +"^ c #AFA093", +"/ c #3A3531", +"( c #443F3A", +"_ c #AE9F93", +": c #CBBAAB", +"< c #4E4E4C", +"[ c #595957", +"} c #595857", +"| c #7D7C7A", +"1 c #D3D0CA", +"2 c #C6B5A4", +"3 c #3D3833", +"4 c #433D37", +"5 c #C2B0A2", +"6 c #D4D1CA", +"7 c #B0A08E", +"8 c #261F18", +"9 c #D37D1E", +"0 c #D68021", +"a c #B26616", +"b c #27241F", +"c c #9C8E7F", +"d c #EAE9E5", +"e c #A29281", +"f c #2E2012", +"g c #CC751A", +"h c #CC761A", +"i c #BF6C16", +"j c #24211C", +"k c #8E8170", +"l c #EAE8E3", +"m c #E9E8E3", +"n c #E9E7E3", +"o c #8E7F6C", +"p c #221E17", +"q c #C56D14", +"r c #7D450D", +"s c #AF5F11", +"t c #221E19", +"u c #7F7260", +"v c #E9E7E2", +"w c #E8E6E1", +"x c #E7E5E1", +"y c #E7E5E0", +"z c #D5D1CB", +"A c #3E372C", +"B c #1C1F1F", +"C c #301B06", +"D c #542D07", +"E c #291B0E", +"F c #151412", +"G c #473F33", +"H c #E8E6E2", +"I c #546371", +"J c #849CB4", +"K c #56687C", +"L c #343332", +"M c #495868", +"N c #566D85", +"O c #293643", +"P c #E6E4DF", +"Q c #E5E4DE", +"R c #EEEDE9", +"S c #7B95AF", +"T c #7B96B0", +"U c #68819B", +"V c #8999AA", +"W c #5A7088", +"X c #607A96", +"Y c #5B7691", +"Z c #E5E3DE", +"` c #4B4A48", +" . c #757471", +".. c #E6E3DE", +"+. c #3B3A39", +"@. c #747371", +"#. c #D3CFC8", +"$. c #E2E1DD", +"%. c #E7E4E0", +"&. c #D2CFC8", +"*. c #D1D0CA", +"=. c #C2C0B9", +" ", +" ", +" ", +" . . . . . . . . . . . . . . . . . . . . ", +" . + @ # # # # # # # # # # # # # # # # # $ . ", +" . # % . . . . . . . & * = - - - - - - - ; . ", +" . # . > , ' ) ! > , . * * ~ ~ ~ ~ - - ~ { . ", +" . # . ] ^ / . ( _ : . * < [ ~ } } | - ~ 1 . ", +" . # . 2 3 . . . 4 5 . * * ~ ~ - - - - - 6 . ", +" . # . 7 8 9 0 a b c . * [ < | [ - } | d 6 . ", +" . # . e f g h i j k . * * l l m n n n n 6 . ", +" . # . o p q r s t u . v v w w w x y y y z . ", +" . # . A B C D E F G . H H y y y y y y y 6 . ", +" . # . I J K L M N O . y y P P P P P P Q { . ", +" . R . S T U V W X Y . y y P P P P Z Z Z { . ", +" . d ` . . . . . . . ` y y ...+.+.Z @.Z #.. ", +" . $.y y y y y y y y y %.P Z Z Z Z Z Z Z &.. ", +" . *.6 z 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 =.. ", +" . . . . . . . . . . . . . . . . . . . . . ", +" ", +" ", +" ", +" ", +" "}; diff --git a/etc/images/delete.xpm b/etc/images/delete.xpm new file mode 100644 index 00000000000..e2d1d90754e --- /dev/null +++ b/etc/images/delete.xpm @@ -0,0 +1,270 @@ +/* XPM */ +static char * stock_delete_xpm[] = { +"24 24 243 2", +" c None", +". c #000000", +"+ c #1C1C1C", +"@ c #767676", +"# c #E6E6E6", +"$ c #D3D3D3", +"% c #C3C3C3", +"& c #909090", +"* c #494949", +"= c #48473D", +"- c #BAB8A6", +"; c #E2E2DF", +"> c #F1F1F0", +", c #EAE9E6", +"' c #F2F2EE", +") c #EBEAE5", +"! c #C1C0B5", +"~ c #57564A", +"{ c #525146", +"] c #A8A68F", +"^ c #BDBBA1", +"/ c #C0BEA3", +"( c #A3A18A", +"_ c #6D6C5C", +": c #7C7C72", +"< c #4C4C49", +"[ c #45453F", +"} c #44433A", +"| c #6F6F67", +"1 c #C6C5B9", +"2 c #B6B59B", +"3 c #6D6C5D", +"4 c #B3B19B", +"5 c #A7A68E", +"6 c #908F7A", +"7 c #AAA993", +"8 c #CCCBB5", +"9 c #D0CEBA", +"0 c #D5D3C1", +"a c #AEADA3", +"b c #94938A", +"c c #454442", +"d c #232321", +"e c #353431", +"f c #292823", +"g c #1E1E1A", +"h c #535246", +"i c #ADAC93", +"j c #929189", +"k c #C2C1AF", +"l c #B1AF96", +"m c #ACAA92", +"n c #93927D", +"o c #080808", +"p c #D1D0C1", +"q c #D6D5C4", +"r c #DFDED1", +"s c #CECDC0", +"t c #ACACA6", +"u c #908F8A", +"v c #7E7D77", +"w c #5C5C55", +"x c #47463E", +"y c #656456", +"z c #777665", +"A c #807E6F", +"B c #BEBDA7", +"C c #B5B39A", +"D c #A19F88", +"E c #D9D8CC", +"F c #F6F5F2", +"G c #DBDAD1", +"H c #DAD9CE", +"I c #E5E4D9", +"J c #D0CFC3", +"K c #D3D3C9", +"L c #CAC9BC", +"M c #B7B6A6", +"N c #B8B6A1", +"O c #B0AF96", +"P c #B9B89D", +"Q c #B9B79D", +"R c #B8B69C", +"S c #C4C2A9", +"T c #AFAD97", +"U c #8B8976", +"V c #AAA998", +"W c #B6B6B2", +"X c #F9F9F7", +"Y c #FAFAF8", +"Z c #F4F4F0", +"` c #E2E1DA", +" . c #D9D9CE", +".. c #DBDACF", +"+. c #D3D1BE", +"@. c #C5C4AC", +"#. c #D6D5C3", +"$. c #CDCCBF", +"%. c #BBBAAD", +"&. c #7C7A69", +"*. c #717060", +"=. c #131313", +"-. c #999882", +";. c #AFAE9D", +">. c #C3C3BE", +",. c #DEDEDC", +"'. c #E9E9E8", +"). c #FBFBFA", +"!. c #FDFDFC", +"~. c #FDFDFD", +"{. c #FCFBFA", +"]. c #F2F2EF", +"^. c #EAE9E3", +"/. c #C0BFB1", +"(. c #959484", +"_. c #787766", +":. c #6E6D5D", +"<. c #5B5B4D", +"[. c #5D5C4F", +"}. c #A3A293", +"|. c #B8B7A6", +"1. c #D8D7D0", +"2. c #DBDBD4", +"3. c #D3D2CA", +"4. c #C8C8C3", +"5. c #C6C5BD", +"6. c #BDBCAD", +"7. c #BAB8A8", +"8. c #9F9E8B", +"9. c #8E8C78", +"0. c #8C8B77", +"a. c #7A7968", +"b. c #6C6B5D", +"c. c #4E4D45", +"d. c #424242", +"e. c #7B7B73", +"f. c #9F9F96", +"g. c #D2D1C7", +"h. c #DCDBD2", +"i. c #CCCBBE", +"j. c #D1D0C2", +"k. c #C4C3B6", +"l. c #9A9883", +"m. c #807F6D", +"n. c #7D7C6B", +"o. c #6A695E", +"p. c #40403E", +"q. c #37372D", +"r. c #0F0F0F", +"s. c #383734", +"t. c #787875", +"u. c #999893", +"v. c #8A897E", +"w. c #B3B2A4", +"x. c #AAAA9E", +"y. c #878673", +"z. c #8F8D79", +"A. c #626155", +"B. c #545451", +"C. c #31312E", +"D. c #2B2B23", +"E. c #71715D", +"F. c #57574B", +"G. c #42423A", +"H. c #262620", +"I. c #212121", +"J. c #1B1B1B", +"K. c #242424", +"L. c #161613", +"M. c #2A2A22", +"N. c #303027", +"O. c #3F3F34", +"P. c #7A7A65", +"Q. c #5B5B51", +"R. c #858576", +"S. c #76766B", +"T. c #98988E", +"U. c #75756B", +"V. c #515146", +"W. c #7F7F74", +"X. c #6A6A58", +"Y. c #404035", +"Z. c #626251", +"`. c #545445", +" + c #3E3E33", +".+ c #555546", +"++ c #34342B", +"@+ c #515143", +"#+ c #85856E", +"$+ c #5D5D54", +"%+ c #919182", +"&+ c #828278", +"*+ c #AAAAA3", +"=+ c #7A7A71", +"-+ c #4E4E45", +";+ c #8A8A80", +">+ c #7C7C6D", +",+ c #424237", +"'+ c #606052", +")+ c #5A5A4A", +"!+ c #3C3C32", +"~+ c #4E4E41", +"{+ c #35352C", +"]+ c #ACAC9C", +"^+ c #85857B", +"/+ c #BBBBB3", +"(+ c #A3A39A", +"_+ c #54544B", +":+ c #93938A", +"<+ c #919185", +"[+ c #686856", +"}+ c #414136", +"|+ c #434337", +"1+ c #A4A493", +"2+ c #C1C1B6", +"3+ c #B1B1A2", +"4+ c #6B6B5F", +"5+ c #9D9D8B", +"6+ c #848470", +"7+ c #71715E", +"8+ c #A5A594", +"9+ c #C2C2B7", +"0+ c #7B7B65", +"a+ c #5F5F4F", +"b+ c #666654", +"c+ c #49493C", +"d+ c #575748", +"e+ c #57574A", +"f+ c #7D7D6D", +"g+ c #767669", +"h+ c #B3B3A8", +"i+ c #A1A194", +"j+ c #6D6D61", +"k+ c #B3B3A5", +"l+ c #696957", +"m+ c #414135", +"n+ c #565647", +"o+ c #444438", +"p+ c #595951", +"q+ c #585849", +"r+ c #4E4E40", +"s+ c #747467", +"t+ c #616153", +" . . . . . . ", +" . + @ # $ % & * . . ", +" . . . = - ; > , ' ) ! ~ { . . . ", +" . ] ^ / ( _ : < [ } | 1 2 3 4 5 6 . ", +" . 7 8 9 0 a b c d e f g h i j k l m n . ", +" o p 8 q r s t u v w x y z A B C 2 C D . ", +" . E F G H I J K L M N O D P Q R S T U . ", +" . V W X Y Z ` ...0 +.S / @.#.$.%.&.*.. ", +" =.-.;.>.,.'.).!.~.{.X ].^.G /.(._.:.<.. ", +" . [.n }.|.1.2.3.4.5.6.7.8.9.0.9.a.b.c. ", +" . d.e.f.g.h.i.j.k.l l l l.m.n.o.p.. ", +" . q.r.s.t.u.v.w.x.( y.z.A.B.C.. D.. ", +" . E.F.G.H.I.J.. K.. . . . L.M.N.O.. ", +" . P.Q.R.S.T.U.V.W.X.Y.Z.`. +.+++@+. ", +" . #+$+%+&+*+=+-+;+>+,+'+)+!+~+{+`.. ", +" . #+Q.]+^+/+(+_+:+<+,+'+[+}+X.|+X.. ", +" . #+Q.1+^+2+3+4+3+5+`.6+7+|+X.|+X.. ", +" . #+Q.8+^+9+3+4+3+5+`.6+7+|+X.|+X.. ", +" . #+Q.5+^+2+3+4+3+5+`.6+7+|+X.|+X.. ", +" . 0+Q.1+^+2+3+4+3+5+`.6+7+|+X.|+a+. ", +" . b+Q.1+&+2+3+4+3+5+`.6+7+|+X.c+d+. ", +" . e+f+g+h+i+j+k+5+`.6+l+m+n+o+. . ", +" . . . p+q+r+s+t+~+c+c+. . . ", +" . . . . . . . . . . "}; diff --git a/etc/images/describe.xpm b/etc/images/describe.xpm new file mode 100644 index 00000000000..38062d53c6d --- /dev/null +++ b/etc/images/describe.xpm @@ -0,0 +1,95 @@ +/* XPM */ +static char * stock_properties_xpm[] = { +"24 24 68 1", +" c None", +". c #000000", +"+ c #74716E", +"@ c #C9C4BD", +"# c #DFDAD2", +"$ c #F4EFE5", +"% c #F2ECE1", +"& c #FFFFFF", +"* c #4C4B48", +"= c #EEE5D4", +"- c #ECE2CF", +"; c #EADFC9", +"> c #F9F9F9", +", c #E2D2B1", +"' c #F4F4F4", +") c #EEEEEE", +"! c #959595", +"~ c #F5F5F5", +"{ c #F6F6F6", +"] c #D9D9D9", +"^ c #C7B99C", +"/ c #E9E9E9", +"( c #787878", +"_ c #E1E1E1", +": c #E2E2E2", +"< c #C8C8C8", +"[ c #877E69", +"} c #9A8F78", +"| c #DEDEDE", +"1 c #E3E3E3", +"2 c #929292", +"3 c #AFA389", +"4 c #ACACAC", +"5 c #A2A2A2", +"6 c #E4E4E4", +"7 c #BCBCBC", +"8 c #939393", +"9 c #EDEDED", +"0 c #EFEFEF", +"a c #F0F0F0", +"b c #E5E5E5", +"c c #E7E7E7", +"d c #E8E8E8", +"e c #EAEAEA", +"f c #EBEBEB", +"g c #BEBEBE", +"h c #F1F1F1", +"i c #DFDFDF", +"j c #F3F3F3", +"k c #E0E0E0", +"l c #ABABAB", +"m c #AEAEAE", +"n c #AFAFAF", +"o c #ADADAD", +"p c #B0B0B0", +"q c #B1B1B1", +"r c #F7F7F7", +"s c #B3B3B3", +"t c #F8F8F8", +"u c #B4B4B4", +"v c #B5B5B5", +"w c #B6B6B6", +"x c #FAFAFA", +"y c #FBFBFB", +"z c #DCDCDC", +"A c #DDDDDD", +"B c #E6E6E6", +"C c #969696", +" ", +" ", +" ", +" ......... ", +" .+@#$%.&&. ", +" *=---;.&>. ", +" .......;.,,,,.'). ", +" !~~{].;.^.,^^./(.. ", +" .~_:<.;.[.^.}..|].. ", +" .~:1.;.2.[.3.4...5. ", +" .{16..7/8.[.49)0a|. ", +" .{6bcd/ef8.g9)0ahi. ", +" .{bcd/ef9ef9)0ahjk. ", +" .{cllefmnomnppqj'_. ", +" .rd/ef9)09)0ahj'~:. ", +" .r/4o9)ppnppqss~{1. ", +" .tef9)0ah0ahj'~{rb. ", +" .>9npahssqssuvw>xc. ", +" .>)0ahj'~j'~{r>xyd. ", +" .nzA|ik_:k_:1bBcdC. ", +" ................. ", +" ", +" ", +" "}; diff --git a/etc/images/disconnect.xpm b/etc/images/disconnect.xpm new file mode 100644 index 00000000000..e08b282555b --- /dev/null +++ b/etc/images/disconnect.xpm @@ -0,0 +1,69 @@ +/* XPM */ +static char * stock_disconnect_xpm[] = { +"24 24 42 1", +" c None", +". c #000000", +"+ c #989389", +"@ c #807D74", +"# c #C6C2BA", +"$ c #43423C", +"% c #B7B3AA", +"& c #C4C2BD", +"* c #EAE8E3", +"= c #E2E1DD", +"- c #F0EFEC", +"; c #AAA7A0", +"> c #C5D2C8", +", c #E9EEEA", +"' c #F0EEEB", +") c #F2F0ED", +"! c #EBEAE6", +"~ c #8A857B", +"{ c #ECEBE8", +"] c #EEECEA", +"^ c #78756B", +"/ c #BEBBB5", +"( c #B3B1AA", +"_ c #7D786E", +": c #E1DFDB", +"< c #D1D0CC", +"[ c #010101", +"} c #8C8981", +"| c #A6A29B", +"1 c #726D63", +"2 c #CECAC3", +"3 c #A7A49E", +"4 c #0F0F0D", +"5 c #F0F3F1", +"6 c #272622", +"7 c #8B877E", +"8 c #706C62", +"9 c #B1ADA4", +"0 c #6C685E", +"a c #97938A", +"b c #646056", +"c c #8B877D", +" ", +" ", +" ", +" ", +" ", +" ", +" .. ..", +" ..+@. .#@", +" $%&*@.... .*@", +" .=-;*@.>>,. .'@", +".....@=-;*@.... .'@", +"******)!~{@. .]@", +"@@@@^^/(_:^. .<@", +"....[^}|12^.... .3@", +" 4}|12^.>>5. .3@", +" 67890.... .a@", +" 44+b. .c@", +" 44 4.", +" ", +" ", +" ", +" ", +" ", +" "}; diff --git a/etc/images/exit.xpm b/etc/images/exit.xpm index 291dd0dd170..7f9daf14b9e 100644 --- a/etc/images/exit.xpm +++ b/etc/images/exit.xpm @@ -1,36 +1,167 @@ /* XPM */ -static char *magick[] = { -/* columns rows colors chars-per-pixel */ -"24 24 6 1", -" c Gray0", -". c #ae6e66e76a0a", -"X c #c6c67d7d8181", -"o c #cdcd86868989", -"O c #e4e4e4e4dcdc", -"+ c None", -/* pixels */ -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++ +++++", -"++++++++++ OOOOOO +++++", -"++++++++++ OOOOOO +++++", -"++++++++ OOOOOO +++++", -"++++++++ . OOOOOO +++++", -"+++ .X OO O +++++", -"+++ ......Xo O O +++++", -"+++ ......Xo OOOO +++++", -"+++ .X OOOOO +++++", -"++++++++ . OOOOOO +++++", -"++++++++ OOOOOO +++++", -"++++++++++ OOOO +++++", -"++++++++++ OO +++++", -"++++++++++ +++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++", -"++++++++++++++++++++++++" -}; +static char * stock_exit_xpm[] = { +"24 24 140 2", +" c None", +". c #000000", +"+ c #D6D6D4", +"@ c #BDBDBC", +"# c #A8A8A4", +"$ c #92928F", +"% c #727370", +"& c #61615E", +"* c #20201F", +"= c #F1F1EF", +"- c #E6E6E4", +"; c #DADAD7", +"> c #CFCFCD", +", c #C4C4C1", +"' c #A8A8A5", +") c #767674", +"! c #777774", +"~ c #1E1E1D", +"{ c #B9B9B7", +"] c #AEAEAC", +"^ c #8F8F8D", +"/ c #262626", +"( c #414140", +"_ c #E9836C", +": c #DEDEDC", +"< c #C5C5C2", +"[ c #636362", +"} c #040504", +"| c #040604", +"1 c #050705", +"2 c #E87B62", +"3 c #E67056", +"4 c #D5D5D3", +"5 c #DBDBD8", +"6 c #D0D0CE", +"7 c #080A07", +"8 c #0A0C09", +"9 c #0A0D09", +"0 c #0B0E0A", +"a c #F0B0A1", +"b c #EB8D77", +"c c #DF421E", +"d c #E97E66", +"e c #CBCBC8", +"f c #0C0F0B", +"g c #0F130D", +"h c #10140E", +"i c #11150F", +"j c #EFA392", +"k c #BFBFBD", +"l c #5D5D5C", +"m c #10150F", +"n c #141912", +"o c #161C14", +"p c #171D15", +"q c #B7B7B4", +"r c #0C0C0C", +"s c #192017", +"t c #1C2319", +"u c #1D241A", +"v c #CD8484", +"w c #990000", +"x c #701616", +"y c #A6A6A5", +"z c #181E16", +"A c #1E261B", +"B c #212A1E", +"C c #222B1F", +"D c #4F0000", +"E c #AEAEAB", +"F c #1D261B", +"G c #242E21", +"H c #273224", +"I c #283325", +"J c #580000", +"K c #B5B5B3", +"L c #293426", +"M c #2D3929", +"N c #2E3A2A", +"O c #7C4343", +"P c #6A0000", +"Q c #720000", +"R c #BDBDBB", +"S c #232C20", +"T c #2A3526", +"U c #303C2B", +"V c #33402E", +"W c #C5C5C3", +"X c #1E261C", +"Y c #303D2C", +"Z c #374532", +"` c #394834", +" . c #500000", +".. c #CDCDCB", +"+. c #1B2319", +"@. c #253022", +"#. c #303E2D", +"$. c #394934", +"%. c #3D4E38", +"&. c #9D9D9B", +"*. c #565655", +"=. c #2C3828", +"-. c #40503A", +";. c #43553E", +">. c #BABAB7", +",. c #777776", +"'. c #323830", +"). c #232C1F", +"!. c #313E2D", +"~. c #3B4A36", +"{. c #43553D", +"]. c #485B42", +"^. c #4A5E44", +"/. c #F0F0EE", +"(. c #E5E5E3", +"_. c #C6C6C3", +":. c #ACACAB", +"<. c #8B8B8A", +"[. c #32392F", +"}. c #2C3728", +"|. c #3F503A", +"1. c #465840", +"2. c #4B5E44", +"3. c #4E6347", +"4. c #506549", +"5. c #DADAD8", +"6. c #7A7D78", +"7. c #333C30", +"8. c #475A41", +"9. c #4F6348", +"0. c #53694C", +"a. c #566C4E", +"b. c #576D4F", +"c. c #91968F", +"d. c #3B4736", +"e. c #42543C", +"f. c #51674A", +"g. c #586F50", +"h. c #5B7353", +"i. c #5C7454", +" ", +" . . . . . . . . . . . . . . . . ", +" . + @ # $ % & & & * . . . . . . ", +" . = - ; > , ' ) ! ~ . . . . . . ", +" . . = - ; > , { ] ^ / . . . . . . ", +" . . . = - ; > , { { { ( . . . . . . ", +" . _ . : - ; > < { { { [ } | 1 1 1 . ", +". . . . . . 2 3 . 4 5 6 < { { { [ 7 8 9 0 0 . ", +". a 2 2 2 2 b c d . e 6 < { { { [ f g h i i . ", +". j c c c c c c c 3 . k < { l { [ m n o p p . ", +". j c c c c c c c c 3 . q { l r [ n s t u u . ", +". v w w w w w w w w w x . y r { [ z A B C C . ", +". v w w w w w w w w D . E { { { [ F G H I I . ", +". v w w w w w w w J . K < { { { [ C L M N N . ", +". O P P P P Q w J . R 6 < { { { [ S T U V V . ", +". . . . . . Q J . W 5 6 < { { { [ X H Y Z ` . ", +" . .. ..- 5 6 < { { { [ +.@.#.$.%.. ", +" . . . = - 5 6 < { ] &.*.B =.Z -.;.. ", +" . . = - 5 6 >.&.,.'.).!.~.{.].^.. ", +" . /.(._.:.<.[.}.Z |.1.2.3.4.4.. ", +" . 5.k 6.7.Z -.8.9.0.a.a.b.b.b.. ", +" . c.d.e.^.f.g.h.i.i.i.i.i.i.i.. ", +" . . . . . . . . . . . . . . . . ", +" "}; diff --git a/etc/images/gnus/toggle-subscription.xpm b/etc/images/gnus/toggle-subscription.xpm new file mode 100644 index 00000000000..c0674681e94 --- /dev/null +++ b/etc/images/gnus/toggle-subscription.xpm @@ -0,0 +1,58 @@ +/* XPM */ +static char * stock_task_recurring_xpm[] = { +"24 24 31 1", +" c None", +". c #000000", +"+ c #FFFFFF", +"@ c #F4E2BC", +"# c #F4D597", +"$ c #434343", +"% c #F0CC84", +"& c #EBB13D", +"* c #4B4B4B", +"= c #535353", +"- c #C8C8C8", +"; c #7D7D7D", +"> c #7C7C7C", +", c #858585", +"' c #5C5C5C", +") c #949494", +"! c #F2F2F2", +"~ c #B6B6B6", +"{ c #BDBDBD", +"] c #818181", +"^ c #878787", +"/ c #B2B2B2", +"( c #FDFDFD", +"_ c #DBDBDB", +": c #CCCCCC", +"< c #ECECEC", +"[ c #7F7F99", +"} c #333366", +"| c #8F8FA9", +"1 c #59597F", +"2 c #EEEEEE", +" ", +" . . . . . . . ", +" .+.+.+.+.+.+.+. ", +" .@.#.#.#.#.#.#. ", +" .$%$&*&*&=&=&$&*. ", +" .-*;*>*>*>*>=,'). ", +" .!>~>{]{]{]{]{^/. ", +" .(_:::::::::::_/. ", +" .+<<<<<<<<<<<< c #000000", +", c #FAFAFA", +"' c #F4F4F4", +") c #4D4D4D", +"! c #303030", +"~ c #D8D8D8", +"{ c #E5E5E5", +"] c #B0B0B0", +"^ c #414141", +"/ c #484848", +"( c #030303", +"_ c #DADADA", +": c #E4E4E4", +"< c #353535", +"[ c #070707", +"} c #A6A6A6", +"| c #E6E6E6", +"1 c #686868", +"2 c #020202", +"3 c #3E3E3E", +"4 c #EFEFEF", +"5 c #9B9B9B", +"6 c #343434", +"7 c #F8F8F8", +"8 c #999999", +"9 c #F1F1F1", +"0 c #C4C4C4", +"a c #232323", +"b c #535353", +"c c #AEAEAE", +"d c #F3F3F3", +"e c #D3D3D3", +"f c #242424", +"g c #4E4E4E", +"h c #EEEEEE", +"i c #B5B5B5", +"j c #0F0601", +"k c #200E03", +"l c #765E49", +"m c #7D6A56", +"n c #38291D", +"o c #180A03", +"p c #D6CBC1", +"q c #A09E9D", +"r c #1D1109", +"s c #2A1E13", +"t c #3D2E21", +"u c #3F3123", +"v c #47423D", +"w c #DBB98E", +"x c #D6B183", +"y c #D3AC7E", +"z c #CFA573", +"A c #CD9E67", +"B c #C39056", +"C c #46270A", +"D c #281F14", +"E c #675643", +"F c #A48367", +"G c #D8AB7C", +"H c #BF9E7C", +"I c #DCBB93", +"J c #DCB786", +"K c #D1A872", +"L c #231B12", +"M c #7B6C58", +"N c #C69B63", +"O c #C39860", +"P c #C09257", +"Q c #BD8A4A", +"R c #B9803D", +"S c #AA6E28", +"T c #412409", +"U c #100B07", +"V c #CDB598", +"W c #E8CCA9", +"X c #DAB587", +"Y c #D4AC7D", +"Z c #D1A775", +"` c #C99F6A", +" . c #AF8B5B", +".. c #2E2517", +"+. c #1E1910", +"@. c #0B0805", +"#. c #594B39", +"$. c #2A2015", +"%. c #C2975E", +"&. c #BE8D50", +"*. c #BB823F", +"=. c #AE722C", +"-. c #422409", +";. c #0E0B07", +">. c #AB957E", +",. c #E9CEAC", +"'. c #DBB68A", +"). c #D5AD7E", +"!. c #D0A975", +"~. c #C9A26F", +"{. c #B99667", +"]. c #AA895F", +"^. c #31291C", +"/. c #322A1C", +"(. c #54493B", +"_. c #C69C64", +":. c #C2965E", +"<. c #BE8E50", +"[. c #C29156", +"}. c #9E692A", +"|. c #1A150D", +"1. c #887762", +"2. c #EAD1AF", +"3. c #DDB98E", +"4. c #D4AC7E", +"5. c #D2A876", +"6. c #C39E6D", +"7. c #927751", +"8. c #15110C", +"9. c #988468", +"0. c #C2945A", +"a. c #BE8F51", +"b. c #BC8544", +"c. c #BE8A4F", +"d. c #9A6526", +"e. c #70604D", +"f. c #EFD6B5", +"g. c #DEBD93", +"h. c #D4AC7C", +"i. c #D0A672", +"j. c #C9A069", +"k. c #9D7E53", +"l. c #140F09", +"m. c #1F1710", +"n. c #EFD8B9", +"o. c #E3C39C", +"p. c #D7B080", +"q. c #D4AC79", +"r. c #CDA46F", +"s. c #3A2C1B", +"t. c #FFFFFF", +"u. c #1C160D", +"v. c #B29E85", +"w. c #E6C8A3", +"x. c #D7B081", +"y. c #D1A874", +"z. c #CBA16A", +"A. c #BA905A", +"B. c #251C10", +"C. c #DF421E", +"D. c #F7F7F7", +"E. c #DFDFDF", +"F. c #2F2619", +"G. c #92806A", +"H. c #E6C7A2", +"I. c #D6AF7E", +"J. c #CCA26C", +"K. c #53422A", +"L. c #211910", +"M. c #2A2014", +"N. c #E1E1E1", +"O. c #6A5C4A", +"P. c #EAD0AD", +"Q. c #DAB68B", +"R. c #D2A978", +"S. c #CEA56E", +"T. c #C89D66", +"U. c #856740", +"V. c #534026", +"W. c #F9F9F9", +"X. c #FBFBFB", +"Y. c #E2E2E2", +"Z. c #42362B", +"`. c #D1BA9B", +" + c #DCBA8E", +".+ c #D1A773", +"++ c #C4975C", +"@+ c #BE8C4C", +"#+ c #B4813F", +"$+ c #281B0B", +"%+ c #E3E3E3", +"&+ c #372416", +"*+ c #74654F", +"=+ c #B68E5C", +"-+ c #926231", +";+ c #452B11", +">+ c #341E09", +",+ c #221205", +"'+ c #150802", +")+ c #FDFDFD", +"!+ c #030000", +"~+ c #050000", +"{+ c #010000", +"]+ c #C3C3C3", +" ", +" ", +" . + @ # $ % ", +" & * = - ; > , ' ) > ", +" ! ~ { ] ^ / ( $ _ : < ", +" [ } | 1 2 3 4 5 > ", +" 6 7 8 > > 9 0 a ", +" b 9 c > > d e f ", +" g h i > j k l m n o ", +" ^ p q r s t u > v w x y z A B C ", +" D E F G H I J K L > M N O P Q R S T ", +" U V W X Y Z ` ...+. @.#.$.%.&.*.=.-. ", +" ;.>.,.'.).!.~.{.].^./. (._.:.<.[.}.-. ", +" |.1.2.3.4.5.6.7.8. > 9.0.a.b.c.d.T ", +" e.f.g.h.i.j.k.l.> > > > > > > > > > ", +" m.n.o.p.q.r._.s. > t.t.t.t.t.t.t.> ", +" u.v.w.x.y.z.A.B.> > t.C.C.D.C.C.E.> ", +" F.G.H.I.i.J.K.L.M. > t.C.C.C.C.C.N.> ", +" O.P.Q.R.S.T.U.V. > t.W.C.C.C.X.Y.> ", +" Z.`. +.+z.++@+#+$+> > t.C.C.C.C.C.%+> ", +" &+*+=+-+;+>+,+'+ > t.C.C.)+C.C.{ > ", +" !+~+{+> > - %+%+: { { ]+> ", +" > > > > > > > > > ", +" "}; diff --git a/etc/images/lock-ok.xpm b/etc/images/lock-ok.xpm new file mode 100644 index 00000000000..630d9b40f85 --- /dev/null +++ b/etc/images/lock-ok.xpm @@ -0,0 +1,215 @@ +/* XPM */ +static char * stock_lock_ok_xpm[] = { +"24 24 188 2", +" c None", +". c #000000", +"+ c #212121", +"@ c #9E9E9E", +"# c #E6E6E6", +"$ c #E7E7E7", +"% c #C8C8C8", +"& c #A0A0A0", +"* c #131313", +"= c #5F5F5F", +"- c #EDEDED", +"; c #D6D6D6", +"> c #D5D5D5", +", c #DDDDDD", +"' c #D8D8D8", +") c #A1A1A1", +"! c #3C3C3C", +"~ c #353535", +"{ c #EFEFEF", +"] c #CFCFCF", +"^ c #4C4C4C", +"/ c #141414", +"( c #6A6A6A", +"_ c #D0D0D0", +": c #B2B2B2", +"< c #454545", +"[ c #E2E2E2", +"} c #292929", +"| c #0F0F0F", +"1 c #949494", +"2 c #E9E9E9", +"3 c #C3C3C3", +"4 c #1C1C1C", +"5 c #E1E1E1", +"6 c #272727", +"7 c #DEDEDE", +"8 c #B6B6B6", +"9 c #B7B6B6", +"0 c #150902", +"a c #2E2419", +"b c #251D15", +"c c #616160", +"d c #5E5A56", +"e c #29211A", +"f c #15100C", +"g c #2F251B", +"h c #1D1710", +"i c #4A392B", +"j c #656361", +"k c #565352", +"l c #392B1D", +"m c #322110", +"n c #0C0500", +"o c #EFDBBF", +"p c #EDD9C0", +"q c #E9D5BE", +"r c #E7D2B9", +"s c #E5D0B3", +"t c #DCC09D", +"u c #D9BE99", +"v c #DABE99", +"w c #D7BB95", +"x c #D5B68E", +"y c #D2AF85", +"z c #CFA77C", +"A c #9A5E1B", +"B c #F0DABF", +"C c #E4C6A0", +"D c #D6AF80", +"E c #D3AC7B", +"F c #D0A570", +"G c #C99F68", +"H c #C69B64", +"I c #C69C64", +"J c #C89D66", +"K c #C79C65", +"L c #C39860", +"M c #C09256", +"N c #BC8645", +"O c #B67C36", +"P c #985E1A", +"Q c #EED8BC", +"R c #E3C39C", +"S c #D3AA7B", +"T c #CFA670", +"U c #CA9F68", +"V c #C89E66", +"W c #C89F68", +"X c #C49961", +"Y c #C09358", +"Z c #BC8746", +"` c #B77D39", +" . c #EED8BB", +".. c #E2C29B", +"+. c #D6AE7F", +"@. c #CA9E6D", +"#. c #C69861", +"$. c #BF925A", +"%. c #BB8E56", +"&. c #BD8E56", +"*. c #5C7354", +"=. c #EFDABE", +"-. c #E4C49D", +";. c #D7B080", +">. c #DAB685", +",. c #D4B07C", +"'. c #D0A971", +"). c #CEA46B", +"!. c #CDA46D", +"~. c #FFFFFF", +"{. c #DBE0D9", +"]. c #52684B", +"^. c #4E6346", +"/. c #52674A", +"(. c #EFD8BB", +"_. c #E0C199", +":. c #D3AA7A", +"<. c #C89B67", +"[. c #C3965F", +"}. c #BC8E56", +"|. c #BA8B52", +"1. c #BA8C54", +"2. c #F6F6F6", +"3. c #F7F7F7", +"4. c #F8F8F8", +"5. c #E6E9E5", +"6. c #6B8064", +"7. c #4B5F45", +"8. c #44553D", +"9. c #E3C29C", +"0. c #D9B484", +"a. c #D4AE77", +"b. c #CFA770", +"c. c #CCA46B", +"d. c #CBA36B", +"e. c #B6BEB3", +"f. c #4E6047", +"g. c #788274", +"h. c #CBD2C9", +"i. c #6A8063", +"j. c #384834", +"k. c #EDD6B8", +"l. c #E1BD94", +"m. c #D1A874", +"n. c #BD9058", +"o. c #B7874E", +"p. c #B48349", +"q. c #B5844C", +"r. c #8F9C8A", +"s. c #53684B", +"t. c #475841", +"u. c #657C5E", +"v. c #4A5D44", +"w. c #626E5D", +"x. c #EED8BA", +"y. c #E0C099", +"z. c #D8B37F", +"A. c #D2AD76", +"B. c #CEA66F", +"C. c #CCA46D", +"D. c #FAFAFA", +"E. c #6A7E63", +"F. c #63715E", +"G. c #E3E3E3", +"H. c #EED5B7", +"I. c #DFC096", +"J. c #D2A776", +"K. c #CEA46E", +"L. c #C89D65", +"M. c #C49960", +"N. c #C1955C", +"O. c #C2955C", +"P. c #FBFBFB", +"Q. c #FCFCFC", +"R. c #80937A", +"S. c #6D796A", +"T. c #FEFEFE", +"U. c #E5E5E5", +"V. c #AC8C65", +"W. c #CFA772", +"X. c #C49256", +"Y. c #C08D51", +"Z. c #BA8849", +"`. c #B78342", +" + c #B48240", +".+ c #B68241", +"++ c #EAEAEA", +"@+ c #E4E4E4", +" ", +" ", +" . . . . . ", +" . + @ # $ % & * ", +" . = - # ; > , ' ) ! . ", +" ~ { ] ^ . . / ( _ : < ", +" . [ ' } . | ( % 1 . ", +" * 2 3 . 4 5 @ . ", +" 6 7 8 . . $ 9 . ", +" 0 a b c d e f g b h b i j k l m n ", +" . o p q r s t u u v u w x y z A . ", +" . B C D E F G H I J K L M N O P . ", +" . Q R D S T U I V W V X Y Z ` A . ", +" . ...+.@.#.$.%.&.. . . . . . . . . *. ", +" . =.-.;.>.,.'.).!.. ~.~.~.~.~.~.{.].^./.", +" . (._.:.<.[.}.|.1.. ~.2.3.3.4.5.6.7.8. ", +" . Q 9.+.0.a.b.c.d.. ~.e.f.g.h.i.7.j. ", +" . k.l.m.#.n.o.p.q.. ~.r.s.t.u.v.w.. ", +" . x.y.S z.A.B.c.C.. ~.D.E.s./.F.G.. ", +" . H.I.J.K.L.M.N.O.. ~.P.Q.R.S.T.U.. ", +" . V.W.X.Y.Z.`. +.+. ++G.G.@+U.U.3 . ", +" . . . . . . . . . . . . . . . . . ", +" ", +" "}; diff --git a/etc/images/lock.xpm b/etc/images/lock.xpm new file mode 100644 index 00000000000..c9aa18d9f59 --- /dev/null +++ b/etc/images/lock.xpm @@ -0,0 +1,227 @@ +/* XPM */ +static char * stock_lock_xpm[] = { +"24 24 200 2", +" c None", +". c #000000", +"+ c #212121", +"@ c #9E9E9E", +"# c #E6E6E6", +"$ c #E7E7E7", +"% c #C8C8C8", +"& c #A0A0A0", +"* c #131313", +"= c #5F5F5F", +"- c #EDEDED", +"; c #D6D6D6", +"> c #D5D5D5", +", c #DDDDDD", +"' c #D8D8D8", +") c #A1A1A1", +"! c #3C3C3C", +"~ c #353535", +"{ c #EFEFEF", +"] c #CFCFCF", +"^ c #4C4C4C", +"/ c #141414", +"( c #6A6A6A", +"_ c #D0D0D0", +": c #B2B2B2", +"< c #454545", +"[ c #E2E2E2", +"} c #292929", +"| c #0F0F0F", +"1 c #949494", +"2 c #E9E9E9", +"3 c #C3C3C3", +"4 c #1C1C1C", +"5 c #E1E1E1", +"6 c #272727", +"7 c #DEDEDE", +"8 c #B6B6B6", +"9 c #B7B6B6", +"0 c #150902", +"a c #2E2419", +"b c #251D15", +"c c #616160", +"d c #5E5A56", +"e c #29211A", +"f c #15100C", +"g c #2F251B", +"h c #1D1710", +"i c #4A392B", +"j c #656361", +"k c #565352", +"l c #392B1D", +"m c #322110", +"n c #0C0500", +"o c #EFDBBF", +"p c #EDD9C0", +"q c #E9D5BE", +"r c #E7D2B9", +"s c #E5D0B3", +"t c #DCC09D", +"u c #D9BE99", +"v c #DABE99", +"w c #D7BB95", +"x c #D5B68E", +"y c #D2AF85", +"z c #CFA77C", +"A c #9A5E1B", +"B c #F0DABF", +"C c #E4C6A0", +"D c #D6AF80", +"E c #D3AC7B", +"F c #D0A570", +"G c #C99F68", +"H c #C69B64", +"I c #C69C64", +"J c #C89D66", +"K c #C79C65", +"L c #C39860", +"M c #C09256", +"N c #BC8645", +"O c #B67C36", +"P c #985E1A", +"Q c #EED8BC", +"R c #E3C39C", +"S c #D3AA7B", +"T c #CFA670", +"U c #CA9F68", +"V c #C89E66", +"W c #C89F68", +"X c #C49961", +"Y c #C09358", +"Z c #BC8746", +"` c #B77D39", +" . c #EED8BB", +".. c #E2C29B", +"+. c #D6AE7F", +"@. c #CA9E6D", +"#. c #C69861", +"$. c #BF925A", +"%. c #BB8E56", +"&. c #BD8E56", +"*. c #BD9058", +"=. c #BC8F58", +"-. c #B9884E", +";. c #B48145", +">. c #BA8442", +",. c #B47834", +"'. c #975C1A", +"). c #EFDABE", +"!. c #E4C49D", +"~. c #D7B080", +"{. c #DAB685", +"]. c #D4B07C", +"^. c #D0A971", +"/. c #CEA46B", +"(. c #CDA46D", +"_. c #CCA66D", +":. c #CCA46B", +"<. c #CA9F63", +"[. c #C79858", +"}. c #B9813F", +"|. c #B37834", +"1. c #975D1A", +"2. c #EFD8BB", +"3. c #E0C199", +"4. c #D3AA7A", +"5. c #C89B67", +"6. c #C3965F", +"7. c #BC8E56", +"8. c #BA8B52", +"9. c #BA8C54", +"0. c #BB8D55", +"a. c #BA8C55", +"b. c #B6864C", +"c. c #B47F43", +"d. c #BA833F", +"e. c #B37934", +"f. c #9B601E", +"g. c #E3C29C", +"h. c #D9B484", +"i. c #D4AE77", +"j. c #CFA770", +"k. c #CBA36B", +"l. c #CCA46C", +"m. c #CA9D61", +"n. c #C69856", +"o. c #BA813E", +"p. c #B27733", +"q. c #A36B2F", +"r. c #EDD6B8", +"s. c #E1BD94", +"t. c #D1A874", +"u. c #B7874E", +"v. c #B48349", +"w. c #B5844C", +"x. c #B5884D", +"y. c #B48146", +"z. c #B27A3C", +"A. c #B67D3A", +"B. c #B07530", +"C. c #A67137", +"D. c #EED8BA", +"E. c #E0C099", +"F. c #D8B37F", +"G. c #D2AD76", +"H. c #CEA66F", +"I. c #CCA46D", +"J. c #CCA56D", +"K. c #C99D61", +"L. c #C69858", +"M. c #B9803D", +"N. c #B67D38", +"O. c #AB783F", +"P. c #EED5B7", +"Q. c #DFC096", +"R. c #D2A776", +"S. c #CEA46E", +"T. c #C89D65", +"U. c #C49960", +"V. c #C1955C", +"W. c #C2955C", +"X. c #C2965C", +"Y. c #C09155", +"Z. c #BC8A4B", +"`. c #BE8A4C", +" + c #A9773C", +".+ c #AC8C65", +"++ c #CFA772", +"@+ c #C49256", +"#+ c #C08D51", +"$+ c #BA8849", +"%+ c #B78342", +"&+ c #B48240", +"*+ c #B68241", +"=+ c #B88544", +"-+ c #BB8949", +";+ c #BC8748", +">+ c #BA874A", +",+ c #B98548", +"'+ c #B27B3B", +")+ c #6D4215", +" ", +" ", +" . . . . . ", +" . + @ # $ % & * ", +" . = - # ; > , ' ) ! . ", +" ~ { ] ^ . . / ( _ : < ", +" . [ ' } . | ( % 1 . ", +" * 2 3 . 4 5 @ . ", +" 6 7 8 . . $ 9 . ", +" 0 a b c d e f g b h b i j k l m n ", +" . o p q r s t u u v u w x y z A . ", +" . B C D E F G H I J K L M N O P . ", +" . Q R D S T U I V W V X Y Z ` A . ", +" . ...+.@.#.$.%.&.*.=.-.;.>.,.'.. ", +" . ).!.~.{.].^./.(._.:.<.[.}.|.1.. ", +" . 2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.. ", +" . Q g.+.h.i.j.:.k.l.k.m.n.o.p.q.. ", +" . r.s.t.#.*.u.v.w.x.b.y.z.A.B.C.. ", +" . D.E.S F.G.H.:.I.J.l.K.L.M.N.O.. ", +" . P.Q.R.S.T.U.V.W.X.X.Y.Z.>.`. +. ", +" . .+++@+#+$+%+&+*+=+-+;+>+,+'+)+. ", +" . . . . . . . . . . . . . . . ", +" ", +" "}; diff --git a/etc/images/mail/compose.xpm b/etc/images/mail/compose.xpm index 9fa4fa93706..2329b3d996a 100644 --- a/etc/images/mail/compose.xpm +++ b/etc/images/mail/compose.xpm @@ -1,39 +1,225 @@ /* XPM */ -static char *magick[] = { -/* columns rows colors chars-per-pixel */ -"24 24 9 1", -" c Gray0", -". c #757560602020", -"X c #6711662663d9", -"o c #8e8e7d7d4545", -"O c #adad8e8e3030", -"+ c #d8d8bebe6a6a", -"@ c #a8fba84da483", -"# c #eb79ea70e4f4", -"$ c None", -/* pixels */ -"$$$$$$$$$$$$$$$$$$$$$$$$", -"$$$$$$$$$$$$$$$$$$$$$$$$", -"$$$$$$$$$$$$$ $$$$$$$", -"$$$$$$$$ X##@ $$$$$$", -"$$$ X@######@ $$$$$$", -"$$ X@##########X@@ $$$$$", -"$$ #XX########@X@# $$$$$", -"$$ @#@XX######X@## $$$$$", -"$$$ ###@@X@##XXX##@ $ $$", -"$$$ #####@@XX@#@X@# + $", -"$$$ @####X#######X@ +o $", -"$$$$ ###@@######## +o $$", -"$$$$ ###X######## +o $$$", -"$$$$ @#@@######@ +o $$$$", -"$$$$$ #X####@ +o $$$$$", -"$$$$$ X@#@ $ +o $$$$$$", -"$$$$$ XX $$$ +o $$$$$$$", -"$$$$$$ $$$$ +o $$$$$$$$", -"$$$$$$$$$$$O. $$$$$$$$$", -"$$$$$$$$$$$ $$$$$$$$$$$", -"$$$$$$$$$$$$$$$$$$$$$$$$", -"$$$$$$$$$$$$$$$$$$$$$$$$", -"$$$$$$$$$$$$$$$$$$$$$$$$", -"$$$$$$$$$$$$$$$$$$$$$$$$" -}; +static char * stock_mail_compose_xpm[] = { +"24 24 198 2", +" c None", +". c #000000", +"+ c #D1AF61", +"@ c #F1E3AC", +"# c #FBA90F", +"$ c #FFFFFF", +"% c #B5B5B5", +"& c #A06B09", +"* c #816000", +"= c #E0E0E0", +"- c #C1C1C1", +"; c #F4F4F4", +"> c #FDFDFD", +", c #E6C370", +"' c #F1D387", +") c #D58F0C", +"! c #B2B2B2", +"~ c #C3C3C3", +"{ c #FBFBFB", +"] c #A8A8A8", +"^ c #F6F6F6", +"/ c #B3B3B3", +"( c #FAFAFA", +"_ c #ADADAD", +": c #767676", +"< c #5D5D5D", +"[ c #404040", +"} c #F8F8F8", +"| c #F1D07E", +"1 c #ACACAC", +"2 c #F8F8F6", +"3 c #E2E2E2", +"4 c #858585", +"5 c #4B4B49", +"6 c #161616", +"7 c #FBFBFA", +"8 c #7D7D7D", +"9 c #F2F2F2", +"0 c #F0F0F0", +"a c #EFEFEF", +"b c #D5D5D5", +"c c #F9F9F9", +"d c #F6F6F3", +"e c #F3F3F3", +"f c #878786", +"g c #E5E5E5", +"h c #DFDFDF", +"i c #EBEBEB", +"j c #AEAEAE", +"k c #7B5307", +"l c #EDEDED", +"m c #EBEBE9", +"n c #E9E9E7", +"o c #E0E0DE", +"p c #BFBFBF", +"q c #F0F0ED", +"r c #F1D284", +"s c #CA870B", +"t c #9E9E9C", +"u c #DCDCD9", +"v c #D9D9D9", +"w c #D9D9D6", +"x c #D6D6D4", +"y c #E5E5E4", +"z c #D9D9D7", +"A c #BABABA", +"B c #AAAAAA", +"C c #E7E7E5", +"D c #E4E4E2", +"E c #E2E2E0", +"F c #EEEEEC", +"G c #979796", +"H c #D4D4D1", +"I c #DEDEDC", +"J c #DEDEDB", +"K c #BDBDBC", +"L c #E7E7E7", +"M c #EFEFED", +"N c #A6A6A5", +"O c #BA7C0A", +"P c #7A5B00", +"Q c #DBDBD9", +"R c #D5D5D3", +"S c #BCBCBC", +"T c #E3E3E3", +"U c #F2E6B6", +"V c #7B7B7B", +"W c #704B05", +"X c #676764", +"Y c #CBCBC7", +"Z c #C9C9C7", +"` c #DBDBD7", +" . c #D7D7D5", +".. c #D7D7D3", +"+. c #B4B4B4", +"@. c #E4E4E4", +"#. c #DBD5C1", +"$. c #7E6F57", +"%. c #755800", +"&. c #D9D9D5", +"*. c #D5D5D1", +"=. c #D0D0CE", +"-. c #BABAB8", +";. c #DDDDDB", +">. c #D1D1CF", +",. c #0E0E0E", +"'. c #535353", +"). c #8D8D8B", +"!. c #C4C4C1", +"~. c #C4C4BF", +"{. c #C1C1BC", +"]. c #D3D3D0", +"^. c #D1D1D0", +"/. c #DCDCDB", +"(. c #E0E0DC", +"_. c #898987", +":. c #C9C9C6", +"<. c #CDCDCA", +"[. c #D0D0CD", +"}. c #CECECB", +"|. c #CFCFCC", +"1. c #D0D0CC", +"2. c #B6B6B6", +"3. c #D4D4D0", +"4. c #C3C3C0", +"5. c #5B5B5B", +"6. c #91918D", +"7. c #91918F", +"8. c #9F9F9D", +"9. c #AFAFAC", +"0. c #B9B9B6", +"a. c #BEBEBB", +"b. c #C5C5C2", +"c. c #C8C8C5", +"d. c #CACAC7", +"e. c #CBCBC8", +"f. c #CCCCC9", +"g. c #CCCCC8", +"h. c #D2D2D0", +"i. c #D2D2CF", +"j. c #BFBFBD", +"k. c #9F9F9C", +"l. c #888886", +"m. c #878785", +"n. c #8C8C8A", +"o. c #959593", +"p. c #9C9C9A", +"q. c #A8A8A5", +"r. c #B1B1AE", +"s. c #B5B5B3", +"t. c #BBBBB8", +"u. c #BFBFBC", +"v. c #C2C2BE", +"w. c #D1D1CE", +"x. c #AEAEAB", +"y. c #9D9D9A", +"z. c #979794", +"A. c #949491", +"B. c #9A9A97", +"C. c #A3A3A0", +"D. c #AAAAA7", +"E. c #B0B0AC", +"F. c #B8B8B5", +"G. c #B0B0AE", +"H. c #CFCFCD", +"I. c #BEBEBC", +"J. c #B4B4B0", +"K. c #ACACA8", +"L. c #A4A4A2", +"M. c #A0A09C", +"N. c #A4A4A0", +"O. c #A8A8A6", +"P. c #ABABA7", +"Q. c #B2B2AE", +"R. c #A4A4A4", +"S. c #CECECC", +"T. c #CECECA", +"U. c #C6C6C2", +"V. c #BCBCB9", +"W. c #B3B3AF", +"X. c #ABABA9", +"Y. c #A6A6A3", +"Z. c #A0A09D", +"`. c #ACACA9", +" + c #A1A1A1", +".+ c #B1B1AF", +"++ c #B4B4B3", +"@+ c #B4B4B1", +"#+ c #B3B3B1", +"$+ c #AEAEAA", +"%+ c #A7A7A4", +"&+ c #A2A2A0", +"*+ c #A5A5A1", +"=+ c #999997", +"-+ c #929290", +";+ c #949490", +">+ c #9D9D9B", +",+ c #858583", +" . . . ", +" . . . . . . . . . . . . + @ # . . . ", +" . $ $ $ $ $ $ $ $ $ % & @ # * . = - . ", +" . $ ; $ $ $ $ $ > > . , ' ) . ! ~ { ] . ", +" . $ ^ $ $ $ > > > / & @ # * . ( _ : < [ . ", +" . $ ^ $ { { { { } . , | ) . 1 2 3 4 5 6 . ", +" . $ ; > > { { 7 8 & @ # * . ; 9 0 a b _ . ", +" . $ 9 c ^ ^ d e . , | ) . f g 3 h i 3 - . ", +" . $ 0 } } } 2 j k @ # * . l i m n n o p . ", +" . $ a e 0 q l . , r s . t u v w x y z A . ", +" . $ l ; ; 9 B & @ # * . C y y D o E z A . ", +" . $ i F C g . , r s . G H E o I J I z K . ", +" . $ L M i N O # # P . E o I J u Q Q R S . ", +" . $ g T v . U V W . X Y Z u ` z .z ..+.. ", +" . $ E y @.. #.$.%.. u Q ` &...R *...=.-.. ", +" . $ I ;.>.,.'.. . ).!.~.{.*.*.].^.].=.-.. ", +" . $ /.(.;.. . _.:.<.[.}.[.[.[.[.|.[.1.2.. ", +" . $ Q 3.4.5.6.7.8.9.0.a.4.b.c.d.e.f.g.! . ", +" . $ h.i.|.j.k.l.m.n.o.p.q.r.s.t.a.u.v.! . ", +" . $ w.1.f.|.4.x.y.z.z.A.B.k.C.q.D.E.F.G.. ", +" . $ i.w.w.w.H.e.I.J.K.L.M.M.N.L.O.P.Q.R.. ", +" . $ ^.w.=.S.T.T.g.U.V.W.J.X.Y.Z.Y.D.`. +. ", +" . $ .+++@+@+@+#+#+Q.$+%+&+*+*+=+-+;+>+,+. ", +" . . . . . . . . . . . . . . . . . . . . "}; diff --git a/etc/images/mail/copy.xpm b/etc/images/mail/copy.xpm new file mode 100644 index 00000000000..25ccc170e12 --- /dev/null +++ b/etc/images/mail/copy.xpm @@ -0,0 +1,104 @@ +/* XPM */ +static char * stock_mail_copy_xpm[] = { +"24 24 77 1", +" c None", +". c #010101", +"+ c #2F2F2F", +"@ c #E3E2E1", +"# c #FCFCFC", +"$ c #B3B2B1", +"% c #95938E", +"& c #F7F7F7", +"* c #F5F4F2", +"= c #F8F8F8", +"- c #F7F6F6", +"; c #EAE9E5", +"> c #7B7976", +", c #D2CFCA", +"' c #E1E0DD", +") c #908E8B", +"! c #EBEAEA", +"~ c #F1F0EE", +"{ c #E2E0DD", +"] c #7C7B78", +"^ c #C6C3C0", +"/ c #E5E3DE", +"( c #DCDAD7", +"_ c #8F8C88", +": c #EBEBEA", +"< c #EFEDEA", +"[ c #DFDDDA", +"} c #787774", +"| c #C1BEBA", +"1 c #E6E3E0", +"2 c #EFEEEC", +"3 c #CBCAC6", +"4 c #ECECEC", +"5 c #F3F2F0", +"6 c #DCDCDC", +"7 c #7D7C79", +"8 c #B4B2AE", +"9 c #E7E5E1", +"0 c #F0EFEB", +"a c #E4E2DD", +"b c #7B7874", +"c c #AFACA6", +"d c #ABA8A3", +"e c #F9F8F6", +"f c #EAE9E8", +"g c #B0ADA7", +"h c #F5F3F0", +"i c #B9B8B6", +"j c #CBC9C4", +"k c #DEDBD5", +"l c #9D9994", +"m c #DBD9D6", +"n c #747370", +"o c #A09C97", +"p c #DAD8D5", +"q c #E7E6E3", +"r c #E8E6E1", +"s c #E0DED9", +"t c #F7F6F4", +"u c #D3D1CF", +"v c #868480", +"w c #C2BFBD", +"x c #DAD9D5", +"y c #F6F5F1", +"z c #D8D6D1", +"A c #F7F5F2", +"B c #92908B", +"C c #CCCAC5", +"D c #F7F6F2", +"E c #F5F4F0", +"F c #EAE8E3", +"G c #D2D0CB", +"H c #D9D7D2", +"I c #DAD8D3", +"J c #D5D3CE", +"K c #D6D4CF", +"L c #040404", +" ", +" ", +" ", +" .+........... ", +" .@###########$. ", +" .#%&*=*-*-*;>,. ", +" .#')!~-*-*{]^/. ", +" .#~(_:~<~[}|1/. ", +" .#~23]4567890a. ", +" .#22~b.+........... ", +" .#~2c.@###########$. ", +" .#2de.#%&*=*-*-*;>,. ", +" .fgeh.#')!~-*-*{]^/. ", +" .ijkk.#~(_:~<~[}|1/. ", +" .....#~23]4567890a. ", +" .#22~l]mnopqrs. ", +" .#~2ctuvwxoy0z. ", +" .#2deetptAABrC. ", +" .fgehDEAEAhFBG. ", +" .ijkkkHIJKGGGB. ", +" ............L ", +" ", +" ", +" "}; diff --git a/etc/images/mail/forward.xpm b/etc/images/mail/forward.xpm new file mode 100644 index 00000000000..07af5fda6e7 --- /dev/null +++ b/etc/images/mail/forward.xpm @@ -0,0 +1,92 @@ +/* XPM */ +static char * stock_mail_forward_xpm[] = { +"24 24 65 1", +" c None", +". c #000000", +"+ c #535353", +"@ c #FFFFFF", +"# c #FEFEFE", +"$ c #FDFDFD", +"% c #FCFCFC", +"& c #FBFBFB", +"* c #F9F9F9", +"= c #F8F8F8", +"- c #F7F7F7", +"; c #F6F6F6", +"> c #F5F5F5", +", c #F4F4F4", +"' c #E3E3E3", +") c #EEEEEE", +"! c #4F4F4F", +"~ c #F3F3F3", +"{ c #F2F2F2", +"] c #F1F1F1", +"^ c #F0F0F0", +"/ c #EFEFEF", +"( c #EDEDED", +"_ c #AEAEAE", +": c #E4E4E4", +"< c #434343", +"[ c #ACACAC", +"} c #C8C8C8", +"| c #A0A0A0", +"1 c #D4D4D4", +"2 c #ECECEC", +"3 c #959595", +"4 c #3E3E3E", +"5 c #4D4D4D", +"6 c #818181", +"7 c #C6C6C6", +"8 c #6A6A6A", +"9 c #636363", +"0 c #B9B9B9", +"a c #737373", +"b c #7C7C7C", +"c c #5B88B2", +"d c #9EB8D1", +"e c #5080AD", +"f c #B5C9DC", +"g c #AFC5DA", +"h c #B2C7DB", +"i c #B6CADD", +"j c #A4BDD5", +"k c #9CB7D1", +"l c #080D11", +"m c #BCBCBC", +"n c #9BB6D0", +"o c #A0BAD3", +"p c #9AB5CF", +"q c #97B3CE", +"r c #5F8BB4", +"s c #91B0CC", +"t c #95B2CE", +"u c #4C79A3", +"v c #49749C", +"w c #3F6588", +"x c #2A435B", +"y c #456F96", +"z c #375978", +" ", +" ", +" ", +" ................. ", +" .+@@@@#$%&*=-;>,'+. ", +" .)!@>,~{{]^^/)('!_. ", +" .@:<$~{{]^/))('![}. ", +" .@>:!&]^^/)(('<|1}. ", +" .@&>:<=^/)(2'!31:}. ", +" .@>>>:4>)(2'567::}. ", +" .@&>>:8<~2'!877>.}. ", +" .@>>:9@0!^!37a7>... ", +" .@&:9@>:1![7::b:.c. ", +" .@:a@>>>>:.......de. ", +" .@b@::::::.fghiiijkel ", +" .ammmmmmmm.nokknpokqr. ", +" ..........sdppnkkkotu.", +" .vwwwwwwwwx. ", +" .yzzzzzwwx. ", +" .......wx. ", +" .x. ", +" .. ", +" . ", +" "}; diff --git a/etc/images/mail/inbox.xpm b/etc/images/mail/inbox.xpm new file mode 100644 index 00000000000..5774e3ab4aa --- /dev/null +++ b/etc/images/mail/inbox.xpm @@ -0,0 +1,103 @@ +/* XPM */ +static char * stock_inbox_xpm[] = { +"24 24 76 1", +" c None", +". c #000000", +"+ c #B5CADD", +"@ c #BFD1E1", +"# c #C3D4E3", +"$ c #C7D7E5", +"% c #B0C6DA", +"& c #6B94BB", +"* c #131E29", +"= c #739ABF", +"- c #7EA2C4", +"; c #9AB6D0", +"> c #E4EBF2", +", c #DDE6EF", +"' c #8CACCA", +") c #5C8AB4", +"! c #090F15", +"~ c #B1C7DB", +"{ c #D0DDEA", +"] c #D9E3ED", +"^ c #88A9C8", +"/ c #4D7CA7", +"( c #030405", +"_ c #41688D", +": c #32506C", +"< c #C4D5E4", +"[ c #A5BED5", +"} c #456F97", +"| c #3B5F81", +"1 c #C8D8E6", +"2 c #9CB8D2", +"3 c #395B7B", +"4 c #C6D6E4", +"5 c #BBCEDF", +"6 c #3D6183", +"7 c #B6CBDE", +"8 c #426A90", +"9 c #E2C6A9", +"0 c #E5CDB4", +"a c #D5AA7F", +"b c #9D6733", +"c c #CB9967", +"d c #ADC4D9", +"e c #B99877", +"f c #CFBAA4", +"g c #9A7149", +"h c #CDA378", +"i c #D2A87E", +"j c #608DB6", +"k c #AA7B4B", +"l c #C2A588", +"m c #996633", +"n c #BB9978", +"o c #C3976B", +"p c #D2A980", +"q c #D1A77D", +"r c #E0C4A8", +"s c #C9B097", +"t c #D7B38E", +"u c #DAC2A9", +"v c #BD9063", +"w c #CEA57C", +"x c #E5CFBB", +"y c #393633", +"z c #E0C8B1", +"A c #C9A480", +"B c #D1A87E", +"C c #D0A67B", +"D c #E1CAB4", +"E c #52504D", +"F c #D8C6B5", +"G c #CBA988", +"H c #CCAF93", +"I c #D2B496", +"J c #A67D51", +"K c #E2CFBD", +" ...... ", +" .+@#$%&*. ", +" .=-;$>,')! ", +" ...=~{]^/( ", +" .=+#$_:. ", +" .<[@}|. ", +" .12@}3. ", +" ....425}6.... ", +" .=2527}8}:. ", +" ..9.=227}}:. ", +" ..0abb.=2~}:.. ", +" ..0abbbbc.=d:.ef.. ", +".0abbbbghii.j.kkklf.. ", +".mnabgopqqqi.iokkkkef. ", +".mmmnrooqiqqqiiiokkkks. ", +".mmmmmnrooqiqqqiiiokkl. ", +" ..mmmmmnrooqiqqiiituf. ", +" ..mmmmmnrvwiqqtxxy. ", +" ..mmmmmzABCDxE.. ", +" ...mmmFGHIE.. ", +" ...mJK... ", +" ..... ", +" ", +" "}; diff --git a/etc/images/mail/move.xpm b/etc/images/mail/move.xpm new file mode 100644 index 00000000000..ed478eb8c8b --- /dev/null +++ b/etc/images/mail/move.xpm @@ -0,0 +1,103 @@ +/* XPM */ +static char * stock_mail_move_xpm[] = { +"24 24 76 1", +" c None", +". c #010101", +"+ c #2F2F2F", +"@ c #E3E2E1", +"# c #FCFCFC", +"$ c #B3B2B1", +"% c #95938E", +"& c #F7F7F7", +"* c #F5F4F2", +"= c #F8F8F8", +"- c #F7F6F6", +"; c #EAE9E5", +"> c #7B7976", +", c #D2CFCA", +"' c #E1E0DD", +") c #908E8B", +"! c #EBEAEA", +"~ c #F1F0EE", +"{ c #E2E0DD", +"] c #7C7B78", +"^ c #C6C3C0", +"/ c #E5E3DE", +"( c #DCDAD7", +"_ c #8F8C88", +": c #EBEBEA", +"< c #EFEDEA", +"[ c #DFDDDA", +"} c #787774", +"| c #C1BEBA", +"1 c #E6E3E0", +"2 c #EFEEEC", +"3 c #CBCAC6", +"4 c #ECECEC", +"5 c #F3F2F0", +"6 c #DCDCDC", +"7 c #7D7C79", +"8 c #B4B2AE", +"9 c #E7E5E1", +"0 c #F0EFEB", +"a c #E4E2DD", +"b c #9D9994", +"c c #DBD9D6", +"d c #747370", +"e c #A09C97", +"f c #DAD8D5", +"g c #E7E6E3", +"h c #E8E6E1", +"i c #E0DED9", +"j c #AFACA6", +"k c #F7F6F4", +"l c #D3D1CF", +"m c #868480", +"n c #C2BFBD", +"o c #DAD9D5", +"p c #F6F5F1", +"q c #D8D6D1", +"r c #ABA8A3", +"s c #F9F8F6", +"t c #F7F5F2", +"u c #92908B", +"v c #CCCAC5", +"w c #EAE9E8", +"x c #B0ADA7", +"y c #F5F3F0", +"z c #F7F6F2", +"A c #F5F4F0", +"B c #EAE8E3", +"C c #D2D0CB", +"D c #B9B8B6", +"E c #CBC9C4", +"F c #DEDBD5", +"G c #D9D7D2", +"H c #DAD8D3", +"I c #D5D3CE", +"J c #D6D4CF", +"K c #040404", +" ", +" ", +" ", +" . . . . . . . ", +" . . ", +" ", +" . . ", +" ", +" . . ", +" .+........... ", +" . .@###########$. ", +" .#%&*=*-*-*;>,. ", +" . .#')!~-*-*{]^/. ", +" .#~(_:~<~[}|1/. ", +" . . .#~23]4567890a. ", +" .#22~b]cdefghi. ", +" .#~2jklmnoep0q. ", +" .#2rsskfkttuhv. ", +" .wxsyzAtAtyBuC. ", +" .DEFFFGHIJCCCu. ", +" ............K ", +" ", +" ", +" "}; diff --git a/etc/images/mail/not-spam.xpm b/etc/images/mail/not-spam.xpm new file mode 100644 index 00000000000..f8db326a4bb --- /dev/null +++ b/etc/images/mail/not-spam.xpm @@ -0,0 +1,149 @@ +/* XPM */ +static char * stock_not_spam_xpm[] = { +"24 24 122 2", +" c None", +". c #1D1E1E", +"+ c #333839", +"@ c #393F40", +"# c #171819", +"$ c #B2B8B9", +"% c #D5E3E7", +"& c #AABABD", +"* c #64696A", +"= c #0C0D0D", +"- c #929C9E", +"; c #E7F0F3", +"> c #EDF0F1", +", c #E5EDEF", +"' c #C5D9DD", +") c #2E3132", +"! c #3F4343", +"~ c #1F2121", +"{ c #DFEBEE", +"] c #B7C4C8", +"^ c #D2D9DA", +"/ c #E1EFF2", +"( c #B6CBCF", +"_ c #3C4547", +": c #1E2223", +"< c #191E1F", +"[ c #2D2E2F", +"} c #191A1A", +"| c #252829", +"1 c #7E8E92", +"2 c #B7C2C3", +"3 c #C3D9DD", +"4 c #9CACB0", +"5 c #C3CDCE", +"6 c #C7E1E7", +"7 c #668F97", +"8 c #90ACB2", +"9 c #CDDDE1", +"0 c #485559", +"a c #88A6AC", +"b c #1F2223", +"c c #3F4545", +"d c #242728", +"e c #313B3E", +"f c #A8C2C8", +"g c #B2BDC0", +"h c #CFE5E9", +"i c #C2D9DE", +"j c #81989C", +"k c #A2C0C5", +"l c #85A9B1", +"m c #E5ECEE", +"n c #E7F2F4", +"o c #9BAEB3", +"p c #C8E1E7", +"q c #3A3E3F", +"r c #0C0E0E", +"s c #000000", +"t c #333737", +"u c #B3C2C5", +"v c #DDEDF0", +"w c #D8E4E6", +"x c #DAECEF", +"y c #D5E9ED", +"z c #D2E7EC", +"A c #95ADB2", +"B c #DBE2E2", +"C c #EDEFF0", +"D c #A2B1B3", +"E c #8FA4A8", +"F c #D7E2E5", +"G c #798F94", +"H c #151819", +"I c #F3B5A7", +"J c #865E55", +"K c #AFB9BB", +"L c #F1F8F9", +"M c #F7FBFB", +"N c #D9EBEF", +"O c #ECF4F6", +"P c #F3F7F7", +"Q c #E9F2F4", +"R c #EEF2F3", +"S c #E9EDEE", +"T c #C5C8C9", +"U c #C2C6C8", +"V c #E0E7E7", +"W c #DDEAED", +"X c #7A9DA5", +"Y c #EB8169", +"Z c #B83618", +"` c #924E3C", +" . c #9FA5A6", +".. c #E3EEF0", +"+. c #ECF5F7", +"@. c #D6EAED", +"#. c #CBE4E9", +"$. c #747C7D", +"%. c #B43518", +"&. c #E76A4D", +"*. c #B53F24", +"=. c #CB705A", +"-. c #C4D8DB", +";. c #D2E6E9", +">. c #CAE3E8", +",. c #A9C8CF", +"'. c #EC927D", +"). c #E66F54", +"!. c #D26951", +"~. c #F1A897", +"{. c #E76547", +"]. c #C58B7D", +"^. c #A8ABAC", +"/. c #70A1AB", +"(. c #DF421E", +"_. c #C43A1A", +":. c #E17055", +"<. c #DD8D7A", +"[. c #FFFFFF", +"}. c #030505", +"|. c #A2432E", +"1. c #AC3316", +" ", +" ", +" . + @ ", +" # $ % & * . ", +" = - ; > , ' ) ! ", +" ~ { ] ^ / ( _ : < [ } ", +" | 1 2 3 4 5 6 7 8 9 0 a b ", +" c d e f g h i j k l m n o p q r ", +" s t u v w / x y z A B C D E F G H ", +" s s I J K L M N O P Q R S T U V W X < ", +"s I Y Z ` ...+.@.#.$.s s s s s s s s s s s s ", +"s %.&.Y *.=.-.;.>.,.s '.).).).).).).).).).).!.s ", +"s %.%.%.&.~.{.].^./.s ).(.(.(.(.(.(.(.(.(.(._.s ", +"s %.%.%.%.%.&.~.:.<.s ).(.[.[.(.(.(.(.[.[.(._.s ", +" s s %.%.%.%.%.&.~.s ).(.[.[.[.(.(.[.[.[.(._.s ", +" s s %.%.%.%.%.s ).(.(.[.[.[.[.[.[.(.(._.s ", +" s s %.%.%.s ).(.(.(.[.[.[.[.(.(.(._.s ", +" }.s s |.s ).(.(.(.[.[.[.[.(.(.(._.s ", +" s s s ).(.(.[.[.[.[.[.[.(.(._.s ", +" s ).(.[.[.[.(.(.[.[.[.(._.s ", +" s ).(.[.[.(.(.(.(.[.[.(._.s ", +" s ).(.(.(.(.(.(.(.(.(.(._.s ", +" s !._._._._._._._._._._.1.s ", +" s s s s s s s s s s s s "}; diff --git a/etc/images/mail/outbox.xpm b/etc/images/mail/outbox.xpm new file mode 100644 index 00000000000..58b5212b49d --- /dev/null +++ b/etc/images/mail/outbox.xpm @@ -0,0 +1,96 @@ +/* XPM */ +static char * stock_outbox_xpm[] = { +"24 24 69 1", +" c None", +". c #000000", +"+ c #E66040", +"@ c #EE937E", +"# c #E55E3F", +"$ c #E1431F", +"% c #EC8770", +"& c #F0A08E", +"* c #F3B7A9", +"= c #EF9985", +"- c #E76749", +"; c #ED8C75", +"> c #F5BEB1", +", c #F3B4A5", +"' c #F4B8AA", +") c #F1A593", +"! c #E55B3B", +"~ c #E45534", +"{ c #F4BDB0", +"] c #F4BAAC", +"^ c #EF9C89", +"/ c #E34E2B", +"( c #C0391A", +"_ c #8A2912", +": c #3E3E3C", +"< c #D4D3D2", +"[ c #DB411D", +"} c #F1A999", +"| c #D23E1C", +"1 c #812611", +"2 c #C7C7C5", +"3 c #ACABA8", +"4 c #6A6966", +"5 c #E9775D", +"6 c #CECDCC", +"7 c #A93217", +"8 c #9B9A97", +"9 c #494846", +"0 c #9A9996", +"a c #BBBBB9", +"b c #747370", +"c c #A5A4A1", +"d c #AAA9A6", +"e c #686765", +"f c #7D7C79", +"g c #686764", +"h c #9C9B98", +"i c #999895", +"j c #ABAAA7", +"k c #A9A8A5", +"l c #AF3417", +"m c #E55D3D", +"n c #C5C5C3", +"o c #8D8C89", +"p c #626260", +"q c #B2B1AE", +"r c #A7A6A3", +"s c #B4B4B2", +"t c #C3C3C1", +"u c #92918E", +"v c #D1D0CF", +"w c #373735", +"x c #CACAC8", +"y c #A8A7A4", +"z c #CCCCCA", +"A c #52514E", +"B c #C8C8C6", +"C c #B5B5B3", +"D c #7E7D7A", +" . ", +" .. ", +" .+. ", +" ....@#. ", +" .$%&*=@-. ", +" .;>,')@@@!. ", +" .~{]*^@@@@@-.", +" ...@>/((((((_. ", +" .:<.[}|((((((1. ", +" ..234.5+(_...(1. ", +" ..63444.@(7...._. ", +" ..6344448.@(.90a.. ", +".634444bcd.#$.eff.a.. ", +".gh34bijkk.lm.iffff0a. ", +".ggghniikdo..pddiffffq. ", +".ggggghniikdkkkdddiffr. ", +" ..ggggghniikdkkdddsta. ", +" ..ggggghnurdkksvvw. ", +" ..gggggxrdyzvA.. ", +" ...gggB3qCA.. ", +" ...gDv... ", +" ..... ", +" ", +" "}; diff --git a/etc/images/mail/preview.xpm b/etc/images/mail/preview.xpm new file mode 100644 index 00000000000..563a267ec51 --- /dev/null +++ b/etc/images/mail/preview.xpm @@ -0,0 +1,178 @@ +/* XPM */ +static char * mail_preview_xpm[] = { +"24 24 151 2", +" c None", +". c #343434", +"+ c #2D2D2D", +"@ c #292929", +"# c #262626", +"$ c #2E2E2E", +"% c #303030", +"& c #737373", +"* c #A1A1A1", +"= c #B4B4B4", +"- c #B2B2B2", +"; c #9D9D9D", +"> c #676767", +", c #202020", +"' c #1C1C1C", +") c #272727", +"! c #616161", +"~ c #CACACA", +"{ c #CFCFCF", +"] c #D0D0D0", +"^ c #CECECE", +"/ c #C9C9C9", +"( c #C1C1C1", +"_ c #A7A7A7", +": c #4C4C4C", +"< c #131313", +"[ c #222222", +"} c #757575", +"| c #D3D3D3", +"1 c #DBDBDB", +"2 c #E7E7E7", +"3 c #EFEFEF", +"4 c #F3F3F3", +"5 c #F1F1F1", +"6 c #E5E5E5", +"7 c #D2D2D2", +"8 c #BCBCBC", +"9 c #5E5E5E", +"0 c #101010", +"a c #212121", +"b c #5B5B5B", +"c c #CCCCCC", +"d c #D7D7D7", +"e c #F5F5F5", +"f c #FAFAFA", +"g c #FBFBFB", +"h c #F8F8F8", +"i c #F0F0F0", +"j c #E1E1E1", +"k c #C2C2C2", +"l c #434343", +"m c #0F0F0F", +"n c #1F1F1F", +"o c #B9B9B9", +"p c #D4D4D4", +"q c #F7F7F7", +"r c #F9F9F9", +"s c #F6F6F6", +"t c #EAEAEA", +"u c #E2E2E2", +"v c #ABABAB", +"w c #0E0E0E", +"x c #000000", +"y c #111111", +"z c #686868", +"A c #9C9C9C", +"B c #808080", +"C c #8E8E8E", +"D c #919191", +"E c #929292", +"F c #949494", +"G c #939393", +"H c #8B8B8B", +"I c #838383", +"J c #A3A3A3", +"K c #555555", +"L c #080808", +"M c #535353", +"N c #333333", +"O c #AFAFAF", +"P c #E6E6E6", +"Q c #FDFDFD", +"R c #FEFEFE", +"S c #FCFCFC", +"T c #A8A8A8", +"U c #8D8D8D", +"V c #050505", +"W c #EEEEEE", +"X c #A6A6A6", +"Y c #C8C8C8", +"Z c #FFFFFF", +"` c #B6B6B6", +" . c #F4F4F4", +".. c #F2F2F2", +"+. c #A9A9A9", +"@. c #040404", +"#. c #2A2A2A", +"$. c #AAAAAA", +"%. c #ECECEC", +"&. c #A5A5A5", +"*. c #C7C7C7", +"=. c #D8D8D8", +"-. c #CDCDCD", +";. c #858585", +">. c #010101", +",. c #606060", +"'. c #646464", +"). c #C3C3C3", +"!. c #DADADA", +"~. c #494949", +"{. c #ADADAD", +"]. c #0A0A0A", +"^. c #BABABA", +"/. c #DCDCDC", +"(. c #989898", +"_. c #E9E9E9", +":. c #EBEBEB", +"<. c #A4A4A4", +"[. c #B7B7B7", +"}. c #D1D1D1", +"|. c #414141", +"1. c #3D3D3D", +"2. c #969696", +"3. c #A0A0A0", +"4. c #BEBEBE", +"5. c #D9D9D9", +"6. c #C5C5C5", +"7. c #515151", +"8. c #C0C0C0", +"9. c #959595", +"0. c #DDDDDD", +"a. c #484848", +"b. c #030303", +"c. c #454545", +"d. c #060606", +"e. c #B5B5B5", +"f. c #C6C6C6", +"g. c #C4C4C4", +"h. c #A2A2A2", +"i. c #828282", +"j. c #1E1E1E", +"k. c #191919", +"l. c #7C7C7C", +"m. c #E4E4E4", +"n. c #9E9E9E", +"o. c #525252", +"p. c #B0B0B0", +"q. c #6C6C6C", +"r. c #565656", +"s. c #797979", +"t. c #3A3A3A", +" ", +" ", +" . + @ # # # ", +" $ % & * = - ; > , ' ", +" ) ! = ~ { ] ^ / ( _ : < ", +" [ } ~ | 1 2 3 4 5 6 7 8 9 0 ", +" a b c d 6 e f g f h e i j k l m ", +" n o p 6 q r g g f r s i t u v w ", +" x y z A B C D E F F G G D C H I J K L ", +"x M N O P e r g Q R R Q S f h e i T U V ", +"x W y ~ t 5 q q g r S r f q e i X Y _ V ", +"x Z y ` t 3 4 e s q q q s ...+.~ ] J @. ", +"x Z #.$.v %.i .. .e e e 4 5 &.*.=.-.;.>. ", +"x Z ,.'.1 ; %.3 i 5 5 i i T ).=.!./ ~.x ", +"x Z {.].^./.(._.:.%.%.%.<.[.}.!.p &.>. ", +"x Z /.|.1.7 +.2.6 6 6 3.$.4.=.5.).% x ", +"x Z e 6.L 7.8.( 9.0.(.= Y J ).( a.b.x ", +"x Z g d c.d.. 3.( F e.8.~ f.U + b.].x x ", +"x Z e & ^.g.1.b.a.I h.&.i.l x j.[.k.x x x ", +"x Z l.p m.m.Y n.o.j.b.b.j.o.n.p.q.O j.n x x ", +"x & 8 8 8 8 8 8 &.&.&.&.&.&.&.8 8 r.x > N x x ", +" x x x x x x x x x x x x x x x x x x x s.t.x x ", +" x z n x ", +" x x "}; diff --git a/etc/images/mail/reply-all.xpm b/etc/images/mail/reply-all.xpm index 43453ee4d3a..dfd560d14fb 100644 --- a/etc/images/mail/reply-all.xpm +++ b/etc/images/mail/reply-all.xpm @@ -1,38 +1,176 @@ /* XPM */ -static char * reply_all_xpm[] = { -/* columns rows colors chars-per-pixel */ -"24 24 9 1", -" c None", -". c black", -"X c #673e666663d4", -"o c #eb46ea1de471", -"O c #a852a7bea3d2", -"+ c #ae51c17b9b26", -"@ c #8d4d97577838", -"# c #7c7c8b8b6e6e", -"$ c #5e0868be52d3", -/* pixels */ -" ", -" ", -" .... ", -" .....XooO. ", -" .....XOooooooO. ", -" .XOooooooooooXOO. ", -" .oXXooooooooOXOo. ", -" .OoOXXooooooXOoo. ", -" .oooOOXOooXXXooO. ", -" ........XXOoOXOo. ", -" ..++++@.ooooooXO. ", -" ..+@@@.oooooooXO. ", -" ..+@@@#.oooooooO.. ", -" ..++@@@#$.ooooO... ", -" .++++@@#.$ .. ", -" .+@@@#.o .. .O .O ", -" .+@#$. .O. .O .O ", -" .#$. .O .o .O .O ", -" .$. . .O .O .O ", -" . ....O .O .O ", -" .O .O .O .O ", -" .O .O .O .O ", -" .O .O .O .O ", -" "}; +static char * stock_mail_reply_to_all_xpm[] = { +"24 24 149 2", +" c None", +". c #000000", +"+ c #ADA99C", +"@ c #E6E1D0", +"# c #F0EAD9", +"$ c #A9A598", +"% c #141416", +"& c #161618", +"* c #080809", +"= c #DBD6C7", +"- c #1B1B1C", +"; c #050505", +"> c #5A5A5A", +", c #676767", +"' c #020202", +") c #807D76", +"! c #D49A3E", +"~ c #D2973B", +"{ c #040402", +"] c #6D6B6B", +"^ c #7A7979", +"/ c #030100", +"( c #040100", +"_ c #282724", +": c #DD9831", +"< c #DA962F", +"[ c #1A0E01", +"} c #BC6D1B", +"| c #BE6E13", +"1 c #BE6D13", +"2 c #BD6C13", +"3 c #3E3C36", +"4 c #D69029", +"5 c #D18D27", +"6 c #737067", +"7 c #110900", +"8 c #CF791C", +"9 c #CE791C", +"0 c #CD761A", +"a c #C47013", +"b c #4A4136", +"c c #A0731E", +"d c #96691A", +"e c #000100", +"f c #291703", +"g c #BA6613", +"h c #8C4E0D", +"i c #844A0D", +"j c #BF6D13", +"k c #1F2A0D", +"l c #306220", +"m c #4F7242", +"n c #448D44", +"o c #2E802E", +"p c #3A6F3A", +"q c #FFFFFF", +"r c #535353", +"s c #171009", +"t c #AC600C", +"u c #713F0A", +"v c #693A0A", +"w c #AA5F0A", +"x c #192B10", +"y c #275926", +"z c #68A769", +"A c #358A36", +"B c #2D812D", +"C c #FBFBFB", +"D c #F7F7F7", +"E c #FAFAFA", +"F c #F5F5F5", +"G c #4F4F4F", +"H c #AEAEAE", +"I c #141517", +"J c #6F767C", +"K c #534C46", +"L c #241609", +"M c #23180E", +"N c #484644", +"O c #354A4D", +"P c #050B07", +"Q c #4F7E4F", +"R c #399239", +"S c #2D852D", +"T c #297F29", +"U c #ACACAC", +"V c #C8C8C8", +"W c #151618", +"X c #6C7C8B", +"Y c #728EA9", +"Z c #5D6B78", +"` c #C8CBCD", +" . c #C3C7CD", +".. c #8090A2", +"+. c #5A728B", +"@. c #4E6479", +"#. c #111714", +"$. c #328732", +"%. c #2B7F2C", +"&. c #2B772C", +"*. c #434343", +"=. c #A0A0A0", +"-. c #D4D4D4", +";. c #25282A", +">. c #8A9EB4", +",. c #6A86A1", +"'. c #596A7C", +"). c #DDE1E4", +"!. c #DCE2E7", +"~. c #899CAC", +"{. c #687E96", +"]. c #546D87", +"^. c #10161D", +"/. c #8C8C8C", +"(. c #959595", +"_. c #E4E4E4", +":. c #23282D", +"<. c #8096AB", +"[. c #5D7996", +"}. c #53687D", +"|. c #CDD3D9", +"1. c #CBD2DC", +"2. c #899BAB", +"3. c #CCD4DC", +"4. c #5C748C", +"5. c #111820", +"6. c #4D4D4D", +"7. c #818181", +"8. c #C6C6C6", +"9. c #1F252B", +"0. c #6B8197", +"a. c #536D89", +"b. c #4A5D6F", +"c. c #81919F", +"d. c #8293A4", +"e. c #5A7087", +"f. c #496481", +"g. c #445D79", +"h. c #0E151B", +"i. c #6A6A6A", +"j. c #0E141A", +"k. c #0D1319", +"l. c #0E141B", +"m. c #0E131A", +"n. c #0F141A", +"o. c #636363", +"p. c #737373", +"q. c #7C7C7C", +"r. c #BCBCBC", +" ", +" . . ", +" + @ # $ . ", +" % & * = # # # . ", +" - ; > , ' ) ! ~ # . ", +" { ] ^ / ( _ : < # . ", +" [ } | 1 2 3 4 5 # 6 ", +" 7 8 9 0 a b c d # # . e . . . . . . ", +" f g h i j k l m n o p . q q q q q r . ", +" s t u v w x y z A o B . C D E F G H . ", +" I J K L M N O P Q R S T . F F F G U V . ", +" W X Y Z ` ...+.@.#.$.%.&.. F F *.=.-.V . ", +" ;.>.,.'.).!.~.{.].^.. . . /.F G (.-._.V . ", +" :.<.[.}.|.1.2.3.4.5.F F F F 6.7.8._._.V . ", +" 9.0.a.b.c.d.e.f.g.h.F F F G i.=._.F _.V . ", +" j.k.l.l.l.j.m.n.o.G F G (.8.p.8.F _.V . ", +" . q C F o.8.F _.-.G U 8._.F q._._.V . ", +" . q F p.-.F F F F _._.F F F F q._.V . ", +" . q q.-._._._._._._._._._._._._.q.V . ", +" . p.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.o.. ", +" . . . . . . . . . . . . . . . . . . ", +" ", +" ", +" "}; diff --git a/etc/images/mail/reply.xpm b/etc/images/mail/reply.xpm index 047f8533d7c..49250417c61 100644 --- a/etc/images/mail/reply.xpm +++ b/etc/images/mail/reply.xpm @@ -1,38 +1,94 @@ /* XPM */ -static char * mail_reply_xpm[] = { -/* columns rows colors chars-per-pixel */ -"24 24 9 1", +static char * stock_mail_reply_xpm[] = { +"24 24 67 1", " c None", -". c black", -"X c #673e666663d4", -"o c #eb46ea1de471", -"O c #a852a7bea3d2", -"+ c #ae51c17b9b26", -"@ c #8d4d97577838", -"# c #7c7c8b8b6e6e", -"$ c #5e0868be52d3", -/* pixels */ +". c #000000", +"+ c #535353", +"@ c #FFFFFF", +"# c #FEFEFE", +"$ c #FDFDFD", +"% c #FCFCFC", +"& c #FBFBFB", +"* c #F9F9F9", +"= c #F8F8F8", +"- c #F7F7F7", +"; c #F6F6F6", +"> c #F5F5F5", +", c #F4F4F4", +"' c #E3E3E3", +") c #EEEEEE", +"! c #4F4F4F", +"~ c #F3F3F3", +"{ c #F2F2F2", +"] c #F1F1F1", +"^ c #F0F0F0", +"/ c #EFEFEF", +"( c #EDEDED", +"_ c #AEAEAE", +": c #E4E4E4", +"< c #434343", +"[ c #ACACAC", +"} c #C8C8C8", +"| c #A0A0A0", +"1 c #D4D4D4", +"2 c #ECECEC", +"3 c #959595", +"4 c #3E3E3E", +"5 c #4D4D4D", +"6 c #818181", +"7 c #C6C6C6", +"8 c #3D1A13", +"9 c #6A6A6A", +"0 c #636363", +"a c #B9B9B9", +"b c #737373", +"c c #EAC0BA", +"d c #7C7C7C", +"e c #DF9E95", +"f c #E0A198", +"g c #E1A59D", +"h c #E2A79E", +"i c #E3ABA3", +"j c #E3AAA2", +"k c #CC6253", +"l c #DD978D", +"m c #DF9F97", +"n c #DE9A90", +"o c #DD968C", +"p c #DD948A", +"q c #B14334", +"r c #BCBCBC", +"s c #431913", +"t c #EAC2BC", +"u c #DF9C92", +"v c #DD998F", +"w c #B54535", +"x c #65261D", +"y c #983A2C", +"z c #7C2F24", +"A c #63251D", +"B c #6C291F", " ", " ", " ", -" ", -" ", -" .... ", -" .....XooO. ", -" .....XOooooooO. ", -" .XOooooooooooXOO. ", -" .oXXooooooooOXOo. ", -" .OoOXXooooooXOoo. ", -" .oooOOXOooXXXooO. ", -" ........XXOoOXOo. ", -" ..++++@.ooooooXO. ", -" ..+@@@.oooooooXO. ", -" ..+@@@#.oooooooO.. ", -" ..++@@@#$.ooooO... ", -" .++++@@#.$.oO... ", -" .+@@@#.o.... ", -" .+@#$... ", -" .#$. ", -" .$. ", +" ................. ", +" .+@@@@#$%&*=-;>,'+. ", +" .)!@>,~{{]^^/)('!_. ", +" .@:<$~{{]^/))('![}. ", +" .@>:!&]^^/)(('<|1}. ", +" .@&>:<=^/)(2'!31:}. ", +" .@>>>:4>)(2'567::}. ", +" .@&8>:9<~2'!977>:}. ", +" .@..:0@a!^!37b7>:}. ", +" ..c.0@>:1![7::d::}. ", +" .ce.......:>>>:d:}. ", +" .cfghihjek.::::::d}. ", +" .clmenoonpq.rrrrrrr0. ", +"stnuvvlnnnnw.......... ", +" .xyyyyyyyyz. ", +" .xyyAAAAAB. ", +" .xy....... ", +" .x. ", +" .. ", " . ", " "}; diff --git a/etc/images/mail/save-draft.xpm b/etc/images/mail/save-draft.xpm new file mode 100644 index 00000000000..9b374917898 --- /dev/null +++ b/etc/images/mail/save-draft.xpm @@ -0,0 +1,99 @@ +/* XPM */ +static char * stock_mail_handling_xpm[] = { +"24 24 72 1", +" c None", +". c #000000", +"+ c #BCBCBC", +"@ c #FFFFFF", +"# c #535353", +"$ c #EEEEEE", +"% c #4F4F4F", +"& c #F5F5F5", +"* c #FBFBFB", +"= c #F7F7F7", +"- c #FAFAFA", +"; c #AEAEAE", +"> c #E4E4E4", +", c #434343", +"' c #ACACAC", +") c #C8C8C8", +"! c #A0A0A0", +"~ c #D4D4D4", +"{ c #959595", +"] c #3E3E3E", +"^ c #4D4D4D", +"/ c #818181", +"( c #C6C6C6", +"_ c #6A6A6A", +": c #636363", +"< c #B9B9B9", +"[ c #737373", +"} c #010101", +"| c #AAAAAA", +"1 c #0B0B0B", +"2 c #0C0C0C", +"3 c #060606", +"4 c #E4E3E1", +"5 c #050505", +"6 c #B3B3B1", +"7 c #484641", +"8 c #9F9D96", +"9 c #888781", +"0 c #7C7C7C", +"a c #B0AFAD", +"b c #A8A7A1", +"c c #908E86", +"d c #97958E", +"e c #807D74", +"f c #969696", +"g c #090909", +"h c #595854", +"i c #605E57", +"j c #898883", +"k c #76746B", +"l c #43423F", +"m c #282724", +"n c #363430", +"o c #6D6B63", +"p c #E2E2E1", +"q c #B6B5AF", +"r c #21201E", +"s c #0A0908", +"t c #181816", +"u c #E6E6E4", +"v c #65635C", +"w c #161614", +"x c #8C8B89", +"y c #DFDEDC", +"z c #B0AFA9", +"A c #D5D4D1", +"B c #93918B", +"C c #D6D5D2", +"D c #ABA9A3", +"E c #5D5C55", +"F c #494943", +"G c #42413C", +" ", +" ................. ", +" .+@@@@@@@@@@@@@@@#. ", +" .$%&*&*=*&*&*=-&%;. ", +" .@>,&&&&&&&&&&&%'). ", +" .@&>%&&&&&&&&&,!~). ", +" .@*&>,&&&&&&&%{~>). ", +" .@&&&>]&&&&&^/(>>). ", +" .@*&&&_,&&&%_!>&>). ", +" .@&&&:<<%&%{([(}}}. ", +" .@*&:(&>~%'|12:345... ", +" .@&[~&&&&>>2>62787.9.. ", +" .@0~>>>>>>>1ab888cde7. ", +" .[+++++++++fg88hijek. ", +" ...........78ilmn8o7..", +" .pq8hrstuevi.", +" ..78jnwxyv7..", +" .zequABv. ", +" .CD8eekkE7. ", +" ..h.7k7.F.. ", +" .. .G. .. ", +" ... ", +" ", +" "}; diff --git a/etc/images/mail/save.xpm b/etc/images/mail/save.xpm new file mode 100644 index 00000000000..00017161990 --- /dev/null +++ b/etc/images/mail/save.xpm @@ -0,0 +1,291 @@ +/* XPM */ +static char * mail_save_xpm[] = { +"24 24 264 2", +" c None", +". c #000000", +"+ c #141414", +"@ c #262626", +"# c #212121", +"$ c #1F1F1F", +"% c #1E1E1E", +"& c #1D1D1D", +"* c #202020", +"= c #232323", +"- c #292929", +"; c #171717", +"> c #121212", +", c #B8B8B8", +"' c #FFFFFF", +") c #A8A8A8", +"! c #0E0E0E", +"~ c #595959", +"{ c #444444", +"] c #4F4F4F", +"^ c #050505", +"/ c #222222", +"( c #3D3D3D", +"_ c #FEFEFE", +": c #FCFCFC", +"< c #FDFDFD", +"[ c #CACACA", +"} c #191919", +"| c #B3B1B0", +"1 c #EEECEB", +"2 c #F0DCAA", +"3 c #E5C470", +"4 c #DFB84F", +"5 c #8A681F", +"6 c #100E09", +"7 c #FBFBFB", +"8 c #515151", +"9 c #F0F0F0", +"0 c #D6D6D6", +"a c #EEECE9", +"b c #E6D498", +"c c #EED682", +"d c #EED680", +"e c #E3C15E", +"f c #D29815", +"g c #976E15", +"h c #7F5B0A", +"i c #1C190F", +"j c #D9D9D9", +"k c #424242", +"l c #F1F1F1", +"m c #F3F3F3", +"n c #EBE9E5", +"o c #CBB771", +"p c #735817", +"q c #C6A546", +"r c #E3C05D", +"s c #BC8710", +"t c #AD7C10", +"u c #6B6B6B", +"v c #A0A0A0", +"w c #535353", +"x c #505050", +"y c #AE9C5C", +"z c #292928", +"A c #CECDCA", +"B c #CAC9C7", +"C c #1A1917", +"D c #9C7E2B", +"E c #AB7C12", +"F c #242012", +"G c #555555", +"H c #DEDEDE", +"I c #E8E8E8", +"J c #3B3B3B", +"K c #D7D6D6", +"L c #656462", +"M c #DAD9D7", +"N c #E1E0DF", +"O c #1A1A19", +"P c #3D351F", +"Q c #A37819", +"R c #231F13", +"S c #282828", +"T c #898989", +"U c #EFEFEF", +"V c #FAFAFA", +"W c #E8E7E6", +"X c #8B8B8A", +"Y c #0B0B06", +"Z c #A97C1A", +"` c #1B1B1B", +" . c #C9C9C9", +".. c #DFDFDF", +"+. c #EBEBEB", +"@. c #ECECEC", +"#. c #E1E1E1", +"$. c #221E11", +"%. c #EAE8E3", +"&. c #C58F13", +"*. c #B68411", +"=. c #826321", +"-. c #302C19", +";. c #131313", +">. c #1A1A1A", +",. c #161616", +"'. c #151515", +"). c #181818", +"!. c #1B1B1A", +"~. c #141413", +"{. c #363220", +"]. c #916F25", +"^. c #322F1E", +"/. c #98B4C8", +"(. c #25313B", +"_. c #A9CCE0", +":. c #545A68", +"<. c #BC6A60", +"[. c #AD5A51", +"}. c #A4574D", +"|. c #2B2719", +"1. c #353120", +"2. c #5A4D51", +"3. c #6E8DA2", +"4. c #0C1820", +"5. c #BAE5FF", +"6. c #696E6F", +"7. c #F9F9F9", +"8. c #EBEBEA", +"9. c #937025", +"0. c #CDCAC1", +"a. c #73726E", +"b. c #7496AF", +"c. c #0A131A", +"d. c #BAE0FD", +"e. c #6A6E71", +"f. c #ECEDEC", +"g. c #DEDFDF", +"h. c #DBDDDD", +"i. c #D8DBDB", +"j. c #CDCFCF", +"k. c #312E1B", +"l. c #2F2C19", +"m. c #B2B3B0", +"n. c #C0C0BE", +"o. c #6F6D6B", +"p. c #7C9FBB", +"q. c #050F15", +"r. c #B7DDFC", +"s. c #54575A", +"t. c #F4F4F3", +"u. c #ECECEB", +"v. c #F3F3F2", +"w. c #7F7D7A", +"x. c #7EA0BB", +"y. c #020A10", +"z. c #B1D7F7", +"A. c #FDFCFB", +"B. c #EFEFEE", +"C. c #EDEDEC", +"D. c #EBECEB", +"E. c #EBECEC", +"F. c #F7F7F6", +"G. c #7D7977", +"H. c #7F9FB9", +"I. c #050B0E", +"J. c #B3DDF7", +"K. c #685050", +"L. c #847F7C", +"M. c #7E9DB7", +"N. c #0A0B0C", +"O. c #A9D3F0", +"P. c #7B99AB", +"Q. c #6B6E70", +"R. c #63696C", +"S. c #60666B", +"T. c #5E6569", +"U. c #555E67", +"V. c #5D6267", +"W. c #61676B", +"X. c #64696D", +"Y. c #62666A", +"Z. c #6B747E", +"`. c #7D9CB4", +" + c #000508", +".+ c #A8CBED", +"++ c #7498B7", +"@+ c #6F92B0", +"#+ c #3F5160", +"$+ c #4A5E70", +"%+ c #566E82", +"&+ c #4D6779", +"*+ c #52697C", +"=+ c #52697A", +"-+ c #54687A", +";+ c #455E70", +">+ c #7697B4", +",+ c #92A9BC", +"'+ c #000205", +")+ c #A8CEEB", +"!+ c #7196B3", +"~+ c #4D5152", +"{+ c #D7D2CB", +"]+ c #F1EEEA", +"^+ c #FAF8F5", +"/+ c #F9F8F5", +"(+ c #E8E4DF", +"_+ c #D8D4CD", +":+ c #9D968B", +"<+ c #425563", +"[+ c #446783", +"}+ c #A7C4DA", +"|+ c #000101", +"1+ c #A5CDEA", +"2+ c #7196B1", +"3+ c #57595C", +"4+ c #534F46", +"5+ c #2E281F", +"6+ c #CAC7C2", +"7+ c #C9C4BD", +"8+ c #C2BBB1", +"9+ c #E3E0DC", +"0+ c #314353", +"a+ c #40647C", +"b+ c #B6C9DA", +"c+ c #A3CDEB", +"d+ c #7695B1", +"e+ c #525455", +"f+ c #474239", +"g+ c #3B372D", +"h+ c #C0BCB5", +"i+ c #C7C2BA", +"j+ c #E2DFD9", +"k+ c #F8F6F3", +"l+ c #344652", +"m+ c #406479", +"n+ c #A6C3DA", +"o+ c #010000", +"p+ c #708798", +"q+ c #6A8DA7", +"r+ c #4F5052", +"s+ c #F7F2EC", +"t+ c #59534B", +"u+ c #57524A", +"v+ c #C1BCB4", +"w+ c #EBE9E4", +"x+ c #FFFFFD", +"y+ c #30414E", +"z+ c #415C6F", +"A+ c #A2C4DC", +"B+ c #020000", +"C+ c #030406", +"D+ c #141A1F", +"E+ c #151718", +"F+ c #35332F", +"G+ c #393634", +"H+ c #41403E", +"I+ c #3F3E3D", +"J+ c #454344", +"K+ c #434241", +"L+ c #312F2C", +"M+ c #02070A", +"N+ c #070E12", +"O+ c #465A69", +". + @ # $ % & & & % * = - ; . ", +"> , ' ' ' ' ' ' ' ' ' ' ' ) ! ", +"@ ' ~ ' ' ' ' ' ' ' ' ' { ] ^ . . . ", +"/ ' ' ( ' _ : < < ' [ } | 1 2 3 4 5 . 6 ", +"* ' ' 7 8 9 < 7 _ 0 @ a b c d d e f g h i ", +"$ ' ' ' j k l : m $ n o . . . p q r s t i ", +"* ' ' ' u v w ' x . y z A B C D d f E F ", +"/ ' ' G H 7 I J , K > L M N O P d f Q R ", +"S ' T U ' ' ' _ V ' < W X Y . . . d f Z . . . ", +"` ...U +.+.+.@.@.+.@.+.#.$.%.d d d f &.*.=.-.. ", +". ;.>.; ,.'.'.'.'.'.,.).!.~.{.%.d d f f ].^./.(.", +" . _.:.<.[.}.|.%.d f ].1.2.3.4.", +" . 5.6.' ' 7.8.-.%.9.^.0.a.b.c.", +" . d.e.f.g.h.i.j.k.l.m.n.o.p.q.", +" . r.s.' ' ' ' ' ' t.u.v.w.x.y.", +" . z.6.A.B.C.D.+.E.C.U F.G.H.I.", +" . J.K.' ' ' ' ' ' ' ' ' L.M.N.", +" . O.P.Q.R.S.T.U.V.W.X.Y.Z.`. +", +" . .+++@+#+$+%+&+*+=+-+;+>+,+'+", +" . )+!+~+{+]+^+/+(+_+:+<+[+}+|+", +" . 1+2+3+' 4+5+6+7+8+9+0+a+b+. ", +" . c+d+e+' f+g+h+i+j+k+l+m+n+o+", +" . p+q+r+s+t+u+v+w+x+]+y+z+A+B+", +" C+D+E+F+G+H+I+J+K+L+M+N+O+. "}; diff --git a/etc/images/mail/send.xpm b/etc/images/mail/send.xpm index f1d2282ec8a..44ee493577b 100644 --- a/etc/images/mail/send.xpm +++ b/etc/images/mail/send.xpm @@ -1,39 +1,85 @@ /* XPM */ -static char *magick[] = { -/* columns rows colors chars-per-pixel */ -"24 24 9 1", -" c Gray0", -". c #675e6580613e", -"X c #8c8c7c7c6969", -"o c #9b458d377822", -"O c #a941a6459f3e", -"+ c #c8c8b2b29898", -"@ c #dadac2c2a5a5", -"# c #eb4dea2fe4ad", -"$ c None", -/* pixels */ -"$$$$$$$$$$$$$$$$$$$$$$$$", -"$$$$$$$$$$$$$$$$$$$$$$$$", -"$$$$$$$$$$$$$ $$$$$$$", -"$$$$$$$$ .@#+ $$$$$$", -"$$$ .+#####@O $$$$$$", -"$$ .+##########.+O $$$$$", -"$$ @..########O.+# $$$$$", -"$$ O@O..@#####.+## $$$$$", -"$$$ ###+O.O##...##O $$$$", -"$$$ @####@+..O#O.+# $$$$", -"$$$ O####.#######.O $$$$", -"$$$$ ###+O########.O $$$", -"$$$$ ###.########@O $$$", -"$$$$ +#+O#####@O $$$$$", -"$$$$$ #.###@O $$$$$$", -"$$$$$ .O@O $$ .. $$$$$", -"$$$$$ .. $$$$ .oo. $$$$", -"$$$$$$ $$$$$ oo $$$", -"$$$$$$$$$$$$$$$ Oo $$$$$", -"$$$$$$$$$$$$$$ oOOX $$$$", -"$$$$$$$$$$$$$$ ++++ $$$$", -"$$$$$$$$$$$$$ O@@@@O $$$", -"$$$$$$$$$$$$$ $$$", -"$$$$$$$$$$$$$$$$$$$$$$$$" -}; +static char * stock_mail_send_xpm[] = { +"24 24 58 1", +" c None", +". c #4F3F0A", +"+ c #000000", +"@ c #F4E6B5", +"# c #F4E5B3", +"$ c #EDD684", +"% c #755F10", +"& c #EDD580", +"* c #EED685", +"= c #AF8D18", +"- c #EFD98C", +"; c #EED88B", +"> c #EDD582", +", c #EED889", +"' c #EFDA92", +") c #F0DB93", +"! c #735D10", +"~ c #535353", +"{ c #FFFFFF", +"] c #F0DC97", +"^ c #F6F6F6", +"/ c #F5F5F5", +"( c #F4F4F4", +"_ c #E3E3E3", +": c #EEEEEE", +"< c #4F4F4F", +"[ c #EDD37C", +"} c #EDEDED", +"| c #AEAEAE", +"1 c #E4E4E4", +"2 c #434343", +"3 c #FDFDFD", +"4 c #F3F3F3", +"5 c #E4BF3D", +"6 c #CBA41C", +"7 c #D1A81C", +"8 c #907413", +"9 c #7C6411", +"0 c #ACACAC", +"a c #C8C8C8", +"b c #FBFBFB", +"c c #A0A0A0", +"d c #D4D4D4", +"e c #F8F8F8", +"f c #F0F0F0", +"g c #EFEFEF", +"h c #ECECEC", +"i c #959595", +"j c #3E3E3E", +"k c #4D4D4D", +"l c #818181", +"m c #C6C6C6", +"n c #6A6A6A", +"o c #636363", +"p c #B9B9B9", +"q c #737373", +"r c #7C7C7C", +"s c #BCBCBC", +" ", +" . ", +" +@+ ", +" +#$%+ ", +" +#&*=%+ ", +" +#-;>==%+ ", +" +#,',>===%+ ", +" ++++++)$&=!++++++ ", +" +~{{{{+]$$=!+^/(_~+ ", +" +:<{/(+,[$=!+:}_<|+ ", +" +{1234+56789+}_<0a+ ", +" +{/1 c #EDF0F1", +", c #E5EDEF", +"' c #C5D9DD", +") c #2E3132", +"! c #3F4343", +"~ c #1F2121", +"{ c #DFEBEE", +"] c #B7C4C8", +"^ c #D2D9DA", +"/ c #E1EFF2", +"( c #B6CBCF", +"_ c #3C4547", +": c #1E2223", +"< c #191E1F", +"[ c #2D2E2F", +"} c #191A1A", +"| c #252829", +"1 c #7E8E92", +"2 c #B7C2C3", +"3 c #C3D9DD", +"4 c #9CACB0", +"5 c #C3CDCE", +"6 c #C7E1E7", +"7 c #668F97", +"8 c #90ACB2", +"9 c #CDDDE1", +"0 c #485559", +"a c #88A6AC", +"b c #1F2223", +"c c #3F4545", +"d c #242728", +"e c #313B3E", +"f c #A8C2C8", +"g c #B2BDC0", +"h c #CFE5E9", +"i c #C2D9DE", +"j c #81989C", +"k c #A2C0C5", +"l c #85A9B1", +"m c #E5ECEE", +"n c #E7F2F4", +"o c #9BAEB3", +"p c #C8E1E7", +"q c #3A3E3F", +"r c #0C0E0E", +"s c #000000", +"t c #333737", +"u c #B3C2C5", +"v c #DDEDF0", +"w c #D8E4E6", +"x c #DAECEF", +"y c #D5E9ED", +"z c #D2E7EC", +"A c #95ADB2", +"B c #DBE2E2", +"C c #EDEFF0", +"D c #A2B1B3", +"E c #8FA4A8", +"F c #D7E2E5", +"G c #798F94", +"H c #151819", +"I c #F3B5A7", +"J c #865E55", +"K c #AFB9BB", +"L c #F1F8F9", +"M c #F7FBFB", +"N c #D9EBEF", +"O c #ECF4F6", +"P c #F3F7F7", +"Q c #E9F2F4", +"R c #EEF2F3", +"S c #E9EDEE", +"T c #C5C8C9", +"U c #C2C6C8", +"V c #E0E7E7", +"W c #DDEAED", +"X c #7A9DA5", +"Y c #EB8169", +"Z c #B83618", +"` c #924E3C", +" . c #9FA5A6", +".. c #E3EEF0", +"+. c #ECF5F7", +"@. c #D6EAED", +"#. c #CBE4E9", +"$. c #D9E7E9", +"%. c #E1EBED", +"&. c #B8CBD0", +"*. c #BDCBCF", +"=. c #ABB3B5", +"-. c #E3E5E5", +";. c #DCEBEF", +">. c #6A979F", +",. c #131819", +"'. c #B43518", +"). c #E76A4D", +"!. c #B53F24", +"~. c #CB705A", +"{. c #C4D8DB", +"]. c #D2E6E9", +"^. c #CAE3E8", +"/. c #A9C8CF", +"(. c #7FA4AA", +"_. c #82B4BE", +":. c #E2EFF0", +"<. c #D3E7EA", +"[. c #AFD5DE", +"}. c #C7E2E7", +"|. c #E7F1F2", +"1. c #97C3CB", +"2. c #637F86", +"3. c #191311", +"4. c #EF9985", +"5. c #F1A897", +"6. c #E76547", +"7. c #C58B7D", +"8. c #A8ABAC", +"9. c #70A1AB", +"0. c #88B5BE", +"a. c #95C7D1", +"b. c #ADD4DC", +"c. c #DCEAEF", +"d. c #B5D8E0", +"e. c #CAE4E9", +"f. c #95BEC6", +"g. c #6696A0", +"h. c #585857", +"i. c #51190C", +"j. c #D9401D", +"k. c #EC8A74", +"l. c #E17055", +"m. c #DD8D7A", +"n. c #D8E7EA", +"o. c #D8E9ED", +"p. c #D6EAEE", +"q. c #D9EBEE", +"r. c #E4F0F3", +"s. c #CFE3E8", +"t. c #5B94A0", +"u. c #5C7E85", +"v. c #3D221D", +"w. c #782310", +"x. c #EA7A60", +"y. c #E5A293", +"z. c #EBD9D5", +"A. c #C6D3D6", +"B. c #799FA8", +"C. c #558C98", +"D. c #45686E", +"E. c #27201F", +"F. c #5D3228", +"G. c #B86F5D", +"H. c #F1A593", +"I. c #E58D78", +"J. c #C0C0C1", +"K. c #32464B", +"L. c #4A6E75", +"M. c #282121", +"N. c #4A2E27", +"O. c #C6968B", +"P. c #DDA89B", +"Q. c #5F1C0D", +"R. c #F2AFA0", +"S. c #A36F63", +"T. c #341C17", +"U. c #301A15", +"V. c #674C45", +"W. c #E4AEA1", +"X. c #8D2A13", +"Y. c #030505", +"Z. c #A2432E", +"`. c #E4A799", +" + c #D97C67", +".+ c #B66A59", +"++ c #B26C5C", +"@+ c #882812", +"#+ c #DB411D", +"$+ c #F4BAAC", +" ", +" ", +" ", +" ", +" . + @ ", +" # $ % & * . ", +" = - ; > , ' ) ! ", +" ~ { ] ^ / ( _ : < [ } ", +" | 1 2 3 4 5 6 7 8 9 0 a b ", +" c d e f g h i j k l m n o p q r ", +" s t u v w / x y z A B C D E F G H ", +" s s I J K L M N O P Q R S T U V W X < ", +"s I Y Z ` ...+.@.#.$.%.h &.*.=.-.;.>.,.s ", +"s '.).Y !.~.{.].^./.(._.:.<.[.}.|.1.2.3.4.s ", +"s '.'.'.).5.6.7.8.9.0.a.b.c.d.e.f.g.h.i.j.k.s ", +"s '.'.'.'.'.).5.l.m.n.o.p.q.r.s.t.u.v.w.j.x.s ", +" s s '.'.'.'.'.).5.6.y.z.A.B.C.D.E.F.G.H.4.s ", +" s s '.'.'.'.'.).5.I.J.K.L.M.N.O.P.Q.s ", +" s s '.'.'.'.'.R.S.T.U.V.W.X.s s ", +" Y.s s Z.'.'.`. +.+++@+s s ", +" s s s '.#+$+s s s ", +" s s s s s ", +" ", +" "}; diff --git a/etc/images/next-page.xpm b/etc/images/next-page.xpm new file mode 100644 index 00000000000..75236feeeaf --- /dev/null +++ b/etc/images/next-page.xpm @@ -0,0 +1,119 @@ +/* XPM */ +static char * stock_next_page_xpm[] = { +"24 24 92 2", +" c None", +". c #000000", +"+ c #5B7289", +"@ c #FFFFFF", +"# c #F2F2F2", +"$ c #E5E5E5", +"% c #D8D8D8", +"& c #CCCCCC", +"* c #B0B0B0", +"= c #8B8B8B", +"- c #6A6A6A", +"; c #494949", +"> c #888888", +", c #C9C9C9", +"' c #E3E3E3", +") c #EEEEEE", +"! c #E6E6E6", +"~ c #DEDEDE", +"{ c #D6D6D6", +"] c #ADADAD", +"^ c #556D85", +"/ c #47617B", +"( c #BFBFBF", +"_ c #B2B2B2", +": c #ACACAC", +"< c #A6A6A6", +"[ c #F6F6F6", +"} c #384F66", +"| c #3A5067", +"1 c #DADADA", +"2 c #3A5168", +"3 c #D3D3D3", +"4 c #3B5269", +"5 c #47617C", +"6 c #3D526A", +"7 c #48627D", +"8 c #B6B6B6", +"9 c #959595", +"0 c #7C7C7C", +"a c #616161", +"b c #464646", +"c c #262626", +"d c #C5C5C5", +"e c #3E546A", +"f c #49637D", +"g c #3F556B", +"h c #4B647E", +"i c #40566C", +"j c #4C647F", +"k c #41576D", +"l c #4C657F", +"m c #42586E", +"n c #4E6780", +"o c #44586F", +"p c #4F6881", +"q c #B5B5B5", +"r c #45596F", +"s c #506982", +"t c #77838F", +"u c #9C9FA1", +"v c #91969C", +"w c #91979C", +"x c #92979C", +"y c #92979D", +"z c #A2A3A4", +"A c #9D9FA2", +"B c #8F9296", +"C c #8F9396", +"D c #8F9397", +"E c #909397", +"F c #868788", +"G c #465B70", +"H c #526A83", +"I c #3E5975", +"J c #3F5A76", +"K c #415B77", +"L c #425C78", +"M c #435E79", +"N c #445F7A", +"O c #46607B", +"P c #68727D", +"Q c #7D8185", +"R c #616A73", +"S c #3B4F63", +"T c #3C5064", +"U c #3C5065", +"V c #3E5166", +"W c #3F5266", +"X c #405367", +"Y c #405468", +"Z c #344353", +"` c #2F4050", +" ", +" ", +" . . . . . . . . . . . . . . . . ", +" . + @ # $ % & * = - ; > , ' ) ! ~ { ] ^ . ", +" . / @ # $ % & ( _ : < @ @ [ ) ! ~ { _ } . ", +" . / @ # $ % & ( _ : < @ ' [ ) ! ~ { _ | . ", +" . / @ # $ % & ( _ : < @ . 1 ) ! ~ { * 2 . ", +" . / @ # $ % & ( _ : < @ . . 3 ! ~ { * 4 . ", +" . 5 @ # $ % & ( _ : < @ . . . & ~ { * 6 . ", +" . 7 @ # $ 8 9 0 a b c . . . . . d { * e . ", +" . f @ # $ % & ( _ : < @ . . . & ~ { * g . ", +" . h @ # $ % & ( _ : < @ . . 3 ! ~ { * i . ", +" . j @ # $ % & ( _ : < @ . 1 ) ! ~ { * k . ", +" . l @ # $ % & ( _ : < @ ' [ ) ! ~ { * m . ", +" . n @ # $ % & ( _ : < @ @ [ ) ! ~ { * o . ", +" . p @ # $ % & ( _ : < @ @ [ ) ! ~ { q r . ", +" . s t u v w x y y z < A B C C D D E F G . ", +" . H I J K L M N O P Q R S T U V W X Y Z . ", +" . . . . . . . . . ` . . . . . . . . . . ", +" . . . ", +" ", +" ", +" ", +" "}; diff --git a/etc/images/refresh.xpm b/etc/images/refresh.xpm index cf7d05d194c..fbf4ce8af07 100644 --- a/etc/images/refresh.xpm +++ b/etc/images/refresh.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * refresh_xpm[] = { +static char * stock_refresh_xpm[] = { "24 24 86 1", " c None", ". c #000000", diff --git a/etc/images/separator.xpm b/etc/images/separator.xpm new file mode 100644 index 00000000000..151f5dfe6eb --- /dev/null +++ b/etc/images/separator.xpm @@ -0,0 +1,29 @@ +/* XPM */ +static char * sep_xpm[] = { +"1 24 2 1", +" c None s backgroundToolBarColor", +". c #776758", +" ", +" ", +" ", +".", +".", +".", +".", +".", +".", +".", +".", +".", +".", +".", +".", +".", +".", +".", +".", +".", +".", +" ", +" ", +" "}; diff --git a/etc/images/sort-ascending.xpm b/etc/images/sort-ascending.xpm new file mode 100644 index 00000000000..5a47e5c5ff0 --- /dev/null +++ b/etc/images/sort-ascending.xpm @@ -0,0 +1,33 @@ +/* XPM */ +static char * stock_sort_ascending_xpm[] = { +"23 23 7 1", +" c None", +". c #314E6C", +"+ c #000000", +"@ c #D1DECF", +"# c #7DA377", +"$ c #E4ECE3", +"% c #B3C9AF", +" ", +" .... ", +" .. .. ", +" .. .. ", +" ...... ", +" .. .. ", +" .. .. ", +" ", +" + ", +" ", +" + ", +" ", +" + + ", +" +@+ + ", +" +@##+ ++ ++++++ ", +" +###+$+ +++ ", +" +##%#+ +++ ", +" +%##+ +++ ", +" +$###+ +++ ", +" +++++++ ++++++ ", +" ", +" ", +" "}; diff --git a/etc/images/sort-column-ascending.xpm b/etc/images/sort-column-ascending.xpm new file mode 100644 index 00000000000..76d7f93e248 --- /dev/null +++ b/etc/images/sort-column-ascending.xpm @@ -0,0 +1,29 @@ +/* XPM */ +static char * stock_sort_column_ascending_xpm[] = { +"24 24 2 1", +" c None", +". c #000000", +" ", +" ", +" ... ", +" . .. ", +" .. ", +" .. ", +" .. ", +" .. ", +" .. ", +" ..... . ", +" ", +" . ", +" ", +" . ", +" .... ", +" .. .. ", +" .. .. ", +" .. .. ", +" ..... ", +" .. ", +" . ... ", +" ..... ", +" ", +" "}; diff --git a/etc/images/sort-criteria.xpm b/etc/images/sort-criteria.xpm new file mode 100644 index 00000000000..d1c83b8fc83 --- /dev/null +++ b/etc/images/sort-criteria.xpm @@ -0,0 +1,55 @@ +/* XPM */ +static char * stock_sort_criteria_xpm[] = { +"24 24 28 1", +" c None", +". c #000000", +"+ c #FFFFFF", +"@ c #D3D3D3", +"# c #F2ECE1", +"$ c #F4EFE5", +"% c #DFDAD2", +"& c #C9C4BD", +"* c #74716E", +"= c #FAFAFA", +"- c #EADFC9", +"; c #ECE2CF", +"> c #EEE5D4", +", c #4C4B48", +"' c #F5F5F5", +") c #C9C9C9", +"! c #E2D2B1", +"~ c #CFC4B1", +"{ c #BFBFBF", +"] c #C0C0C0", +"^ c #C7B99C", +"/ c #F0F0F0", +"( c #B7B7B7", +"_ c #9A8F78", +": c #877E69", +"< c #AFA389", +"[ c #A09889", +"} c #314E6C", +" ", +" ", +" ...... ", +" ... ", +" ... ", +" ... ", +" ......... ... ", +" .+@.#$%&*. ...... ", +" .=@.-;;;>, ", +" .').!!!!.~. ", +" .{].^^!.^.~. ", +" ./(.._.^.:.~. ", +" .....<.:...[. ", +" .:.. .. ", +" .. ", +" ", +" }}}} ", +" }} }} ", +" }} }} ", +" }}}}}} ", +" }} }} ", +" }} }} ", +" ", +" "}; diff --git a/etc/images/sort-descending.xpm b/etc/images/sort-descending.xpm new file mode 100644 index 00000000000..90127ac11d3 --- /dev/null +++ b/etc/images/sort-descending.xpm @@ -0,0 +1,33 @@ +/* XPM */ +static char * stock_sort_descending_xpm[] = { +"24 23 7 1", +" c None", +". c #000000", +"+ c #D1DECF", +"@ c #7DA377", +"# c #314E6C", +"$ c #E4ECE3", +"% c #B3C9AF", +" ", +" ", +" ...... ", +" ... ", +" ... ", +" ... ", +" ... ", +" ...... ", +" . ", +" ", +" . ", +" ", +" . . ", +" .+. . ", +" .+@@. .. #### ", +" .@@@.$. ## ## ", +" .@@%@. ## ## ", +" .%@@. ###### ", +" .$@@@. ## ## ", +" ....... ## ## ", +" ", +" ", +" "}; diff --git a/etc/images/sort-row-ascending.xpm b/etc/images/sort-row-ascending.xpm new file mode 100644 index 00000000000..5200b9734e0 --- /dev/null +++ b/etc/images/sort-row-ascending.xpm @@ -0,0 +1,22 @@ +/* XPM */ +static char * stock_sort_row_ascending_xpm[] = { +"21 17 2 1", +" c None", +". c #000000", +" ", +" ", +" ", +" ", +" ... .... ", +" . .. .. .. ", +" .. .. .. ", +" .. .. .. ", +" .. ..... ", +" .. .. ", +" .. . .. ", +" ..... . . . ..... ", +" ", +" ", +" ", +" ", +" "};