Commit 5e40c5a3 authored by Tassilo Horn's avatar Tassilo Horn
Browse files

Merge from origin/emacs-28

f3acc093 ; Revert "Use file-in-directory-p instead of obsolete dire...
5082d74c ; * lisp/recentf.el: Fix typo.
3f66e2a9 * lisp/repeat.el (repeat-mode): Fix message format.
137539c1 Clarify autotype.texi text slightly
parents de30e8c0 f3acc093
Pipeline #18715 passed with stage
in 3 minutes and 44 seconds
......@@ -276,7 +276,7 @@ empty file is visited. This is accomplished by putting
What gets inserted, if anything, is determined by the variable
@code{auto-insert-alist}. The @sc{car}s of this list are each either
a mode name, making an element applicable when a buffer is in that
mode. Or they can be a string, which is a regexp matched against the
mode, or they can be a string, which is a regexp matched against the
buffer's file name. In that way different kinds of files that have
the same mode in Emacs can be distinguished. The @sc{car}s may also
be cons cells consisting of mode name or regexp as above and an
......
......@@ -1936,7 +1936,7 @@ unless OK-IF-ALREADY-EXISTS is non-nil."
(while blist
(with-current-buffer (car blist)
(if (and buffer-file-name
(dired-in-this-tree-p buffer-file-name expanded-from-dir))
(dired-in-this-tree-p buffer-file-name expanded-from-dir))
(let ((modflag (buffer-modified-p))
(to-file (replace-regexp-in-string
(concat "^" (regexp-quote from-dir))
......@@ -2817,7 +2817,7 @@ This function takes some pains to conform to `ls -lR' output."
(setq switches (string-replace "R" "" switches))
(dolist (cur-ass dired-subdir-alist)
(let ((cur-dir (car cur-ass)))
(and (file-in-directory-p cur-dir dirname)
(and (dired-in-this-tree-p cur-dir dirname)
(let ((cur-cons (assoc-string cur-dir dired-switches-alist)))
(if cur-cons
(setcdr cur-cons switches)
......@@ -2829,7 +2829,7 @@ This function takes some pains to conform to `ls -lR' output."
(defun dired-insert-subdir-validate (dirname &optional switches)
;; Check that it is valid to insert DIRNAME with SWITCHES.
;; Signal an error if invalid (e.g. user typed `i' on `..').
(or (file-in-directory-p dirname (expand-file-name default-directory))
(or (dired-in-this-tree-p dirname (expand-file-name default-directory))
(error "%s: Not in this directory tree" dirname))
(let ((real-switches (or switches dired-subdir-switches)))
(when real-switches
......
......@@ -29,7 +29,7 @@
;; automatically saved across Emacs sessions.
;; You can customize the number of recent files displayed, the
;; location of the menu and others options. Type:
;; location of the menu and other options. Type:
;;
;; M-x customize-group RET recentf RET
......
......@@ -418,7 +418,7 @@ See `describe-repeat-maps' for a list of all repeatable commands."
(and (commandp s)
(get s 'repeat-map)
(push (get s 'repeat-map) keymaps))))))
(message "Repeat mode is enabled for %d commands and %d keymaps; see `describe-repeat-maps'."
(message "Repeat mode is enabled for %d commands and %d keymaps; see `describe-repeat-maps'"
(length commands)
(length (delete-dups keymaps))))))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment