aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/emulation
diff options
context:
space:
mode:
authorPavel Janík2001-07-15 19:53:53 +0000
committerPavel Janík2001-07-15 19:53:53 +0000
commit60370d40737ecf92cec4ab75aa73d3ea9ed2d858 (patch)
tree29c0aec9d5f8e7af681d5ff1b49e72245067cf5c /lisp/emulation
parent715a2ca2fc1be26e8420f209c3440b90d687fec6 (diff)
downloademacs-60370d40737ecf92cec4ab75aa73d3ea9ed2d858.tar.gz
emacs-60370d40737ecf92cec4ab75aa73d3ea9ed2d858.zip
Some fixes to follow coding conventions.
Diffstat (limited to 'lisp/emulation')
-rw-r--r--lisp/emulation/pc-mode.el6
-rw-r--r--lisp/emulation/viper-cmd.el8
-rw-r--r--lisp/emulation/viper-ex.el8
-rw-r--r--lisp/emulation/viper-init.el6
-rw-r--r--lisp/emulation/viper-keym.el6
-rw-r--r--lisp/emulation/viper-macs.el6
-rw-r--r--lisp/emulation/viper-mous.el8
-rw-r--r--lisp/emulation/viper-util.el7
-rw-r--r--lisp/emulation/viper.el10
9 files changed, 40 insertions, 25 deletions
diff --git a/lisp/emulation/pc-mode.el b/lisp/emulation/pc-mode.el
index e10d97be3d7..3dc471359c8 100644
--- a/lisp/emulation/pc-mode.el
+++ b/lisp/emulation/pc-mode.el
@@ -1,4 +1,4 @@
1;;; pc-mode.el --- emulate certain key bindings used on PCs. 1;;; pc-mode.el --- emulate certain key bindings used on PCs
2 2
3;; Copyright (C) 1995 Free Software Foundation, Inc. 3;; Copyright (C) 1995 Free Software Foundation, Inc.
4 4
@@ -21,6 +21,8 @@
21;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, 21;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
22;; Boston, MA 02111-1307, USA. 22;; Boston, MA 02111-1307, USA.
23 23
24;;; Commentary:
25
24;;; Code: 26;;; Code:
25 27
26;;;###autoload 28;;;###autoload
@@ -51,4 +53,4 @@ C-Escape does list-buffers."
51 53
52(provide 'pc-mode) 54(provide 'pc-mode)
53 55
54;; pc-mode.el ends here 56;;; pc-mode.el ends here
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index ce3b24c19cb..9033ac7ce02 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -18,7 +18,9 @@
18;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, 18;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
19;; Boston, MA 02111-1307, USA. 19;; Boston, MA 02111-1307, USA.
20 20
21;; Code 21;;; Commentary:
22
23;;; Code:
22 24
23(provide 'viper-cmd) 25(provide 'viper-cmd)
24(require 'advice) 26(require 'advice)
@@ -1489,7 +1491,7 @@ If the prefix argument, ARG, is non-nil, it is used instead of `val'."
1489 (com (nth 2 viper-d-com)) 1491 (com (nth 2 viper-d-com))
1490 (reg (nth 3 viper-d-com))) 1492 (reg (nth 3 viper-d-com)))
1491 (if (null val) (setq val (nth 1 viper-d-com))) 1493 (if (null val) (setq val (nth 1 viper-d-com)))
1492 (if (null m-com) (error "No previous command to repeat.")) 1494 (if (null m-com) (error "No previous command to repeat"))
1493 (setq viper-use-register reg) 1495 (setq viper-use-register reg)
1494 (if (nth 4 viper-d-com) ; text inserted by command 1496 (if (nth 4 viper-d-com) ; text inserted by command
1495 (setq viper-last-insertion (nth 4 viper-d-com) 1497 (setq viper-last-insertion (nth 4 viper-d-com)
@@ -4902,4 +4904,4 @@ Mail anyway (y or n)? ")
4902 4904
4903 4905
4904 4906
4905;;; viper-cmd.el ends here 4907;;; viper-cmd.el ends here
diff --git a/lisp/emulation/viper-ex.el b/lisp/emulation/viper-ex.el
index 047ac5f9c18..3b01dd05241 100644
--- a/lisp/emulation/viper-ex.el
+++ b/lisp/emulation/viper-ex.el
@@ -19,7 +19,9 @@
19;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, 19;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
20;; Boston, MA 02111-1307, USA. 20;; Boston, MA 02111-1307, USA.
21 21
22;; Code 22;;; Commentary:
23
24;;; Code:
23 25
24(provide 'viper-ex) 26(provide 'viper-ex)
25 27
@@ -1436,7 +1438,7 @@ reversed."
1436 (if name 1438 (if name
1437 (if (eq 1 (length name)) 1439 (if (eq 1 (length name))
1438 (setq char (string-to-char name)) 1440 (setq char (string-to-char name))
1439 (error "`%s': Spurious text \"%s\" after mark name." 1441 (error "`%s': Spurious text \"%s\" after mark name"
1440 name (substring name 1) viper-SpuriousText)) 1442 name (substring name 1) viper-SpuriousText))
1441 (save-window-excursion 1443 (save-window-excursion
1442 (setq viper-ex-work-buf (get-buffer-create viper-ex-work-buf-name)) 1444 (setq viper-ex-work-buf (get-buffer-create viper-ex-work-buf-name))
@@ -2221,4 +2223,4 @@ Please contact your system administrator. "
2221 2223
2222 2224
2223 2225
2224;;; viper-ex.el ends here 2226;;; viper-ex.el ends here
diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el
index 3527e38414a..0ed9a632473 100644
--- a/lisp/emulation/viper-init.el
+++ b/lisp/emulation/viper-init.el
@@ -19,7 +19,9 @@
19;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, 19;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
20;; Boston, MA 02111-1307, USA. 20;; Boston, MA 02111-1307, USA.
21 21
22;; Code 22;;; Commentary:
23
24;;; Code:
23 25
24(provide 'viper-init) 26(provide 'viper-init)
25 27
@@ -986,4 +988,4 @@ Should be set in `~/.viper' file."
986;;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun) 988;;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun)
987;;; End: 989;;; End:
988 990
989;;; viper-ex.el ends here 991;;; viper-init.el ends here
diff --git a/lisp/emulation/viper-keym.el b/lisp/emulation/viper-keym.el
index c76c5511627..2df1b388755 100644
--- a/lisp/emulation/viper-keym.el
+++ b/lisp/emulation/viper-keym.el
@@ -19,7 +19,9 @@
19;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, 19;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
20;; Boston, MA 02111-1307, USA. 20;; Boston, MA 02111-1307, USA.
21 21
22;; Code 22;;; Commentary:
23
24;;; Code:
23 25
24(provide 'viper-keym) 26(provide 'viper-keym)
25 27
@@ -630,4 +632,4 @@ form ((key . function) (key . function) ... )."
630;;; End: 632;;; End:
631 633
632 634
633;;; viper-keym.el ends here 635;;; viper-keym.el ends here
diff --git a/lisp/emulation/viper-macs.el b/lisp/emulation/viper-macs.el
index 92f5f013093..4eaf843f274 100644
--- a/lisp/emulation/viper-macs.el
+++ b/lisp/emulation/viper-macs.el
@@ -19,7 +19,9 @@
19;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, 19;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
20;; Boston, MA 02111-1307, USA. 20;; Boston, MA 02111-1307, USA.
21 21
22;; Code 22;;; Commentary:
23
24;;; Code:
23 25
24(provide 'viper-macs) 26(provide 'viper-macs)
25 27
@@ -945,4 +947,4 @@ name from there."
945 (call-last-kbd-macro))) 947 (call-last-kbd-macro)))
946 948
947 949
948;;; viper-macs.el ends here 950;;; viper-macs.el ends here
diff --git a/lisp/emulation/viper-mous.el b/lisp/emulation/viper-mous.el
index aaa8adb2745..b6036656851 100644
--- a/lisp/emulation/viper-mous.el
+++ b/lisp/emulation/viper-mous.el
@@ -19,7 +19,9 @@
19;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, 19;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
20;; Boston, MA 02111-1307, USA. 20;; Boston, MA 02111-1307, USA.
21 21
22;; Code 22;;; Commentary:
23
24;;; Code:
23 25
24(provide 'viper-mous) 26(provide 'viper-mous)
25 27
@@ -247,7 +249,7 @@ On single or double click, returns the word as determined by
247 (goto-char click-pos) 249 (goto-char click-pos)
248 (setq click-word 250 (setq click-word
249 (funcall viper-surrounding-word-function count click-count))) 251 (funcall viper-surrounding-word-function count click-count)))
250 (error "Click must be over a window.")) 252 (error "Click must be over a window"))
251 click-word)))) 253 click-word))))
252 254
253 255
@@ -664,4 +666,4 @@ This buffer may be different from the one where the click occurred."
664;;; End: 666;;; End:
665 667
666 668
667;;; viper-mous.el ends here 669;;; viper-mous.el ends here
diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el
index 6956d0098e8..a27f20b626f 100644
--- a/lisp/emulation/viper-util.el
+++ b/lisp/emulation/viper-util.el
@@ -1,4 +1,4 @@
1;;; viper-util.el --- Utilities used by viper.el 1;;; viper-util.el --- utilities used by viper.el
2 2
3;; Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. 3;; Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
4 4
@@ -19,8 +19,9 @@
19;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, 19;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
20;; Boston, MA 02111-1307, USA. 20;; Boston, MA 02111-1307, USA.
21 21
22;;; Commentary:
22 23
23;; Code 24;;; Code:
24 25
25;; Compiler pacifier 26;; Compiler pacifier
26(defvar viper-overriding-map) 27(defvar viper-overriding-map)
@@ -1382,4 +1383,4 @@ This option is appropriate if you like Emacs-style words."
1382;;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun) 1383;;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun)
1383;;; End: 1384;;; End:
1384 1385
1385;;; viper-util.el ends here 1386;;; viper-util.el ends here
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index 9e8efaf8b0d..d4db005b972 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -1,10 +1,10 @@
1;;; viper.el --- A full-featured Vi emulator for GNU Emacs and XEmacs, 1;;; viper.el --- a full-featured Vi emulator for GNU Emacs and XEmacs,
2;; a VI Plan for Emacs Rescue, 2;; a VI Plan for Emacs Rescue,
3;; and a venomous VI PERil. 3;; and a venomous VI PERil.
4;; Viper Is also a Package for Emacs Rebels. 4;; Viper Is also a Package for Emacs Rebels.
5;; 5;;
6;; Keywords: emulations 6;; Keywords: emulations
7;; Author: Michael Kifer <kifer@cs.sunysb.edu> 7;; Author: Michael Kifer <kifer@cs.sunysb.edu>
8 8
9;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01 Free Software Foundation, Inc. 9;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01 Free Software Foundation, Inc.
10 10
@@ -294,7 +294,7 @@
294;; much easier. 294;; much easier.
295;; 295;;
296 296
297;; Code 297;;; Code:
298 298
299(require 'advice) 299(require 'advice)
300(require 'cl) 300(require 'cl)
@@ -1280,4 +1280,4 @@ These two lines must come in the order given.
1280;;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun) 1280;;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun)
1281;;; End: 1281;;; End:
1282 1282
1283;;; viper.el ends here 1283;;; viper.el ends here