HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from emacs-24 branch
[bpt/emacs.git]
/
lisp
/
emulation
/
viper-ex.el
diff --git
a/lisp/emulation/viper-ex.el
b/lisp/emulation/viper-ex.el
index
be387d7
..
acaedde
100644
(file)
--- a/
lisp/emulation/viper-ex.el
+++ b/
lisp/emulation/viper-ex.el
@@
-1,7
+1,6
@@
;;; viper-ex.el --- functions implementing the Ex commands for Viper
;;; viper-ex.el --- functions implementing the Ex commands for Viper
-;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003,
-;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1994-1998, 2000-2012 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
;; Package: viper
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
;; Package: viper
@@
-260,7
+259,7
@@
(defvar ex-addresses nil)
;; This flag is supposed to be set only by `#', `print', and `list',
(defvar ex-addresses nil)
;; This flag is supposed to be set only by `#', `print', and `list',
-;; none of which is implemented. So, it and the pices of the code it
+;; none of which is implemented. So, it and the pi
e
ces of the code it
;; controls are dead weight. We keep it just in case this might be
;; needed in the future.
(defvar ex-flag nil)
;; controls are dead weight. We keep it just in case this might be
;; needed in the future.
(defvar ex-flag nil)
@@
-369,14
+368,14
@@
corresponding function symbol."
(defvar viper-keep-reading-filename nil)
(defcustom ex-cycle-other-window t
(defvar viper-keep-reading-filename nil)
(defcustom ex-cycle-other-window t
- "
*
If t, :n and :b cycles through files and buffers in other window.
+ "If t, :n and :b cycles through files and buffers in other window.
Then :N and :B cycles in the current window. If nil, this behavior is
reversed."
:type 'boolean
:group 'viper-ex)
(defcustom ex-cycle-through-non-files nil
Then :N and :B cycles in the current window. If nil, this behavior is
reversed."
:type 'boolean
:group 'viper-ex)
(defcustom ex-cycle-through-non-files nil
- "
*
Cycle through *scratch* and other buffers that don't visit any file."
+ "Cycle through *scratch* and other buffers that don't visit any file."
:type 'boolean
:group 'viper-ex)
:type 'boolean
:group 'viper-ex)
@@
-2303,5
+2302,4
@@
Type 'mak ' (including the space) to run make with no args."
-;; arch-tag: 56b80d36-f880-4d10-bd66-85ad91a295db
;;; viper-ex.el ends here
;;; viper-ex.el ends here