diff options
| author | Miles Bader <miles@gnu.org> | 2007-01-26 06:16:11 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-01-26 06:16:11 +0000 |
| commit | c0466914ba3ad88c402b0301646b4b5db8aeb913 (patch) | |
| tree | 964d8df324ab5f46872dfedc92ccea9fe50a1441 /lisp/emulation/viper.el | |
| parent | c97a3f22ed5841f1c8bcdbb80df2bd49635c6a56 (diff) | |
| parent | 58f8a3f97bd49484d0eb4f83a70662ded0daf9cc (diff) | |
| download | emacs-c0466914ba3ad88c402b0301646b4b5db8aeb913.tar.gz emacs-c0466914ba3ad88c402b0301646b4b5db8aeb913.tar.bz2 emacs-c0466914ba3ad88c402b0301646b4b5db8aeb913.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 586-614)
- Update from CVS
- Update from erc--emacs--22
- Merge from gnus--rel--5.10
- Merge from erc--main--0
- Make byte compiler correctly write circular constants
* gnus--rel--5.10 (patch 186-196)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-162
Diffstat (limited to 'lisp/emulation/viper.el')
| -rw-r--r-- | lisp/emulation/viper.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el index fd1a8aa92ea..e8f58db3ce9 100644 --- a/lisp/emulation/viper.el +++ b/lisp/emulation/viper.el @@ -4,7 +4,7 @@ ;; Viper Is also a Package for Emacs Rebels. ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +;; 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> ;; Keywords: emulations @@ -325,7 +325,7 @@ ;; better be defined before Viper custom group. (defvar viper-custom-file-name (convert-standard-filename "~/.viper") - "Viper customisation file. + "Viper customization file. If set by the user, this must be done _before_ Viper is loaded in `~/.emacs'.") (defgroup viper nil @@ -360,7 +360,7 @@ user decide when to invoke Viper in a major mode." (t 'ask)) "To Viperize or not to Viperize. If t, viperize Emacs. If nil -- don't. If `ask', ask the user. -This variable is used primatily when Viper is being loaded. +This variable is used primarily when Viper is being loaded. Must be set in `~/.emacs' before Viper is loaded. DO NOT set this variable interactively, unless you are using the customization |