From 6f6d525683d5731d55fcd801a66b078bd6ba8369 Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Sat, 16 Jun 2018 18:59:43 -0400 Subject: [PATCH 1/2] Detect a non-list package archive content properly (Bug#22311) * lisp/emacs-lisp/package.el (package--download-one-archive): Use `read' instead of `read-from-string'; the latter always returns a cons, so the `listp' check on its return value doesn't make sense. It was changed from `read' to `read-from-string' in 2015-04-01 "* emacs-lisp/package.el: Implement asynchronous refreshing", but that change was not needed because `read' works fine on strings as well as buffers. --- lisp/emacs-lisp/package.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index c56502236ee..576a9bc7e73 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -1532,7 +1532,7 @@ similar to an entry in `package-alist'. Save the cached copy to (content (buffer-string)) (dir (expand-file-name (format "archives/%s" name) package-user-dir)) (local-file (expand-file-name file dir))) - (when (listp (read-from-string content)) + (when (listp (read content)) (make-directory dir t) (if (or (not package-check-signature) (member name package-unsigned-archives)) From d008ef3d0b4aaa83d9ee105450fdcf13aa63a7e3 Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Wed, 27 Jun 2018 09:07:59 +0200 Subject: [PATCH 2/2] * src/xdisp.c (Vmouse_autoselect_window): Clarify doc-string (Bug#31975) --- src/xdisp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/xdisp.c b/src/xdisp.c index 5bce05c219e..9247d5bc3e1 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -32822,8 +32822,10 @@ mouse pointer enters it. Autoselection selects the minibuffer only if it is active, and never unselects the minibuffer if it is active. -When customizing this variable make sure that the actual value of -`focus-follows-mouse' matches the behavior of your window manager. */); +If you want to use the mouse to autoselect a window on another frame, +make sure that (1) your window manager has focus follow the mouse and +(2) the value of the option `focus-follows-mouse' matches the policy +of your window manager. */); Vmouse_autoselect_window = Qnil; DEFVAR_LISP ("auto-resize-tool-bars", Vauto_resize_tool_bars,