diff options
| author | Glenn Morris | 2018-12-30 16:57:36 -0800 |
|---|---|---|
| committer | Glenn Morris | 2018-12-30 16:57:36 -0800 |
| commit | a8e545ef6b92f6eb5916a6803a5d95256fd9eb6b (patch) | |
| tree | 38752101a9dcceb10009f017bced8e0a213e21ed /lisp | |
| parent | 83bbb48142e5f9714408dd628d244678eff2dc11 (diff) | |
| parent | 3abebeb8c3047092763f2d4a61fe7dfc659cd1bf (diff) | |
| download | emacs-a8e545ef6b92f6eb5916a6803a5d95256fd9eb6b.tar.gz emacs-a8e545ef6b92f6eb5916a6803a5d95256fd9eb6b.zip | |
Merge from origin/emacs-26
3abebeb * lisp/files.el (cd): Fix last change. (Bug#33791)
7a60a4f Fix remote directories in Eshell on MS-Windows
822a2d0 Fix :type 'group' in defcustom
a731c56 Fix NS fringe bitmap drawing bug (bug#33864)
0c52459 Fix commentary in dispnew.c
c9fdd1b Improve accept-process-process doc
9578c2a Fix a simple bug in display-buffer-use-some-frame
0f9be72 Clarify thread switching while waiting for process output
24ddea0 Improve process doc. with respect to handling of large input ...
2931016 ; Cosmetic changes in etc/NEWS
85516b8 Minor copyedits in landmark.el
# Conflicts:
# etc/NEWS
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/files.el | 12 | ||||
| -rw-r--r-- | lisp/obsolete/landmark.el | 11 | ||||
| -rw-r--r-- | lisp/wid-edit.el | 2 | ||||
| -rw-r--r-- | lisp/window.el | 4 |
4 files changed, 20 insertions, 9 deletions
diff --git a/lisp/files.el b/lisp/files.el index 448df62710c..fb09c96c47e 100644 --- a/lisp/files.el +++ b/lisp/files.el | |||
| @@ -802,9 +802,15 @@ The path separator is colon in GNU and GNU-like systems." | |||
| 802 | (setq cd-path (or (parse-colon-path (getenv "CDPATH")) | 802 | (setq cd-path (or (parse-colon-path (getenv "CDPATH")) |
| 803 | (list "./")))) | 803 | (list "./")))) |
| 804 | (cd-absolute | 804 | (cd-absolute |
| 805 | (or (locate-file dir cd-path nil | 805 | (or |
| 806 | (lambda (f) (and (file-directory-p f) 'dir-ok))) | 806 | ;; locate-file doesn't support remote file names, so detect them |
| 807 | (error "No such directory found via CDPATH environment variable")))) | 807 | ;; and support them here by hand. |
| 808 | (and (file-remote-p (expand-file-name dir)) | ||
| 809 | (file-accessible-directory-p (expand-file-name dir)) | ||
| 810 | (expand-file-name dir)) | ||
| 811 | (locate-file dir cd-path nil | ||
| 812 | (lambda (f) (and (file-directory-p f) 'dir-ok))) | ||
| 813 | (error "No such directory found via CDPATH environment variable")))) | ||
| 808 | 814 | ||
| 809 | (defun directory-files-recursively (dir regexp &optional include-directories) | 815 | (defun directory-files-recursively (dir regexp &optional include-directories) |
| 810 | "Return list of all files under DIR that have file names matching REGEXP. | 816 | "Return list of all files under DIR that have file names matching REGEXP. |
diff --git a/lisp/obsolete/landmark.el b/lisp/obsolete/landmark.el index effea95cd8f..c4c4c7a20f6 100644 --- a/lisp/obsolete/landmark.el +++ b/lisp/obsolete/landmark.el | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1996-1997, 2000-2018 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1996-1997, 2000-2018 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Terrence Brannon (was: <brannon@rana.usc.edu>) | 5 | ;; Author: Terrence Brannon <metaperl@gmail.com> |
| 6 | ;; Created: December 16, 1996 - first release to usenet | 6 | ;; Created: December 16, 1996 - first release to usenet |
| 7 | ;; Keywords: games, neural network, adaptive search, chemotaxis | 7 | ;; Keywords: games, neural network, adaptive search, chemotaxis |
| 8 | ;; Version: 1.0 | 8 | ;; Version: 1.0 |
| @@ -36,7 +36,7 @@ | |||
| 36 | ;; the smell of the tree increases, then the weights in the robot's | 36 | ;; the smell of the tree increases, then the weights in the robot's |
| 37 | ;; brain are adjusted to encourage this odor-driven behavior in the | 37 | ;; brain are adjusted to encourage this odor-driven behavior in the |
| 38 | ;; future. If the smell of the tree decreases, the robots weights are | 38 | ;; future. If the smell of the tree decreases, the robots weights are |
| 39 | ;; adjusted to discourage a correct move. | 39 | ;; adjusted to discourage that odor-driven behavior. |
| 40 | 40 | ||
| 41 | ;; In laymen's terms, the search space is initially flat. The point | 41 | ;; In laymen's terms, the search space is initially flat. The point |
| 42 | ;; of training is to "turn up the edges of the search space" so that | 42 | ;; of training is to "turn up the edges of the search space" so that |
| @@ -53,6 +53,13 @@ | |||
| 53 | ;; a single move, one moves east,west and south, then both east and | 53 | ;; a single move, one moves east,west and south, then both east and |
| 54 | ;; west will be improved when they shouldn't | 54 | ;; west will be improved when they shouldn't |
| 55 | 55 | ||
| 56 | ;; The source code was developed as part of a course on Brain Theory | ||
| 57 | ;; and Neural Networks at the University of Southern California. The | ||
| 58 | ;; original problem description and solution appeared in 1981 in the | ||
| 59 | ;; paper "Landmark Learning: An Illustration of Associative | ||
| 60 | ;; Search" authored by Andrew G. Barto and Richard S. Sutton and | ||
| 61 | ;; published to Biological Cybernetics. | ||
| 62 | |||
| 56 | ;; Many thanks to Yuri Pryadkin <yuri@rana.usc.edu> for this | 63 | ;; Many thanks to Yuri Pryadkin <yuri@rana.usc.edu> for this |
| 57 | ;; concise problem description. | 64 | ;; concise problem description. |
| 58 | 65 | ||
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el index bee7f8069ee..29a7a44f2aa 100644 --- a/lisp/wid-edit.el +++ b/lisp/wid-edit.el | |||
| @@ -2746,7 +2746,7 @@ Return an alist of (TYPE MATCH)." | |||
| 2746 | "A widget which groups other widgets inside." | 2746 | "A widget which groups other widgets inside." |
| 2747 | :convert-widget 'widget-types-convert-widget | 2747 | :convert-widget 'widget-types-convert-widget |
| 2748 | :copy 'widget-types-copy | 2748 | :copy 'widget-types-copy |
| 2749 | :format "%v" | 2749 | :format ":\n%v" |
| 2750 | :value-create 'widget-group-value-create | 2750 | :value-create 'widget-group-value-create |
| 2751 | :value-get 'widget-editable-list-value-get | 2751 | :value-get 'widget-editable-list-value-get |
| 2752 | :default-get 'widget-group-default-get | 2752 | :default-get 'widget-group-default-get |
diff --git a/lisp/window.el b/lisp/window.el index 4e72d343674..f1e56643671 100644 --- a/lisp/window.el +++ b/lisp/window.el | |||
| @@ -7182,9 +7182,7 @@ that allows the selected frame)." | |||
| 7182 | (or (cdr (assq 'frame-predicate alist)) | 7182 | (or (cdr (assq 'frame-predicate alist)) |
| 7183 | (lambda (frame) | 7183 | (lambda (frame) |
| 7184 | (and (not (eq frame (selected-frame))) | 7184 | (and (not (eq frame (selected-frame))) |
| 7185 | (not (window-dedicated-p | 7185 | (get-lru-window frame))))) |
| 7186 | (or (get-lru-window frame) | ||
| 7187 | (frame-first-window frame)))))))) | ||
| 7188 | (frame (car (filtered-frame-list predicate))) | 7186 | (frame (car (filtered-frame-list predicate))) |
| 7189 | (window | 7187 | (window |
| 7190 | (and frame | 7188 | (and frame |