; Fix breakage from previous commit

[gnu-emacs] / lisp / vt-control.el

diff --git a/lisp/vt-control.el b/lisp/vt-control.el
index 3eaf27b13b836f6fae194fe8ce5d8c81deb57fdf..358401040905da7436b5db6db3eea50eee90548e 100644 (file)
--- a/lisp/vt-control.el
+++ b/lisp/vt-control.el
@@ -1,7 +1,6 @@
 ;;; vt-control.el --- Common VTxxx control functions
 
-;; Copyright (C) 1993, 1994, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1994, 2001-2016 Free Software Foundation, Inc.
 
 ;; Author: Rob Riepel <riepel@networking.stanford.edu>
 ;; Maintainer: Rob Riepel <riepel@networking.stanford.edu>
@@ -9,10 +8,10 @@
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; 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 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,9 +19,7 @@
 ;; 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., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -90,22 +87,24 @@
   (interactive)
   (send-string-to-terminal "\e=")
   (setq vt-applications-keypad-p t)
-  (if (or tell (interactive-p)) (message "Applications keypad enabled.")))
+  (if (or tell (called-interactively-p 'interactive))
+      (message "Applications keypad enabled.")))
 
 (defun vt-keypad-off (&optional tell)
   "Turn off the VT applications keypad."
   (interactive "p")
   (send-string-to-terminal "\e>")
   (setq vt-applications-keypad-p nil)
-  (if (or tell (interactive-p)) (message "Applications keypad disabled.")))
+  (if (or tell (called-interactively-p 'interactive))
+      (message "Applications keypad disabled.")))
 
 (defun vt-numlock nil
   "Toggle VT application keypad on and off."
   (interactive)
-  (if vt-applications-keypad-p (vt-keypad-off (interactive-p))
-    (vt-keypad-on (interactive-p))))
+  (if vt-applications-keypad-p
+      (vt-keypad-off (called-interactively-p 'interactive))
+    (vt-keypad-on (called-interactively-p 'interactive))))
 
 (provide 'vt-control)
 
-;; arch-tag: d4fed1bf-2524-4ba1-a4fe-86bca3d928a2
 ;;; vt-control.el ends here