Merged in changes from CVS HEAD

Patches applied:

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

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

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

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

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


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-94

4 files changed, 118 insertions, 75 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index a25239d88a3..1a2f7f4e20b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,26 @@
+2004-02-23  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * abbrev.c (Finsert_abbrev_table_description): Doc fix.
+
+2004-02-22  Jason Rumney  <jasonr@gnu.org>
+
+        * w32term.c (w32_draw_fringe_bitmap): Draw overlaid bitmaps
+        correctly over other bitmaps.
+
+2004-02-21  Eli Zaretskii  <eliz@elta.co.il>
+
+        * emacs.c (USAGE1): Split into two halves.
+        (USAGE2): Second half of the old USAGE1.
+        (USAGE3): Renamed from USAGE2.
+        (USAGE4): Renamed from USAGE3.
+
+2004-02-21  Juri Linkov  <juri@jurta.org>
+
+        * emacs.c (USAGE1): Add --no-desktop.  Move --display from USAGE2.
+        Fix --multibyte.  Move --help, --version to USAGE2.  Add alias
+        --file.  Fix -f, -l.  Sort options.  Untabify.
+        (USAGE2): Add -hb.  Fix --name, --title.  Sort options.  Untabify.
+
 2004-02-19  Luc Teirlinck  <teirllm@auburn.edu>
 
         * category.c (Fdefine_category, Fcategory_docstring)
diff --git a/src/abbrev.c b/src/abbrev.c
index 1cf06946631..41e329ac95d 100644
--- a/src/abbrev.c
+++ b/src/abbrev.c
@@ -540,7 +540,8 @@ is inserted.  Otherwise the description is an expression,
 a call to `define-abbrev-table', which would
 define the abbrev table NAME exactly as it is currently defined.
 
-Abbrevs marked as "system abbrevs" are omitted.  */)
+Abbrevs marked as "system abbrevs" are normally omitted.  However, if
+READABLE is non-nil, they are listed.  */)
      (name, readable)
      Lisp_Object name, readable;
 {
diff --git a/src/emacs.c b/src/emacs.c
index 20c6295e2e2..96fd323c42a 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -221,6 +221,8 @@ int initial_argc;
 static void sort_args ();
 void syms_of_emacs ();
 
+/* MSVC needs each string be shorter than 2048 bytes, so the usage
+   strings below are split to not overflow this limit.  */
 #define USAGE1 "\
 Usage: %s [OPTION-OR-FILENAME]...\n\
 \n\
@@ -233,66 +235,71 @@ read the main documentation for these command-line arguments.\n\
 \n\
 Initialization options:\n\
 \n\
---batch                 do not do interactive display; implies -q\n\
---script FILE           run FILE as an Emacs Lisp script.\n\
---debug-init            enable Emacs Lisp debugger during init file\n\
---help                  display this help message and exit\n\
---multibyte, --no-unibyte   run Emacs in multibyte mode\n\
---no-init-file, -q          load neither ~/.emacs nor default.el\n\
---no-shared-memory, -nl     do not use shared memory\n\
---no-site-file              do not load site-start.el\n\
---no-splash                 do not display a splash screen on startup\n\
---no-window-system, -nw     don't communicate with X, ignoring $DISPLAY\n\
---terminal, -t DEVICE       use DEVICE for terminal I/O\n\
+--batch                     do not do interactive display; implies -q\n\
+--debug-init                enable Emacs Lisp debugger for init file\n\
+--display, -d DISPLAY       use X server DISPLAY\n\
+--multibyte, --no-unibyte   inhibit the effect of EMACS_UNIBYTE\n\
+--no-desktop                do not load a saved desktop\n\
+--no-init-file, -q          load neither ~/.emacs nor default.el\n\
+--no-shared-memory, -nl     do not use shared memory\n\
+--no-site-file              do not load site-start.el\n\
+--no-splash                 do not display a splash screen on startup\n\
+--no-window-system, -nw     don't communicate with X, ignoring $DISPLAY\n\
+--script FILE               run FILE as an Emacs Lisp script\n\
+--terminal, -t DEVICE       use DEVICE for terminal I/O\n\
 --unibyte, --no-multibyte   run Emacs in unibyte mode\n\
---user, -u USER         load ~USER/.emacs instead of your own\n\
---version               display version information and exit\n\
-\n\
+--user, -u USER             load ~USER/.emacs instead of your own\n\
+\n%s"
+
+#define USAGE2 "\
 Action options:\n\
 \n\
-FILE                    visit FILE using find-file\n\
-+LINE FILE              visit FILE using find-file, then go to line LINE\n\
-+LINE:COLUMN FILE       visit FILE using find-file, then go to line LINE,\n\
-                            column COLUMN\n\
---directory, -L DIR     add DIR to variable load-path\n\
---eval EXPR             evaluate Emacs Lisp expression EXPR\n\
---execute EXPR          evaluate Emacs Lisp expression EXPR\n\
---find-file FILE        visit FILE\n\
---funcall, -f FUNC      call Emacs function FUNC with no arguments\n\
---insert FILE           insert contents of FILE into current buffer\n\
---kill                  exit without asking for confirmation\n\
---load, -l FILE         load FILE of Emacs Lisp code using the load function\n\
---visit FILE            visit FILE\n\
+FILE                    visit FILE using find-file\n\
++LINE FILE              visit FILE using find-file, then go to line LINE\n\
++LINE:COLUMN FILE       visit FILE using find-file, then go to line LINE,\n\
+                          column COLUMN\n\
+--directory, -L DIR     add DIR to variable load-path\n\
+--eval EXPR             evaluate Emacs Lisp expression EXPR\n\
+--execute EXPR          evaluate Emacs Lisp expression EXPR\n\
+--file FILE             visit FILE using find-file\n\
+--find-file FILE        visit FILE using find-file\n\
+--funcall, -f FUNC      call Emacs Lisp function FUNC with no arguments\n\
+--insert FILE           insert contents of FILE into current buffer\n\
+--kill                  exit without asking for confirmation\n\
+--load, -l FILE         load Emacs Lisp FILE using the load function\n\
+--visit FILE            visit FILE using find-file\n\
 \n"
 
-#define USAGE2 "\
+#define USAGE3 "\
 Display options:\n\
 \n\
---background-color, -bg COLOR   window background color\n\
---border-color, -bd COLOR       main border color\n\
---border-width, -bw WIDTH       width of main border\n\
---color=MODE                    color mode for character terminals;\n\
-                                MODE defaults to `auto', and can also\n\
-                                be `never', `auto', `always',\n\
-                                or a mode name like `ansi8'\n\
---cursor-color, -cr COLOR       color of the Emacs cursor indicating point\n\
---display, -d DISPLAY           use X server DISPLAY\n\
---font, -fn FONT                default font; must be fixed-width\n\
---foreground-color, -fg COLOR   window foreground color\n\
---fullscreen, -fs               make first frame fullscreen\n\
---fullwidth, -fw                make the first frame wide as the screen\n\
---fullheight, -fh               make the first frame high as the screen\n\
---geometry, -g GEOMETRY         window geometry\n\
---iconic                        start Emacs in iconified state\n\
---icon-type, -i                 use picture of gnu for Emacs icon\n\
---internal-border, -ib WIDTH    width between text and main border\n\
---line-spacing, -lsp PIXELS     additional space to put between lines\n\
---mouse-color, -ms COLOR        mouse cursor color in Emacs window\n\
---name NAME                     title of main Emacs window\n\
---reverse-video, -r, -rv        switch foreground and background\n\
---title, -T, -wn TITLE          title for Emacs windows\n\
---vertical-scroll-bars, -vb     enable vertical scroll bars\n\
---xrm XRESOURCES                set additional X resources\n\
+--background-color, -bg COLOR   window background color\n\
+--border-color, -bd COLOR       main border color\n\
+--border-width, -bw WIDTH       width of main border\n\
+--color MODE                    color mode for character terminals;\n\
+                                  MODE defaults to `auto', and can also\n\
+                                  be `never', `auto', `always',\n\
+                                  or a mode name like `ansi8'\n\
+--cursor-color, -cr COLOR       color of the Emacs cursor indicating point\n\
+--font, -fn FONT                default font; must be fixed-width\n\
+--foreground-color, -fg COLOR   window foreground color\n\
+--fullheight, -fh               make the first frame high as the screen\n\
+--fullscreen, -fs               make first frame fullscreen\n\
+--fullwidth, -fw                make the first frame wide as the screen\n\
+--geometry, -g GEOMETRY         window geometry\n\
+--horizontal-scroll-bars, -hb   enable horizontal scroll bars\n\
+--icon-type, -i                 use picture of gnu for Emacs icon\n\
+--iconic                        start Emacs in iconified state\n\
+--internal-border, -ib WIDTH    width between text and main border\n\
+--line-spacing, -lsp PIXELS     additional space to put between lines\n\
+--mouse-color, -ms COLOR        mouse cursor color in Emacs window\n\
+--name NAME                     title for initial Emacs frame\n\
+--reverse-video, -r, -rv        switch foreground and background\n\
+--title, -T TITLE               title for initial Emacs frame\n\
+--vertical-scroll-bars, -vb     enable vertical scroll bars\n\
+--xrm XRESOURCES                set additional X resources\n\
+--help                          display this help and exit\n\
+--version                       output version information and exit\n\
 \n\
 You can generally also specify long option names with a single -; for\n\
 example, -batch as well as --batch.  You can use any unambiguous\n\
@@ -302,7 +309,7 @@ Various environment variables and window system resources also affect\n\
 Emacs' operation.  See the main documentation.\n\
 \n"
 
-#define USAGE3 "\
+#define USAGE4 "\
 Report bugs to %s.  First, please see the Bugs\n\
 section of the Emacs manual or the file BUGS.\n"
 
@@ -1062,9 +1069,9 @@ main (argc, argv
   /* Handle the --help option, which gives a usage message.  */
   if (argmatch (argv, argc, "-help", "--help", 3, NULL, &skip_args))
     {
-      printf (USAGE1, argv[0]);
-      printf (USAGE2);
-      printf (USAGE3, bug_reporting_address ());
+      printf (USAGE1, argv[0], USAGE2);
+      printf (USAGE3);
+      printf (USAGE4, bug_reporting_address ());
       exit (0);
     }
 
diff --git a/src/w32term.c b/src/w32term.c
index 82db82826e8..92d508691cd 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -715,29 +715,41 @@ w32_draw_fringe_bitmap (w, row, p)
       SaveDC (hdc);
 
       horig_obj = SelectObject (compat_hdc, pixmap);
-      SetTextColor (hdc, face->background);
-      SetBkColor (hdc, p->cursor_p
-                        ? (p->overlay_p ? face->background
-                           : f->output_data.w32->cursor_pixel)
-                           : face->foreground);
 
       /* Paint overlays transparently.  */
       if (p->overlay_p)
         {
-        BitBlt (hdc, p->x, p->y, p->wd, p->h,
-                compat_hdc, 0, p->dh,
-                DSTINVERT);
-        BitBlt (hdc, p->x, p->y, p->wd, p->h,
-                compat_hdc, 0, p->dh,
-                MERGEPAINT);
-        BitBlt (hdc, p->x, p->y, p->wd, p->h,
-                compat_hdc, 0, p->dh,
-                DSTINVERT);
+          HBRUSH h_brush, h_orig_brush;
+
+          SetTextColor (hdc, BLACK_PIX_DEFAULT (f));
+          SetBkColor (hdc, WHITE_PIX_DEFAULT (f));
+          h_brush = CreateSolidBrush (face->foreground);
+          h_orig_brush = SelectObject (hdc, h_brush);
+
+          BitBlt (hdc, p->x, p->y, p->wd, p->h,
+                  compat_hdc, 0, p->dh,
+                  DSTINVERT);
+          BitBlt (hdc, p->x, p->y, p->wd, p->h,
+                  compat_hdc, 0, p->dh,
+                  0x2E064A);
+          BitBlt (hdc, p->x, p->y, p->wd, p->h,
+                  compat_hdc, 0, p->dh,
+                  DSTINVERT);
+
+          SelectObject (hdc, h_orig_brush);
+          DeleteObject (h_brush);
         }
       else
-        BitBlt (hdc, p->x, p->y, p->wd, p->h,
-                compat_hdc, 0, p->dh,
-                SRCCOPY);
+        {
+          SetTextColor (hdc, face->background);
+          SetBkColor (hdc, (p->cursor_p
+                            ? f->output_data.w32->cursor_pixel
+                            : face->foreground));
+
+          BitBlt (hdc, p->x, p->y, p->wd, p->h,
+                  compat_hdc, 0, p->dh,
+                  SRCCOPY);
+        }
 
       SelectObject (compat_hdc, horig_obj);
       DeleteDC (compat_hdc);