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--rel--22
[bpt/emacs.git]
/
lisp
/
emulation
/
viper-keym.el
diff --git
a/lisp/emulation/viper-keym.el
b/lisp/emulation/viper-keym.el
index
1d15827
..
dc24b83
100644
(file)
--- a/
lisp/emulation/viper-keym.el
+++ b/
lisp/emulation/viper-keym.el
@@
-1,16
+1,16
@@
;;; viper-keym.el --- Viper keymaps
;; Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004,
;;; viper-keym.el --- Viper keymaps
;; Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007 Free Software Foundation, Inc.
+;; 2005, 2006, 2007
, 2008
Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
;; This file is part of GNU Emacs.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
;; 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
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation
; either version 2, 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
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-18,16
+18,12
@@
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; 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:
;;; Code:
;;; Commentary:
;;; Code:
-(provide 'viper-keym)
-
;; compiler pacifier
(defvar viper-always)
(defvar viper-current-state)
;; compiler pacifier
(defvar viper-always)
(defvar viper-current-state)
@@
-36,18
+32,15
@@
(defvar viper-ex-style-editing)
(defvar viper-ex-style-motion)
(defvar viper-ex-style-editing)
(defvar viper-ex-style-motion)
-;; loading happens only in non-interactive compilation
-;; in order to spare non-viperized emacs from being viperized
-(if noninteractive
- (eval-when-compile
- (let ((load-path (cons (expand-file-name ".") load-path)))
- (or (featurep 'viper-util)
- (load "viper-util.el" nil nil 'nosuffix))
- )))
+(eval-and-compile
+ (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
;; end pacifier
(require 'viper-util)
;; end pacifier
(require 'viper-util)
+(declare-function viper-ex "viper-ex" (arg &optional string))
+(declare-function viper-normalize-minor-mode-map-alist "viper-cmd" ())
+(declare-function viper-set-mode-vars-for "viper-cmd" (state))
;;; Variables
;;; Variables
@@
-170,7
+163,7
@@
Enter as a sexp. Examples: \"\\C-z\", [(control ?z)]."
(let ((old-value (if (boundp 'viper-toggle-key)
viper-toggle-key
[(control ?z)])))
(let ((old-value (if (boundp 'viper-toggle-key)
viper-toggle-key
[(control ?z)])))
- (mapc
ar
+ (mapc
(lambda (buf)
(save-excursion
(set-buffer buf)
(lambda (buf)
(save-excursion
(set-buffer buf)
@@
-210,7
+203,7
@@
If running in a terminal, [(escape)] is not understood, so must use \"\\e\"."
(let ((old-value (if (boundp 'viper-ESC-key)
viper-ESC-key
[(escape)])))
(let ((old-value (if (boundp 'viper-ESC-key)
viper-ESC-key
[(escape)])))
- (mapc
ar
+ (mapc
(lambda (buf)
(save-excursion
(set-buffer buf)
(lambda (buf)
(save-excursion
(set-buffer buf)
@@
-686,14
+679,12
@@
Arguments: (major-mode viper-state keymap)"
(defun viper-add-keymap (mapsrc mapdst)
"Add contents of mapsrc to mapdst. It is assumed that mapsrc is sparse."
(defun viper-add-keymap (mapsrc mapdst)
"Add contents of mapsrc to mapdst. It is assumed that mapsrc is sparse."
- (viper-cond-compile-for-xemacs-or-emacs
- ;; xemacs
- (map-keymap (lambda (key binding) (define-key mapdst key binding))
- mapsrc)
- ;; emacs
- (mapcar (lambda (p) (define-key mapdst (vector (car p)) (cdr p)))
- (cdr mapsrc))
- ))
+ (if (featurep 'xemacs)
+ ;; Emacs 22 has map-keymap.
+ (map-keymap (lambda (key binding) (define-key mapdst key binding))
+ mapsrc)
+ (mapc (lambda (p) (define-key mapdst (vector (car p)) (cdr p)))
+ (cdr mapsrc))))
(defun viper-modify-keymap (map alist)
"Modifies MAP with bindings specified in the ALIST. The alist has the
(defun viper-modify-keymap (map alist)
"Modifies MAP with bindings specified in the ALIST. The alist has the
@@
-702,10
+693,13
@@
form ((key . function) (key . function) ... )."
alist))
alist))
+(provide 'viper-keym)
+
+
;;; Local Variables:
;;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun)
;;; End:
;;; Local Variables:
;;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun)
;;; End:
-;;
;
arch-tag: 43af4b2f-0bea-400b-889e-221ebc00acb1
+;; arch-tag: 43af4b2f-0bea-400b-889e-221ebc00acb1
;;; viper-keym.el ends here
;;; viper-keym.el ends here