X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/e717e6d75de34853f8adcb6d42050e81cb4fe883..80d0edae927b550944eb54eb49a70cb7f5353b68:/src/commands.h

diff --git a/src/commands.h b/src/commands.h
index 0494478541..7ad593577a 100644
--- a/src/commands.h
+++ b/src/commands.h
@@ -1,5 +1,6 @@
 /* Definitions needed by most editing commands.
-   Copyright (C) 1985, 1994 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1994, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -15,8 +16,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, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 #define Ctl(c) ((c)&037)
@@ -51,7 +52,7 @@ extern Lisp_Object Vunread_command_events;
 
 /* Command char event to be re-read, or -1 if none.
    Setting this is obsolete, but some things should still check it.  */
-extern int unread_command_char;
+extern EMACS_INT unread_command_char;
 
 /* The command being executed by the command loop.
    Commands may set this, and the value set will be copied into
@@ -76,11 +77,11 @@ extern Lisp_Object last_point_position_buffer;
 /* Nonzero means ^G can quit instantly */
 extern int immediate_quit;
 
-extern Lisp_Object Vexecuting_macro;
+extern Lisp_Object Vexecuting_kbd_macro;
 
 /* Nonzero if input is coming from the keyboard */
 
-#define INTERACTIVE (NILP (Vexecuting_macro) && !noninteractive)
+#define INTERACTIVE (NILP (Vexecuting_kbd_macro) && !noninteractive)
 
 /* Set this nonzero to force reconsideration of mode line. */
 
@@ -90,3 +91,6 @@ extern int update_mode_lines;
    so put cursor on minibuffer after the prompt.  */
 
 extern int cursor_in_echo_area;
+
+/* arch-tag: 4f7ca0b7-6a56-4b20-8bf5-b67a99921d1d
+   (do not change this comment) */