mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Merge from origin/emacs-30

Browse source 
6299eb0fe5 bug#78901: [PATCH] js-ts-mode: Fix auto-mode-alist regexp
982938363a Merge branch 'emacs-30' of git.sv.gnu.org:/srv/git/emacs ...
e68ad70af6 Fix 'insert-directory' in Turkish language-environment
f805f51373 Fix job control in remote shell
039ad15373 ; * doc/emacs/package.texi (Package Statuses): Clarify "n...
This commit is contained in:
Eli Zaretskii 2025-06-28 06:57:19 -04:00
commit 131cde2f86
4 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

21
lisp/files.el
View file

@ -8288,10 +8288,14 @@ Valid wildcards are `*', `?', `[abc]' and `[a-z]'."
;; "//DIRED-OPTIONS//" line, but no "//DIRED//" line.
;; We take care of that case later.
(forward-line -2)
(when (looking-at "//SUBDIRED//")
;; We reset case-fold-search here and elsewhere, because
;; case-insensitive search for strings with uppercase 'I' will fail
;; in language environments (such as Turkish) where 'I' downcases to
;; 'ı', not to 'i'.
(when (let ((case-fold-search nil)) (looking-at "//SUBDIRED//"))
(delete-region (point) (progn (forward-line 1) (point)))
(forward-line -1))
(if (looking-at "//DIRED//")
(if (let ((case-fold-search nil)) (looking-at "//DIRED//"))
(let ((end (line-end-position))
(linebeg (point))
error-lines)
@ -8328,7 +8332,7 @@ Valid wildcards are `*', `?', `[abc]' and `[a-z]'."
;; "//DIRED-OPTIONS//"-line, but no "//DIRED//"-line
;; and we went one line too far back (see above).
(forward-line 1))
(if (looking-at "//DIRED-OPTIONS//")
(if (let ((case-fold-search nil)) (looking-at "//DIRED-OPTIONS//"))
(delete-region (point) (progn (forward-line 1) (point))))))
;; insert-directory
@ -8470,11 +8474,12 @@ normally equivalent short `-D' option is just passed on to
(string-match "--dired\\>" switches)
(member "--dired" switches))
(save-excursion
(forward-line -2)
(when (looking-at "//SUBDIRED//")
(forward-line -1))
(if (looking-at "//DIRED//")
(setq result 0))))
(let ((case-fold-search nil))
(forward-line -2)
(when (looking-at "//SUBDIRED//")
(forward-line -1))
(if (looking-at "//DIRED//")
(setq result 0)))))
(when (and (not (eq 0 result))
(eq insert-directory-ls-version 'unknown))