diff options
| author | Miles Bader <[email protected]> | 2007-10-19 00:03:33 +0000 |
|---|---|---|
| committer | Miles Bader <[email protected]> | 2007-10-19 00:03:33 +0000 |
| commit | 62c5c1fe177df9e52a7fc7ea3141a04faac5b2f9 (patch) | |
| tree | 803254d8179504ad83f54ee85019857a98038c9e /src/lisp.h | |
| parent | 9c8020a8df03dc67a56d7df15664dcf7ace54bf0 (diff) | |
Fix merge conflicts
Revision: [email protected]/emacs--unicode--0--patch-271
Diffstat (limited to 'src/lisp.h')
| -rw-r--r-- | src/lisp.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/lisp.h b/src/lisp.h index 9ce5b3429e..8a0b13a72a 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -1463,17 +1463,9 @@ typedef unsigned char UCHAR; #define OBJFWDP(x) (MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Objfwd) #define BUFFER_OBJFWDP(x) (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. */ |