(redisplay_window): Fix access to w->last_point{,_[xy]}.

[gnu-emacs] / src / vmsfns.c

diff --git a/src/vmsfns.c b/src/vmsfns.c
index 512ab21679a300267aaf94e51c1af3e817e881f5..716ba21def768774f5ebd1d89afeef048c0e0aa5 100644 (file)
--- a/src/vmsfns.c
+++ b/src/vmsfns.c
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Written by Mukesh Prasad.  */
 
@@ -59,7 +60,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <ctype.h>
 #undef NULL
 
-#include "config.h"
+#include <config.h>
 #include "lisp.h"
 #include <descrip.h>
 #include <dvidef.h>
@@ -310,7 +311,7 @@ DEFUN ("spawn-subprocess", Fspawn_subprocess, Sspawn_subprocess, 1, 3, 0,
            prev->next = next;
          else
            process_list = next;
-         if (! NULL (ptr->exit_handler))
+         if (! NILP (ptr->exit_handler))
            Feval (Fcons (ptr->exit_handler, Fcons (make_number (ptr->name),
                                                    Qnil)));
          sys$dassgn (ptr->mbx_chan);
@@ -327,7 +328,7 @@ DEFUN ("spawn-subprocess", Fspawn_subprocess, Sspawn_subprocess, 1, 3, 0,
       free (ptr);
       return Qnil;
     }
-  if (NULL (input_handler))
+  if (NILP (input_handler))
     input_handler = Qdefault_subproc_input_handler;
   ptr->input_handler = input_handler;
   ptr->exit_handler = exit_handler;
@@ -447,7 +448,7 @@ process_command_input ()
   have_process_input = 0;
   start_mbx_input ();
   clear_waiting_for_input ();    /* Otherwise Ctl-g will cause crash. JCB */
-  if (! NULL (expr))
+  if (! NILP (expr))
     Feval (expr);
 }
 
@@ -471,7 +472,7 @@ process_exit ()
            prev->next = next;
          else
            process_list = next;
-         if (! NULL (ptr->exit_handler))
+         if (! NILP (ptr->exit_handler))
            Feval (Fcons (ptr->exit_handler, Fcons (make_number (ptr->name),
                                                    Qnil)));
          sys$dassgn (ptr->mbx_chan);
@@ -605,9 +606,9 @@ or nil depending upon whether the privilege is already enabled.")
     }
   if (! found)
     error ("Unknown privilege name %s", XSTRING (priv)->data);
-  if (NULL (getprv))
+  if (NILP (getprv))
     {
-      if (sys$setprv (NULL (value) ? 0 : 1, prvmask, 0, 0) == SS$_NORMAL)
+      if (sys$setprv (NILP (value) ? 0 : 1, prvmask, 0, 0) == SS$_NORMAL)
        return Qt;
       return Qnil;
     }
@@ -679,9 +680,9 @@ translate_id (pid, owner)
   char * p;
   int prcnam[2];
 
-  if (NULL (pid)
-      || XTYPE (pid) == Lisp_String && XSTRING (pid)->size == 0
-      || XTYPE (pid) == Lisp_Int && XFASTINT (pid) == 0)
+  if (NILP (pid)
+      || STRINGP (pid) && XSTRING (pid)->size == 0
+      || INTEGERP (pid) && XFASTINT (pid) == 0)
     {
       code = owner ? JPI$_OWNER : JPI$_PID;
       status = lib$getjpi (&code, 0, 0, &id);
@@ -691,7 +692,7 @@ translate_id (pid, owner)
               vmserrstr (status));
       return (id);
     }
-  if (XTYPE (pid) == Lisp_Int)
+  if (INTEGERP (pid))
     return (XFASTINT (pid));
   CHECK_STRING (pid, 0);
   pid = Fupcase (pid);