diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-10-06 10:35:07 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-10-06 10:35:07 -0700 |
| commit | 53da55b8cc45e76b836ebaadd23f46e92d25abce (patch) | |
| tree | 107beb0cf1da6179656d035a42767345a7737639 /lisp/net | |
| parent | 11f9cb522fed9aa6552f6315340ca7352661a1e8 (diff) | |
| parent | 9226cf325421a168b42bd27abf5e171e877b48b9 (diff) | |
| download | emacs-53da55b8cc45e76b836ebaadd23f46e92d25abce.tar.gz emacs-53da55b8cc45e76b836ebaadd23f46e92d25abce.tar.bz2 emacs-53da55b8cc45e76b836ebaadd23f46e92d25abce.zip | |
Merge from origin/emacs-26
9226cf3254 Fix bug in recent styled_format change
fa92f0c447 Cleanup emacs-lisp-mode's use of Flymake
0d0265bf50 Fix @include directive in Flymake doc
295457ae52 Move read-multiple-choice to its own library
560dd9b573 * src/process.c (syms_of_process): Remove duplicated call ...
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/nsm.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el index e2053a09355..87fa9778b6d 100644 --- a/lisp/net/nsm.el +++ b/lisp/net/nsm.el @@ -25,7 +25,7 @@ ;;; Code: (require 'cl-lib) -(require 'subr-x) ; read-multiple-choice +(require 'rmc) ; read-multiple-choice (defvar nsm-permanent-host-settings nil) (defvar nsm-temporary-host-settings nil) |