Merged from miles@gnu.org--gnu-2005 (patch 56-58, 232-239)

Patches applied:

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-234
   Merge from gnus--rel--5.10

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

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

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

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

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

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-56
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-57
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-58
   Collapse feature addition/removal within single ChangeLog entry 

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

6 files changed, 37 insertions, 28 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 34bf8b41b45..ec60d4add5f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,19 @@
+2005-04-08  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (syms_of_xdisp): Init overlay-arrow-string to "=>".
+
+2005-04-06  Kim F. Storm  <storm@cua.dk>
+
+        * emacs.c (standard_args): Add -Q, --bare-bones, -bare-bones.
+
+2005-04-06  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * mac.c (cfdate_to_lisp): Add `const' for variable `epoch_gdate'.
+        (Fmac_get_preference): Doc fix.
+
+        * macfns.c (Fx_create_frame, x_create_tip_frame): Add
+        "fontset-mac" to fallback font/fontsets.
+
 2005-04-04  Kim F. Storm  <storm@cua.dk>
 
         * alloc.c (Fgarbage_collect): Call CHECK_CONS_LIST before and after gc.
@@ -2865,7 +2881,7 @@
 
         * xfns.c (xic_create_xfontset): Initialize missing_list to NULL.
 
-2004-10-21  K,Aa(Broly L$,1 q(Brentey  <lorentey@elte.hu>
+2004-10-21  K,Ba(Broly L,Bu(Brentey  <lorentey@elte.hu>
 
         * xterm.h (x_output): New member `xic_base_fontname'.
         (FRAME_XIC_BASE_FONTNAME): New macro.
@@ -4146,7 +4162,7 @@
         * keyboard.c (cmd_error): Don't call any_kboard_state
         if inside a recursive edit level.
 
-2004-06-13  Lorentey K,Aa(Broly  <lorentey@elte.hu>
+2004-06-13  K,Ba(Broly L,Bu(Brentey  <lorentey@elte.hu>
 
         * keyboard.c (command_loop): Call any_kboard_state before
         command_loop_2 when at top level.
diff --git a/src/ChangeLog.6 b/src/ChangeLog.6
index 52e48cac275..67569eedeca 100644
--- a/src/ChangeLog.6
+++ b/src/ChangeLog.6
@@ -4817,7 +4817,7 @@
         (Fmemory_use_counts): New function.
         (syms_of_alloc): defsubr it.
 
-1995-07-28  Gvran Uddeborg  <uddeborg@carmen.se>
+1995-07-28  Göran Uddeborg  <uddeborg@carmen.se>
 
         * s/isc4-1.h: ISC 4.1 has termios.
 
diff --git a/src/emacs.c b/src/emacs.c
index da872da1e5c..f6d32e175b3 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1806,6 +1806,8 @@ struct standard_args standard_args[] =
   { "-d", "--display", 60, 1 },
   { "-display", 0, 60, 1 },
   /* Now for the options handled in startup.el.  */
+  { "-Q", "--bare-bones", 55, 0 },
+  { "-bare-bones", 0, 55, 0 },
   { "-q", "--no-init-file", 50, 0 },
   { "-no-init-file", 0, 50, 0 },
   { "-no-site-file", "--no-site-file", 40, 0 },
diff --git a/src/mac.c b/src/mac.c
index f5fc62b2200..da6a61633dc 100644
--- a/src/mac.c
+++ b/src/mac.c
@@ -364,13 +364,13 @@ cfnumber_to_lisp (number)
 
 
 /* CFDate to a list of three integers as in a return value of
-   `current-time'xo.  */
+   `current-time'.  */
 
 Lisp_Object
 cfdate_to_lisp (date)
      CFDateRef date;
 {
-  static CFGregorianDate epoch_gdate = {1970, 1, 1, 0, 0, 0.0};
+  static const CFGregorianDate epoch_gdate = {1970, 1, 1, 0, 0, 0.0};
   static CFAbsoluteTime epoch = 0.0, sec;
   int high, low;
 
@@ -668,7 +668,7 @@ parse_resource_name (p)
     return Qnil;
 
   result = Fcons (component, result);
-  while (binding = parse_binding (p))
+  while ((binding = parse_binding (p)) != '\0')
     {
       if (binding == '*')
         result = Fcons (LOOSE_BINDING, result);
@@ -3662,7 +3662,7 @@ corresponding Lisp object as follows:
   CFDate             List of three integers         date
                        (cf. `current-time')
   CFData             Unibyte string                 data
-  CFArray            Array                          array
+  CFArray            Vector                         array
   CFDictionary       Alist or hash table            dictionary
                        (depending on HASH-BOUND)
 
@@ -4174,26 +4174,13 @@ syms_of_mac ()
   staticpro (&QCLIPBOARD);
 
 #if TARGET_API_MAC_CARBON
-  Qstring = intern ("string");
-  staticpro (&Qstring);
-
-  Qnumber = intern ("number");
-  staticpro (&Qnumber);
-
-  Qboolean = intern ("boolean");
-  staticpro (&Qboolean);
-
-  Qdate = intern ("date");
-  staticpro (&Qdate);
-
-  Qdata = intern ("data");
-  staticpro (&Qdata);
-
-  Qarray = intern ("array");
-  staticpro (&Qarray);
-
-  Qdictionary = intern ("dictionary");
-  staticpro (&Qdictionary);
+  Qstring  = intern ("string");         staticpro (&Qstring);
+  Qnumber  = intern ("number");         staticpro (&Qnumber);
+  Qboolean = intern ("boolean");        staticpro (&Qboolean);
+  Qdate    = intern ("date");           staticpro (&Qdate);
+  Qdata    = intern ("data");           staticpro (&Qdata);
+  Qarray   = intern ("array");          staticpro (&Qarray);
+  Qdictionary = intern ("dictionary");  staticpro (&Qdictionary);
 
   Qxml = intern ("xml");
   staticpro (&Qxml);
diff --git a/src/macfns.c b/src/macfns.c
index 75994cab150..357f993b0f9 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -2632,6 +2632,8 @@ This function is an internal primitive--use `make-frame' instead.  */)
       font = x_new_font (f, "-ETL-fixed-medium-r-*--*-160-*-*-*-*-iso8859-1");
     /* If those didn't work, look for something which will at least work.  */
     if (! STRINGP (font))
+      font = x_new_fontset (f, "fontset-mac");
+    if (! STRINGP (font))
       font = x_new_font (f, "-*-monaco-*-12-*-mac-roman");
     if (! STRINGP (font))
       font = x_new_font (f, "-*-courier-*-10-*-mac-roman");
@@ -3732,6 +3734,8 @@ x_create_tip_frame (dpyinfo, parms, text)
       font = x_new_font (f, "-ETL-fixed-medium-r-*--*-160-*-*-*-*-iso8859-1");
     /* If those didn't work, look for something which will at least work.  */
     if (! STRINGP (font))
+      font = x_new_fontset (f, "fontset-mac");
+    if (! STRINGP (font))
       font = x_new_font (f, "-*-monaco-*-12-*-mac-roman");
     if (! STRINGP (font))
       font = x_new_font (f, "-*-courier-*-10-*-mac-roman");
diff --git a/src/xdisp.c b/src/xdisp.c
index ffbbfaaba7f..c545b6b2bc2 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -22612,7 +22612,7 @@ See also `overlay-arrow-string'.  */);
   DEFVAR_LISP ("overlay-arrow-string", &Voverlay_arrow_string,
     doc: /* String to display as an arrow in non-window frames.
 See also `overlay-arrow-position'.  */);
-  Voverlay_arrow_string = Qnil;
+  Voverlay_arrow_string = build_string ("=>");
 
   DEFVAR_LISP ("overlay-arrow-variable-list", &Voverlay_arrow_variable_list,
     doc: /* List of variables (symbols) which hold markers for overlay arrows.