aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/emulation
diff options
context:
space:
mode:
authorPavel Janík2001-07-16 12:23:00 +0000
committerPavel Janík2001-07-16 12:23:00 +0000
commite8af40eed41d6c61ea6a0649512c4b09afcb1bfa (patch)
tree588654cb6c38a93c432bfae53ccbf36569e3cf23 /lisp/emulation
parent4cba8c0bdcce038e6966aab82d08859d796e69d0 (diff)
downloademacs-e8af40eed41d6c61ea6a0649512c4b09afcb1bfa.tar.gz
emacs-e8af40eed41d6c61ea6a0649512c4b09afcb1bfa.zip
Some fixes to follow coding conventions.
Diffstat (limited to 'lisp/emulation')
-rw-r--r--lisp/emulation/edt-lk201.el9
-rw-r--r--lisp/emulation/edt-mapper.el2
-rw-r--r--lisp/emulation/edt-pc.el9
-rw-r--r--lisp/emulation/edt-vt100.el9
-rw-r--r--lisp/emulation/edt.el2
-rw-r--r--lisp/emulation/pc-select.el2
-rw-r--r--lisp/emulation/tpu-edt.el18
-rw-r--r--lisp/emulation/tpu-extras.el2
-rw-r--r--lisp/emulation/tpu-mapper.el2
-rw-r--r--lisp/emulation/vip.el12
10 files changed, 42 insertions, 25 deletions
diff --git a/lisp/emulation/edt-lk201.el b/lisp/emulation/edt-lk201.el
index 2aeb6aac742..cdbe34060ac 100644
--- a/lisp/emulation/edt-lk201.el
+++ b/lisp/emulation/edt-lk201.el
@@ -1,4 +1,4 @@
1;;; edt-lk201.el --- Enhanced EDT Keypad Mode Emulation for LK-201 Keyboards 1;;; edt-lk201.el --- enhanced EDT keypad mode emulation for LK-201 keyboards
2 2
3;; Copyright (C) 1986, 1992, 1993, 1995 Free Software Foundation, Inc. 3;; Copyright (C) 1986, 1992, 1993, 1995 Free Software Foundation, Inc.
4 4
@@ -23,7 +23,7 @@
23;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, 23;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
24;; Boston, MA 02111-1307, USA. 24;; Boston, MA 02111-1307, USA.
25 25
26;;; Usage: 26;;; Commentary:
27 27
28;; See edt-user.doc in the Emacs etc directory. 28;; See edt-user.doc in the Emacs etc directory.
29 29
@@ -39,6 +39,9 @@
39;; F1 - F5 are not available on many DEC VT series terminals. 39;; F1 - F5 are not available on many DEC VT series terminals.
40;; However, this is not always the case. So support for F1 - F5 is 40;; However, this is not always the case. So support for F1 - F5 is
41;; provided here and in lisp/term/lk201.el. 41;; provided here and in lisp/term/lk201.el.
42
43;;; Code:
44
42(defconst *EDT-keys* 45(defconst *EDT-keys*
43 '(("KP0" . [kp-0]) ("KP1" . [kp-1]) ("KP2" . [kp-2]) ("KP3" . [kp-3]) 46 '(("KP0" . [kp-0]) ("KP1" . [kp-1]) ("KP2" . [kp-2]) ("KP3" . [kp-3])
44 ("KP4" . [kp-4]) ("KP5" . [kp-5]) ("KP6" . [kp-6]) ("KP7" . [kp-7]) 47 ("KP4" . [kp-4]) ("KP5" . [kp-5]) ("KP6" . [kp-6]) ("KP7" . [kp-7])
@@ -53,3 +56,5 @@
53 ("F11" . [f11]) ("F12" . [f12]) ("F13" . [f13]) ("F14" . [f14]) 56 ("F11" . [f11]) ("F12" . [f12]) ("F13" . [f13]) ("F14" . [f14])
54 ("HELP" . [help]) ("DO" . [menu]) ("F17" . [f17]) ("F18" . [f18]) 57 ("HELP" . [help]) ("DO" . [menu]) ("F17" . [f17]) ("F18" . [f18])
55 ("F19" . [f19]) ("F20" . [f20]))) 58 ("F19" . [f19]) ("F20" . [f20])))
59
60;;; edt-lk201.el ends here
diff --git a/lisp/emulation/edt-mapper.el b/lisp/emulation/edt-mapper.el
index 9b60f9f1fd0..7f74ab60f95 100644
--- a/lisp/emulation/edt-mapper.el
+++ b/lisp/emulation/edt-mapper.el
@@ -1,4 +1,4 @@
1;;; edt-mapper.el --- Create an EDT LK-201 Map File for X-Windows Emacs 1;;; edt-mapper.el --- create an EDT LK-201 map file for X-Windows Emacs
2 2
3;; Copyright (C) 1994, 1995, 2000, 2001 Free Software Foundation, Inc. 3;; Copyright (C) 1994, 1995, 2000, 2001 Free Software Foundation, Inc.
4 4
diff --git a/lisp/emulation/edt-pc.el b/lisp/emulation/edt-pc.el
index 0cd9ece4498..2b6aa25b061 100644
--- a/lisp/emulation/edt-pc.el
+++ b/lisp/emulation/edt-pc.el
@@ -1,4 +1,4 @@
1;;; edt-pc.el --- Enhanced EDT Keypad Mode Emulation for PC 101 Keyboards 1;;; edt-pc.el --- enhanced EDT keypad mode emulation for PC 101 keyboards
2 2
3;; Copyright (C) 1986, 1994, 1995 Free Software Foundation, Inc. 3;; Copyright (C) 1986, 1994, 1995 Free Software Foundation, Inc.
4 4
@@ -23,7 +23,7 @@
23;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, 23;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
24;; Boston, MA 02111-1307, USA. 24;; Boston, MA 02111-1307, USA.
25 25
26;;; Usage: 26;;; Commentary:
27 27
28;; See edt-user.doc in the Emacs etc directory. 28;; See edt-user.doc in the Emacs etc directory.
29 29
@@ -68,6 +68,9 @@
68;; and F17 through F20 do not exist on the PC, so the EDT emulation is 68;; and F17 through F20 do not exist on the PC, so the EDT emulation is
69;; configured below to ignore attempts to bind functions to those keys. 69;; configured below to ignore attempts to bind functions to those keys.
70;; 70;;
71
72;;; Code:
73
71(defconst *EDT-keys* 74(defconst *EDT-keys*
72 '(("KP0" . [kp-0]) ("KP1" . [kp-1]) ("KP2" . [kp-2]) ("KP3" . [kp-3]) 75 '(("KP0" . [kp-0]) ("KP1" . [kp-1]) ("KP2" . [kp-2]) ("KP3" . [kp-3])
73 ("KP4" . [kp-4]) ("KP5" . [kp-5]) ("KP6" . [kp-6]) ("KP7" . [kp-7]) 76 ("KP4" . [kp-4]) ("KP5" . [kp-5]) ("KP6" . [kp-6]) ("KP7" . [kp-7])
@@ -83,3 +86,5 @@
83 ("F11" . [f11]) ("F12" . [f12]) ("F13" . "" ) ("F14" . "" ) 86 ("F11" . [f11]) ("F12" . [f12]) ("F13" . "" ) ("F14" . "" )
84 ("HELP" . "" ) ("DO" . "" ) ("F17" . "" ) ("F18" . "" ) 87 ("HELP" . "" ) ("DO" . "" ) ("F17" . "" ) ("F18" . "" )
85 ("F19" . "" ) ("F20" . "" ))) 88 ("F19" . "" ) ("F20" . "" )))
89
90;;; edt-pc.el ends here
diff --git a/lisp/emulation/edt-vt100.el b/lisp/emulation/edt-vt100.el
index 42f81cd6f56..283b7827c73 100644
--- a/lisp/emulation/edt-vt100.el
+++ b/lisp/emulation/edt-vt100.el
@@ -1,4 +1,4 @@
1;;; edt-vt100.el --- Enhanced EDT Keypad Mode Emulation for VT Series Terminals 1;;; edt-vt100.el --- enhanced EDT keypad mode emulation for VT series terminals
2 2
3;; Copyright (C) 1986, 1992, 1993, 1995 Free Software Foundation, Inc. 3;; Copyright (C) 1986, 1992, 1993, 1995 Free Software Foundation, Inc.
4 4
@@ -23,12 +23,15 @@
23;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, 23;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
24;; Boston, MA 02111-1307, USA. 24;; Boston, MA 02111-1307, USA.
25 25
26;;; Usage: 26;;; Commentary:
27 27
28;; See edt-user.doc in the Emacs etc directory. 28;; See edt-user.doc in the Emacs etc directory.
29 29
30;; ==================================================================== 30;; ====================================================================
31 31
32
33;;; Code:
34
32;; Get keyboard function key mapping to EDT keys. 35;; Get keyboard function key mapping to EDT keys.
33(load "edt-lk201" nil t) 36(load "edt-lk201" nil t)
34 37
@@ -42,3 +45,5 @@
42(defun edt-set-term-width-132 () 45(defun edt-set-term-width-132 ()
43 "Set terminal width to 132 columns." 46 "Set terminal width to 132 columns."
44 (vt100-wide-mode 1)) 47 (vt100-wide-mode 1))
48
49;;; edt-vt100.el ends here
diff --git a/lisp/emulation/edt.el b/lisp/emulation/edt.el
index 2912da5df28..d54c0bba8cb 100644
--- a/lisp/emulation/edt.el
+++ b/lisp/emulation/edt.el
@@ -1,4 +1,4 @@
1;;; edt.el --- Enhanced EDT Keypad Mode Emulation for GNU Emacs 19 1;;; edt.el --- enhanced EDT keypad mode emulation for GNU Emacs 19
2 2
3;; Copyright (C) 1986, 1992, 1993, 1994, 1995, 2000, 2001 3;; Copyright (C) 1986, 1992, 1993, 1994, 1995, 2000, 2001
4;; Free Software Foundation, Inc. 4;; Free Software Foundation, Inc.
diff --git a/lisp/emulation/pc-select.el b/lisp/emulation/pc-select.el
index fde3672f3a8..c8c3331ba31 100644
--- a/lisp/emulation/pc-select.el
+++ b/lisp/emulation/pc-select.el
@@ -77,6 +77,8 @@
77;; other programs. 77;; other programs.
78;; 78;;
79 79
80;;; Code:
81
80;;;; Customization: 82;;;; Customization:
81(defgroup pc-select nil 83(defgroup pc-select nil
82 "Emulate pc bindings." 84 "Emulate pc bindings."
diff --git a/lisp/emulation/tpu-edt.el b/lisp/emulation/tpu-edt.el
index 21891d24862..f17ff953884 100644
--- a/lisp/emulation/tpu-edt.el
+++ b/lisp/emulation/tpu-edt.el
@@ -1071,7 +1071,7 @@ kills modified buffers without asking."
1071 (interactive) 1071 (interactive)
1072 (let ((list (tpu-make-file-buffer-list (buffer-list)))) 1072 (let ((list (tpu-make-file-buffer-list (buffer-list))))
1073 (setq list (delq (current-buffer) list)) 1073 (setq list (delq (current-buffer) list))
1074 (if (not list) (error "No other buffers.")) 1074 (if (not list) (error "No other buffers"))
1075 (switch-to-buffer (car (reverse list))))) 1075 (switch-to-buffer (car (reverse list)))))
1076 1076
1077(defun tpu-make-file-buffer-list (buffer-list) 1077(defun tpu-make-file-buffer-list (buffer-list)
@@ -1343,7 +1343,7 @@ The text is saved for the tpu-paste command."
1343 (delete-region beg end) 1343 (delete-region beg end)
1344 (tpu-unset-match))) 1344 (tpu-unset-match)))
1345 (t 1345 (t
1346 (error "No selection active.")))) 1346 (error "No selection active"))))
1347 1347
1348(defun tpu-store-text nil 1348(defun tpu-store-text nil
1349 "Copy the selected region to the cut buffer without deleting it. 1349 "Copy the selected region to the cut buffer without deleting it.
@@ -1365,7 +1365,7 @@ The text is saved for the tpu-paste command."
1365 (buffer-substring (tpu-match-beginning) (tpu-match-end))) 1365 (buffer-substring (tpu-match-beginning) (tpu-match-end)))
1366 (tpu-unset-match)) 1366 (tpu-unset-match))
1367 (t 1367 (t
1368 (error "No selection active.")))) 1368 (error "No selection active"))))
1369 1369
1370(defun tpu-cut (arg) 1370(defun tpu-cut (arg)
1371 "Copy selected region to the cut buffer. In the absence of an 1371 "Copy selected region to the cut buffer. In the absence of an
@@ -1392,7 +1392,7 @@ argument, delete the selected region too."
1392 (if (not arg) (delete-region beg end)) 1392 (if (not arg) (delete-region beg end))
1393 (tpu-unset-match))) 1393 (tpu-unset-match)))
1394 (t 1394 (t
1395 (error "No selection active.")))) 1395 (error "No selection active"))))
1396 1396
1397(defun tpu-delete-current-line (num) 1397(defun tpu-delete-current-line (num)
1398 "Delete one or specified number of lines after point. 1398 "Delete one or specified number of lines after point.
@@ -1532,7 +1532,7 @@ With argument reinserts the character that many times."
1532 (not case-replace) (not tpu-regexp-p)) 1532 (not case-replace) (not tpu-regexp-p))
1533 (tpu-unset-match))) 1533 (tpu-unset-match)))
1534 (t 1534 (t
1535 (error "No selection active.")))) 1535 (error "No selection active"))))
1536 1536
1537(defun tpu-substitute (num) 1537(defun tpu-substitute (num)
1538 "Replace the selected region with the contents of the cut buffer, and 1538 "Replace the selected region with the contents of the cut buffer, and
@@ -1548,7 +1548,7 @@ A negative argument means replace all occurrences of the search string."
1548 (tpu-search-internal-core tpu-search-last-string))) 1548 (tpu-search-internal-core tpu-search-last-string)))
1549 (setq num (1- num)))) 1549 (setq num (1- num))))
1550 (t 1550 (t
1551 (error "No selection active.")))) 1551 (error "No selection active"))))
1552 1552
1553(defun tpu-lm-replace (from to) 1553(defun tpu-lm-replace (from to)
1554 "Interactively search for OLD-string and substitute NEW-string." 1554 "Interactively search for OLD-string and substitute NEW-string."
@@ -1558,7 +1558,7 @@ A negative argument means replace all occurrences of the search string."
1558 (let ((doit t) (strings 0)) 1558 (let ((doit t) (strings 0))
1559 1559
1560 ;; Can't replace null strings 1560 ;; Can't replace null strings
1561 (if (string= "" from) (error "No string to replace.")) 1561 (if (string= "" from) (error "No string to replace"))
1562 1562
1563 ;; Find the first occurrence 1563 ;; Find the first occurrence
1564 (tpu-set-search) 1564 (tpu-set-search)
@@ -1631,7 +1631,7 @@ are performed without asking. Only works in forward direction."
1631or each line in the entire buffer if no region is selected." 1631or each line in the entire buffer if no region is selected."
1632 (interactive 1632 (interactive
1633 (list (tpu-string-prompt "String to add: " 'tpu-add-at-bol-hist))) 1633 (list (tpu-string-prompt "String to add: " 'tpu-add-at-bol-hist)))
1634 (if (string= "" text) (error "No string specified.")) 1634 (if (string= "" text) (error "No string specified"))
1635 (cond ((tpu-mark) 1635 (cond ((tpu-mark)
1636 (save-excursion 1636 (save-excursion
1637 (if (> (point) (tpu-mark)) (exchange-point-and-mark)) 1637 (if (> (point) (tpu-mark)) (exchange-point-and-mark))
@@ -1649,7 +1649,7 @@ or each line in the entire buffer if no region is selected."
1649or each line of the entire buffer if no region is selected." 1649or each line of the entire buffer if no region is selected."
1650 (interactive 1650 (interactive
1651 (list (tpu-string-prompt "String to add: " 'tpu-add-at-eol-hist))) 1651 (list (tpu-string-prompt "String to add: " 'tpu-add-at-eol-hist)))
1652 (if (string= "" text) (error "No string specified.")) 1652 (if (string= "" text) (error "No string specified"))
1653 (cond ((tpu-mark) 1653 (cond ((tpu-mark)
1654 (save-excursion 1654 (save-excursion
1655 (if (> (point) (tpu-mark)) (exchange-point-and-mark)) 1655 (if (> (point) (tpu-mark)) (exchange-point-and-mark))
diff --git a/lisp/emulation/tpu-extras.el b/lisp/emulation/tpu-extras.el
index 479af176526..465b923f891 100644
--- a/lisp/emulation/tpu-extras.el
+++ b/lisp/emulation/tpu-extras.el
@@ -1,4 +1,4 @@
1;;; tpu-extras.el --- Scroll margins and free cursor mode for TPU-edt 1;;; tpu-extras.el --- scroll margins and free cursor mode for TPU-edt
2 2
3;; Copyright (C) 1993, 1994, 1995, 2000 Free Software Foundation, Inc. 3;; Copyright (C) 1993, 1994, 1995, 2000 Free Software Foundation, Inc.
4 4
diff --git a/lisp/emulation/tpu-mapper.el b/lisp/emulation/tpu-mapper.el
index ba6d032fd6a..39aae2cf2a7 100644
--- a/lisp/emulation/tpu-mapper.el
+++ b/lisp/emulation/tpu-mapper.el
@@ -1,4 +1,4 @@
1;;; tpu-mapper.el --- Create a TPU-edt X-windows keymap file 1;;; tpu-mapper.el --- create a TPU-edt X-windows keymap file
2 2
3;; Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc. 3;; Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc.
4 4
diff --git a/lisp/emulation/vip.el b/lisp/emulation/vip.el
index 588a6c6e319..6db67394ead 100644
--- a/lisp/emulation/vip.el
+++ b/lisp/emulation/vip.el
@@ -817,7 +817,7 @@ is the name of the register for COM."
817 (com (car (cdr (cdr vip-d-com)))) 817 (com (car (cdr (cdr vip-d-com))))
818 (reg (nth 3 vip-d-com))) 818 (reg (nth 3 vip-d-com)))
819 (if (null val) (setq val (car (cdr vip-d-com)))) 819 (if (null val) (setq val (car (cdr vip-d-com))))
820 (if (null m-com) (error "No previous command to repeat.")) 820 (if (null m-com) (error "No previous command to repeat"))
821 (setq vip-use-register reg) 821 (setq vip-use-register reg)
822 (funcall m-com (cons val com))))) 822 (funcall m-com (cons val com)))))
823 823
@@ -1499,7 +1499,7 @@ used. This behaviour is controlled by the sign of prefix numeric value."
1499 (let ((com (vip-getcom arg))) 1499 (let ((com (vip-getcom arg)))
1500 (if (numberp arg) 1500 (if (numberp arg)
1501 (if (or (> arg 99) (< arg 1)) 1501 (if (or (> arg 99) (< arg 1))
1502 (error "Prefix must be between 1 and 99.") 1502 (error "Prefix must be between 1 and 99")
1503 (goto-char 1503 (goto-char
1504 (if (> (point-max) 80000) 1504 (if (> (point-max) 80000)
1505 (* (/ (point-max) 100) arg) 1505 (* (/ (point-max) 100) arg)
@@ -1693,7 +1693,7 @@ STRING. Search will be forward if FORWARD, otherwise backward."
1693 "Repeat previous search." 1693 "Repeat previous search."
1694 (interactive "P") 1694 (interactive "P")
1695 (let ((val (vip-p-val arg)) (com (vip-getcom arg))) 1695 (let ((val (vip-p-val arg)) (com (vip-getcom arg)))
1696 (if (null vip-s-string) (error "No previous search string.")) 1696 (if (null vip-s-string) (error "No previous search string"))
1697 (vip-search vip-s-string vip-s-forward arg) 1697 (vip-search vip-s-string vip-s-forward arg)
1698 (if com (vip-execute-com 'vip-search-next val com)))) 1698 (if com (vip-execute-com 'vip-search-next val com))))
1699 1699
@@ -1701,7 +1701,7 @@ STRING. Search will be forward if FORWARD, otherwise backward."
1701 "Repeat previous search in the reverse direction." 1701 "Repeat previous search in the reverse direction."
1702 (interactive "P") 1702 (interactive "P")
1703 (let ((val (vip-p-val arg)) (com (vip-getcom arg))) 1703 (let ((val (vip-p-val arg)) (com (vip-getcom arg)))
1704 (if (null vip-s-string) (error "No previous search string.")) 1704 (if (null vip-s-string) (error "No previous search string"))
1705 (vip-search vip-s-string (not vip-s-forward) arg) 1705 (vip-search vip-s-string (not vip-s-forward) arg)
1706 (if com (vip-execute-com 'vip-search-Next val com)))) 1706 (if com (vip-execute-com 'vip-search-Next val com))))
1707 1707
@@ -1742,11 +1742,11 @@ STRING. Search will be forward if FORWARD, otherwise backward."
1742 (if (null buffer-name) 1742 (if (null buffer-name)
1743 (current-buffer) 1743 (current-buffer)
1744 (get-buffer buffer-name))) 1744 (get-buffer buffer-name)))
1745 (if (null buffer) (error "Buffer %s nonexistent." buffer-name)) 1745 (if (null buffer) (error "Buffer %s nonexistent" buffer-name))
1746 (if (or (not (buffer-modified-p buffer)) 1746 (if (or (not (buffer-modified-p buffer))
1747 (y-or-n-p "Buffer is modified, are you sure? ")) 1747 (y-or-n-p "Buffer is modified, are you sure? "))
1748 (kill-buffer buffer) 1748 (kill-buffer buffer)
1749 (error "Buffer not killed.")))) 1749 (error "Buffer not killed"))))
1750 1750
1751(defun vip-find-file () 1751(defun vip-find-file ()
1752 "Visit file in the current window." 1752 "Visit file in the current window."