diff options
| author | Glenn Morris <rgm@gnu.org> | 2021-10-21 08:02:57 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2021-10-21 08:02:57 -0700 |
| commit | bd7b5f72a96a3e80a7c06625e058ead88ee832cf (patch) | |
| tree | 73c7b4937da21c843721bfb9e6b85c0d43b2db9e /lisp/emulation | |
| parent | a4c232effce74028e9a904e15c9616fba33a4143 (diff) | |
| parent | 0545c70c168d2cc3f4fa794312b23f2616f67327 (diff) | |
| download | emacs-bd7b5f72a96a3e80a7c06625e058ead88ee832cf.tar.gz | |
Merge from origin/emacs-28
0545c70c16 (origin/emacs-28) ; * src/keyboard.c (readable_events): Ad...
805ed8d318 Fix todo-mode AOT test failures (bug#51308)
8f42ff31f6 Fix hi-lock AOT test failures (bug#51308)
8002fcd4b9 Fix socks test
4540130312 ; Fix typo
59df93e2dd * lisp/help.el (help--analyze-key): Add new arg BUFFER (bu...
cb8b12b56d Improve docstrings and NEWS item of 'repeat-mode'
06fe499614 * lisp/tab-bar.el (tab-bar-menu-bar): New command (bug#512...
8358da9c4c Display a tab bar item as sunken when appropriate
29fdc65860 Fix tab bar item highlight when a mouse click is dropped
7236592668 Refer to mouse-highlight from make-pointer-invisible docst...
cf4394a397 * etc/PROBLEMS: Add hex codepoint for NO-BREAK SPACE
2d647e88fa Describe how to debug fontconfig issues
c916040921 Adapt Tramp tests
1bb14f93f1 Convert ANSI color definitions in themes to use faces (e.g...
8e7cd29712 Revert "Revert back to using ESC as viper-ESC-key again"
91d71b38a3 Fix inset rectangle corners when sides aren't drawn (bug#5...
5c1a575ef4 Don't use color escape sequences in vc-git-expanded-log-entry
d7f595cc89 Code cleanup in tramp-tests.el
548a5db611 ; etc/NEWS fix wording
# Conflicts:
# etc/NEWS
Diffstat (limited to 'lisp/emulation')
| -rw-r--r-- | lisp/emulation/viper-keym.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emulation/viper-keym.el b/lisp/emulation/viper-keym.el index 2bb24f662fc..2f7d17351dc 100644 --- a/lisp/emulation/viper-keym.el +++ b/lisp/emulation/viper-keym.el @@ -182,7 +182,7 @@ In insert mode, this key also functions as Meta." :type 'string :group 'viper) -(defconst viper-ESC-key (kbd "ESC") +(defconst viper-ESC-key [escape] "Key used to ESC.") |