[Emacs-diffs] master b2127c6 2/2: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

[Michael Albinus]

branch: master
commit b2127c631ed5b3156f73e74dc71e29b85b34b133
Merge: ccd4e47 7a20e0e
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>

    Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
---
 lisp/ldefs-boot.el | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index c9669db..ec238a4 100644
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -8771,7 +8771,7 @@ With prefix arg NOCONFIRM, execute current line as-is 
without editing.
 ;;; Generated autoloads from ecomplete.el
 
 (autoload 'ecomplete-setup "ecomplete" "\
-
+Read the .ecompleterc file.
 
 \(fn)" nil nil)
 
@@ -13457,7 +13457,7 @@ and choose the directory as the fortune-file.
 Minimum set of parameters to filter for live (on-session) framesets.
 DO NOT MODIFY.  See `frameset-filter-alist' for a full description.")
 
-(defvar frameset-persistent-filter-alist (nconc '((background-color . 
frameset-filter-sanitize-color) (buffer-list . :never) (buffer-predicate . 
:never) (buried-buffer-list . :never) (client . :never) (delete-before . 
:never) (font . frameset-filter-font-param) (foreground-color . 
frameset-filter-sanitize-color) (fullscreen . frameset-filter-shelve-param) 
(GUI:font . frameset-filter-unshelve-param) (GUI:fullscreen . 
frameset-filter-unshelve-param) (GUI:height . frameset-filter-unshelve-p [...]
+(defvar frameset-persistent-filter-alist (nconc '((background-color . 
frameset-filter-sanitize-color) (buffer-list . :never) (buffer-predicate . 
:never) (buried-buffer-list . :never) (client . :never) (delete-before . 
:never) (font . frameset-filter-font-param) (foreground-color . 
frameset-filter-sanitize-color) (frameset--text-pixel-height . :save) 
(frameset--text-pixel-width . :save) (fullscreen . 
frameset-filter-shelve-param) (GUI:font . frameset-filter-unshelve-param) 
(GUI:fullscreen [...]
 Parameters to filter for persistent framesets.
 DO NOT MODIFY.  See `frameset-filter-alist' for a full description.")
 
@@ -18074,7 +18074,7 @@ the environment variable INFOPATH is set.
 
 Although this is a customizable variable, that is mainly for technical
 reasons.  Normally, you should either set INFOPATH or customize
-`Info-additional-directory-list', rather than changing this variable." 
:initialize (quote custom-initialize-delay) :type (quote (repeat directory)) 
:group (quote info))
+`Info-additional-directory-list', rather than changing this variable." 
:initialize 'custom-initialize-delay :type '(repeat directory) :group 'info)
 
 (autoload 'info-other-window "info" "\
 Like `info' but show the Info buffer in another window.
@@ -24234,7 +24234,7 @@ Inserted by installing Org mode or when a release is 
made.
 \(fn)" nil nil)
 
 (autoload 'org-git-version "org-version" "\
-The Git version of org-mode.
+The Git version of Org mode.
 Inserted by installing Org or when a release is made.
 
 \(fn)" nil nil)
@@ -25065,7 +25065,7 @@ Anything else means to do it only if the prefix arg is 
equal to this value.")
 
 (defun cvs-dired-noselect (dir) "\
 Run `cvs-examine' if DIR is a CVS administrative directory.
-The exact behavior is determined also by `cvs-dired-use-hook'." (when (stringp 
dir) (setq dir (directory-file-name dir)) (when (and (string= "CVS" 
(file-name-nondirectory dir)) (file-readable-p (expand-file-name "Entries" 
dir)) cvs-dired-use-hook (if (eq cvs-dired-use-hook (quote always)) (not 
current-prefix-arg) (equal current-prefix-arg cvs-dired-use-hook))) 
(save-excursion (funcall cvs-dired-action (file-name-directory dir) t t)))))
+The exact behavior is determined also by `cvs-dired-use-hook'." (when (stringp 
dir) (setq dir (directory-file-name dir)) (when (and (string= "CVS" 
(file-name-nondirectory dir)) (file-readable-p (expand-file-name "Entries" 
dir)) cvs-dired-use-hook (if (eq cvs-dired-use-hook 'always) (not 
current-prefix-arg) (equal current-prefix-arg cvs-dired-use-hook))) 
(save-excursion (funcall cvs-dired-action (file-name-directory dir) t t)))))
 
 (if (fboundp 'register-definition-prefixes) (register-definition-prefixes 
"pcvs" '("cvs-" "defun-cvs-mode")))
 
@@ -28432,7 +28432,11 @@ CHAR
      matches 0 through 9, a through f and A through F.
 
 `blank'
-     matches space and tab only.
+     matches horizontal whitespace, as defined by Annex C of the
+     Unicode Technical Standard #18.  In particular, it matches
+     spaces, tabs, and other characters whose Unicode
+     `general-category' property indicates they are spacing
+     separators.
 
 `graphic', `graph'
      matches graphic characters--everything except whitespace, ASCII
@@ -32826,6 +32830,8 @@ commands to use in that buffer.
 
 (autoload 'ansi-term "term" "\
 Start a terminal-emulator in a new buffer.
+This is almost the same as `term' apart from always creating a new buffer,
+and `C-x' being marked as a `term-escape-char'. 
 
 \(fn PROGRAM &optional NEW-BUFFER-NAME)" t nil)
 
@@ -34275,14 +34281,14 @@ match file names at root of the underlying local file 
system,
 like \"/sys\" or \"/C:\".")
 
 (defun tramp-autoload-file-name-handler (operation &rest args) "\
-Load Tramp file name handler, and perform OPERATION." (if tramp-mode (let 
((default-directory temporary-file-directory)) (load "tramp" (quote noerror) 
(quote nomessage))) (tramp-unload-file-name-handlers)) (apply operation args))
+Load Tramp file name handler, and perform OPERATION." (if tramp-mode (let 
((default-directory temporary-file-directory)) (load "tramp" 'noerror 
'nomessage)) (tramp-unload-file-name-handlers)) (apply operation args))
 
 (defun tramp-register-autoload-file-name-handlers nil "\
-Add Tramp file name handlers to `file-name-handler-alist' during autoload." 
(add-to-list (quote file-name-handler-alist) (cons 
tramp-autoload-file-name-regexp (quote tramp-autoload-file-name-handler))) (put 
(quote tramp-autoload-file-name-handler) (quote safe-magic) t))
+Add Tramp file name handlers to `file-name-handler-alist' during autoload." 
(add-to-list 'file-name-handler-alist (cons tramp-autoload-file-name-regexp 
'tramp-autoload-file-name-handler)) (put 'tramp-autoload-file-name-handler 
'safe-magic t))
  (tramp-register-autoload-file-name-handlers)
 
 (defun tramp-unload-file-name-handlers nil "\
-Unload Tramp file name handlers from `file-name-handler-alist'." (dolist (fnh 
(quote (tramp-file-name-handler tramp-completion-file-name-handler 
tramp-archive-file-name-handler tramp-autoload-file-name-handler))) (let ((a1 
(rassq fnh file-name-handler-alist))) (setq file-name-handler-alist (delq a1 
file-name-handler-alist)))))
+Unload Tramp file name handlers from `file-name-handler-alist'." (dolist (fnh 
'(tramp-file-name-handler tramp-completion-file-name-handler 
tramp-archive-file-name-handler tramp-autoload-file-name-handler)) (let ((a1 
(rassq fnh file-name-handler-alist))) (setq file-name-handler-alist (delq a1 
file-name-handler-alist)))))
 
 (defvar tramp-completion-mode nil "\
 If non-nil, external packages signal that they are in file name completion.")
@@ -34348,7 +34354,7 @@ Reenable Ange-FTP, when Tramp is unloaded.
 ;;;### (autoloads nil "tramp-gvfs" "net/tramp-gvfs.el" (0 0 0 0))
 ;;; Generated autoloads from net/tramp-gvfs.el
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes 
"tramp-gvfs" '("tramp-" "with-tramp-dbus-call-method")))
+(if (fboundp 'register-definition-prefixes) (register-definition-prefixes 
"tramp-gvfs" '("tramp-" "with-tramp-dbus-")))
 
 ;;;***
 
@@ -36177,7 +36183,7 @@ For a description of possible values, see 
`vc-check-master-templates'.")
 (defun vc-sccs-search-project-dir (_dirname basename) "\
 Return the name of a master file in the SCCS project directory.
 Does not check whether the file exists but returns nil if it does not
-find any project directory." (let ((project-dir (getenv "PROJECTDIR")) dirs 
dir) (when project-dir (if (file-name-absolute-p project-dir) (setq dirs (quote 
("SCCS" ""))) (setq dirs (quote ("src/SCCS" "src" "source/SCCS" "source"))) 
(setq project-dir (expand-file-name (concat "~" project-dir)))) (while (and 
(not dir) dirs) (setq dir (expand-file-name (car dirs) project-dir)) (unless 
(file-directory-p dir) (setq dir nil) (setq dirs (cdr dirs)))) (and dir 
(expand-file-name (concat "s." base [...]
+find any project directory." (let ((project-dir (getenv "PROJECTDIR")) dirs 
dir) (when project-dir (if (file-name-absolute-p project-dir) (setq dirs 
'("SCCS" "")) (setq dirs '("src/SCCS" "src" "source/SCCS" "source")) (setq 
project-dir (expand-file-name (concat "~" project-dir)))) (while (and (not dir) 
dirs) (setq dir (expand-file-name (car dirs) project-dir)) (unless 
(file-directory-p dir) (setq dir nil) (setq dirs (cdr dirs)))) (and dir 
(expand-file-name (concat "s." basename) dir)))))
 
 (if (fboundp 'register-definition-prefixes) (register-definition-prefixes 
"vc-sccs" '("vc-sccs-")))
 
@@ -38046,10 +38052,11 @@ If no window is at the desired location, an error is 
signaled.
 
 (autoload 'windmove-default-keybindings "windmove" "\
 Set up keybindings for `windmove'.
-Keybindings are of the form MODIFIER-{left,right,up,down}.
-Default MODIFIER is `shift'.
+Keybindings are of the form MODIFIERS-{left,right,up,down},
+where MODIFIERS is either a list of modifiers or a single modifier.
+Default value of MODIFIERS is `shift'.
 
-\(fn &optional MODIFIER)" t nil)
+\(fn &optional MODIFIERS)" t nil)
 
 (if (fboundp 'register-definition-prefixes) (register-definition-prefixes 
"windmove" '("windmove-")))