Merge branch 'kaoriya'

Conflicts:
	src/eval.c
	src/proto/job.pro

Author: splhack

src/Make_mvc.mak

@@ -558,7 +558,6 @@ OBJ = \
 	$(OUTDIR)\getchar.obj \
 	$(OUTDIR)\hardcopy.obj \
 	$(OUTDIR)\hashtab.obj \
-	$(OUTDIR)\job.obj \
 	$(OUTDIR)\main.obj \
 	$(OUTDIR)\mark.obj \
 	$(OUTDIR)\mbyte.obj \
@@ -1125,8 +1124,6 @@ $(OUTDIR)/hardcopy.obj:	$(OUTDIR) hardcopy.c  $(INCL)
 
 $(OUTDIR)/hashtab.obj:	$(OUTDIR) hashtab.c  $(INCL)
 
-$(OUTDIR)/job.obj:	$(OUTDIR) job.c  $(INCL)
-
 $(OUTDIR)/gui.obj:	$(OUTDIR) gui.c  $(INCL) $(GUI_INCL)
 
 $(OUTDIR)/gui_beval.obj:	$(OUTDIR) gui_beval.c $(INCL) $(GUI_INCL)
@@ -1298,7 +1295,6 @@ proto.h: \
 	proto/getchar.pro \
 	proto/hardcopy.pro \
 	proto/hashtab.pro \
-	proto/job.pro \
 	proto/main.pro \
 	proto/mark.pro \
 	proto/memfile.pro \

src/buffer.c

@@ -568,8 +568,6 @@ buf_clear_file(buf)
 #endif
     buf->b_p_eol = TRUE;
     buf->b_start_eol = TRUE;
-    buf->b_p_lasteol = TRUE;
-    buf->b_start_lasteol = TRUE;
 #ifdef FEAT_MBYTE
     buf->b_p_bomb = FALSE;
     buf->b_start_bomb = FALSE;
@@ -722,9 +720,6 @@ free_buffer_stuff(buf, free_options)
 	ga_clear(&buf->b_s.b_langp);
 #endif
     }
-#ifdef FEAT_EVAL
-    emarklist_cleanup(&buf->b_emarklist);
-#endif
 #ifdef FEAT_EVAL
     vars_clear(&buf->b_vars->dv_hashtab); /* free all internal variables */
     hash_init(&buf->b_vars->dv_hashtab);
@@ -2675,9 +2670,6 @@ get_winopts(buf)
     if (p_fdls >= 0)
 	curwin->w_p_fdl = p_fdls;
 #endif
-#ifdef FEAT_EVAL
-    emarklist_init(&buf->b_emarklist);
-#endif
 #ifdef FEAT_SYN_HL
     check_colorcolumn(curwin);
 #endif