From: Miles Bader <miles@gnu.org>
Date: Fri, 19 Oct 2007 00:00:21 +0000 (+0000)
Subject: Merge from emacs--devo--0
X-Git-Tag: emacs-pretest-23.0.90~8295^2~307
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9c8020a8df03dc67a56d7df15664dcf7ace54bf0;p=emacs.git

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 890-898)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 122-128)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 257-258)

   - Merge from emacs--rel--22
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-270
---

9c8020a8df03dc67a56d7df15664dcf7ace54bf0
diff --cc src/coding.c
index 2b518b903a4,da6049cafbd..c77aa338a1e
--- a/src/coding.c
+++ b/src/coding.c
@@@ -326,12 -374,13 +326,14 @@@ Lisp_Object Qcall_process, Qcall_proces
  Lisp_Object Qstart_process, Qopen_network_stream;
  Lisp_Object Qtarget_idx;
  
 +Lisp_Object Qinsufficient_source, Qinconsistent_eol, Qinvalid_source;
 +Lisp_Object Qinterrupted, Qinsufficient_memory;
 +
+ extern Lisp_Object Qcompletion_ignore_case;
+ 
  /* If a symbol has this property, evaluate the value to define the
     symbol as a coding system.  */
 -Lisp_Object Qcoding_system_define_form;
 -
 -Lisp_Object Vselect_safe_coding_system_function;
 +static Lisp_Object Qcoding_system_define_form;
  
  int coding_system_require_warning;
  
diff --cc src/lisp.h
index 231cfcc7379,47e40c63328..9ce5b3429e7
--- a/src/lisp.h
+++ b/src/lisp.h
@@@ -1432,28 -1459,47 +1443,37 @@@ typedef unsigned char UCHAR
  /* Data type checking */
  
  #define NILP(x)  EQ (x, Qnil)
 -#define GC_NILP(x) GC_EQ (x, Qnil)
  
  #define NUMBERP(x) (INTEGERP (x) || FLOATP (x))
 -#define GC_NUMBERP(x) (GC_INTEGERP (x) || GC_FLOATP (x))
  #define NATNUMP(x) (INTEGERP (x) && XINT (x) >= 0)
 -#define GC_NATNUMP(x) (GC_INTEGERP (x) && XINT (x) >= 0)
  
  #define INTEGERP(x) (XTYPE ((x)) == Lisp_Int)
 -#define GC_INTEGERP(x) INTEGERP (x)
  #define SYMBOLP(x) (XTYPE ((x)) == Lisp_Symbol)
 -#define GC_SYMBOLP(x) (XGCTYPE ((x)) == Lisp_Symbol)
  #define MISCP(x) (XTYPE ((x)) == Lisp_Misc)
 -#define GC_MISCP(x) (XGCTYPE ((x)) == Lisp_Misc)
  #define VECTORLIKEP(x) (XTYPE ((x)) == Lisp_Vectorlike)
 -#define GC_VECTORLIKEP(x) (XGCTYPE ((x)) == Lisp_Vectorlike)
  #define STRINGP(x) (XTYPE ((x)) == Lisp_String)
 -#define GC_STRINGP(x) (XGCTYPE ((x)) == Lisp_String)
  #define CONSP(x) (XTYPE ((x)) == Lisp_Cons)
 -#define GC_CONSP(x) (XGCTYPE ((x)) == Lisp_Cons)
  
  #define FLOATP(x) (XTYPE ((x)) == Lisp_Float)
 -#define GC_FLOATP(x) (XGCTYPE ((x)) == Lisp_Float)
 -#define VECTORP(x) (VECTORLIKEP (x) && !(XVECTOR (x)->size & PSEUDOVECTOR_FLAG))
 -#define GC_VECTORP(x) (GC_VECTORLIKEP (x) && !(XVECTOR (x)->size & PSEUDOVECTOR_FLAG))
 +#define VECTORP(x)    (VECTORLIKEP (x) && !(XVECTOR (x)->size & PSEUDOVECTOR_FLAG))
  #define OVERLAYP(x) (MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Overlay)
 -#define GC_OVERLAYP(x) (GC_MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Overlay)
  #define MARKERP(x) (MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Marker)
 -#define GC_MARKERP(x) (GC_MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Marker)
  #define INTFWDP(x) (MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Intfwd)
 -#define GC_INTFWDP(x) (GC_MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Intfwd)
  #define BOOLFWDP(x) (MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Boolfwd)
 -#define GC_BOOLFWDP(x) (GC_MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Boolfwd)
  #define OBJFWDP(x) (MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Objfwd)
 -#define GC_OBJFWDP(x) (GC_MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Objfwd)
  #define BUFFER_OBJFWDP(x) (MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Buffer_Objfwd)
 -#define GC_BUFFER_OBJFWDP(x) (GC_MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Buffer_Objfwd)
  #define BUFFER_LOCAL_VALUEP(x) (MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Buffer_Local_Value)
++<<<<<<< TREE
 +#define SOME_BUFFER_LOCAL_VALUEP(x) (MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Some_Buffer_Local_Value)
++=======
+ #define GC_BUFFER_LOCAL_VALUEP(x) (GC_MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Buffer_Local_Value)
++>>>>>>> MERGE-SOURCE
  #define KBOARD_OBJFWDP(x) (MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Kboard_Objfwd)
++<<<<<<< TREE
++=======
+ #define GC_KBOARD_OBJFWDP(x) (GC_MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Kboard_Objfwd)
+ #define SAVE_VALUEP(x) (MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Save_Value)
++>>>>>>> MERGE-SOURCE
  
  
  /* True if object X is a pseudovector whose code is CODE.  */