diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-02-28 09:40:40 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-02-28 09:40:40 -0800 |
| commit | 3959892419eff45a7006deceddcc1962fdbcc1c9 (patch) | |
| tree | 315d0425dad9a5b89a4c881102241fbab9f45c94 /lisp/emulation | |
| parent | 51537b9e4937d7853647871dc264f0be9412a9fa (diff) | |
| parent | fd5023874872dcb559cb7acdca6b019273c9de07 (diff) | |
| download | emacs-3959892419eff45a7006deceddcc1962fdbcc1c9.tar.gz emacs-3959892419eff45a7006deceddcc1962fdbcc1c9.tar.bz2 emacs-3959892419eff45a7006deceddcc1962fdbcc1c9.zip | |
Merge from origin/emacs-26
fd50238 (origin/emacs-26) * doc/lispref/streams.texi (Output Variable...
769ea57 Use "GTK+" where applicable in the manual
5e69219 Document print-escape-control-characters
c00fea9 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac...
a2ab0d0 * doc/emacs/killing.texi (Rectangles): Don't use @key for cha...
6288c3d * lisp/emulation/viper.el: Unbreak it.
bf3535e More fixes in the Emacs manual
c87d04e Avoid aborts in 'md5'
9743f48 Mark keys consistently in manuals
ce557a9 Remove @key{} markups from @kindex entries in manuals
71243f0 * doc/emacs/display.texi (Standard Faces): Fix markup of inde...
7a069f3 Fix @kindex entries in manuals
6218933 Fix @cindex entries in manuals
57c9f12 Merge branch 'emacs-26' of git.sv.gnu.org:/srv/git/emacs into...
e415309 Fix @cindex entries in org.texi
560a23e Document reserved keys
105d085 * doc/misc/ebrowse.texi: Use @key{} for keys.
Conflicts:
doc/misc/tramp.texi
etc/NEWS
Diffstat (limited to 'lisp/emulation')
| -rw-r--r-- | lisp/emulation/viper.el | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el index 7292fd58c1f..13a88ad11fa 100644 --- a/lisp/emulation/viper.el +++ b/lisp/emulation/viper.el @@ -300,6 +300,8 @@ ;;; Code: +(require 'cl-lib) + ;; compiler pacifier (defvar mark-even-if-inactive) (defvar quail-mode) |