aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2018-02-27 19:59:19 +0200
committerEli Zaretskii2018-02-27 19:59:19 +0200
commitc00fea918e1ab387d88fde3ff4950b9f7fe6e04a (patch)
tree092ba52a44ea08ad8c76ed5be3cf1f2408e7eebe
parenta2ab0d0c9bc15d17a51c728a48a2e1799196b1d8 (diff)
parent6288c3d76a4138bd89d148a0d6fc9b29b65eea50 (diff)
downloademacs-c00fea918e1ab387d88fde3ff4950b9f7fe6e04a.tar.gz
emacs-c00fea918e1ab387d88fde3ff4950b9f7fe6e04a.zip
Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs into emacs-26
-rw-r--r--lisp/emulation/viper.el2
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 @@
300 300
301;;; Code: 301;;; Code:
302 302
303(require 'cl-lib)
304
303;; compiler pacifier 305;; compiler pacifier
304(defvar mark-even-if-inactive) 306(defvar mark-even-if-inactive)
305(defvar quail-mode) 307(defvar quail-mode)