diff options
author | Glenn Morris <rgm@gnu.org> | 2018-09-10 13:12:38 -0700 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2018-09-10 13:12:38 -0700 |
commit | 0407733ef3d4e8e133e91917097dbc9bcc688b47 (patch) | |
tree | 9223757d1d54460b3ca0e7867636072a51cd55f2 /lisp/rfn-eshadow.el | |
parent | 6e050694f247671e67c1eabace36cf9792ab4451 (diff) | |
parent | 7efcdf7b3e70f0334caa328cbb5b05a4e30099bd (diff) | |
download | emacs-0407733ef3d4e8e133e91917097dbc9bcc688b47.tar.gz emacs-0407733ef3d4e8e133e91917097dbc9bcc688b47.tar.bz2 emacs-0407733ef3d4e8e133e91917097dbc9bcc688b47.zip |
Merge from origin/emacs-26
7efcdf7 (origin/emacs-26) Clarify completion text in the ELisp manual
30b0b0e Fix handling of abbreviated control command in gdb-mi.el
5cf282d Clarify documentation of functions reading character events
96281c5 Record :version for built-in variables while dumping
82160cf * src/process.c (connect_network_socket): Fix memory leak. (...
6c616e4 * Makefile.in (appdatadir): Use the non-obsolete location "me...
9618e16 Better fix for bug#32550
30d94e4 Fix Bug#32550
57bcdc7 Don't call XGetGeometry for frames without outer X window (Bu...
82fc6b6 * lisp/calculator.el: Fix doc typo.
ddc7c64 Standardize calc bug reporting instructions
Conflicts:
lisp/cus-start.el
Diffstat (limited to 'lisp/rfn-eshadow.el')
-rw-r--r-- | lisp/rfn-eshadow.el | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lisp/rfn-eshadow.el b/lisp/rfn-eshadow.el index 41fd8b5f97d..d6e9a1efae1 100644 --- a/lisp/rfn-eshadow.el +++ b/lisp/rfn-eshadow.el @@ -132,9 +132,7 @@ system, `file-name-shadow-properties' is used instead." ;; An overlay covering the shadowed part of the filename (local to the ;; minibuffer). -(defvar rfn-eshadow-overlay) -(make-variable-buffer-local 'rfn-eshadow-overlay) - +(defvar-local rfn-eshadow-overlay nil) ;;; Hook functions |