procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-28

Browse source 
c0815aca18 Fix typos in in 'reset-language-environment'
ea65de7577 eshell-complete-parse-arguments: don't use string-match on...
This commit is contained in:
Stefan Kangas 2021-12-28 06:30:38 +01:00
commit 036e88ce2f
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/eshell/em-cmpl.el
View file

@ -380,7 +380,7 @@ to writing a completion function."
(setq val (number-to-string val)))
;; expand .../ etc that only eshell understands to
;; standard ../../
((string-match "\\.\\.\\.+/" val)
((and (stringp val)) (string-match "\\.\\.\\.+/" val)
(setq val (eshell-expand-multiple-dots val))))
(or val "")))
args)

6
lisp/international/mule-cmds.el
View file

@ -1874,7 +1874,7 @@ The default status is as follows:
(set-default-coding-systems nil)
(setq default-sendmail-coding-system 'utf-8)
(setq default-file-name-coding-system (if (memq system-type
'(window-nt ms-dos))
'(windows-nt ms-dos))
'iso-latin-1-unix
'utf-8-unix))
;; Preserve eol-type from existing default-process-coding-systems.
@ -1893,9 +1893,9 @@ The default status is as follows:
(condition-case nil
(coding-system-change-text-conversion
(cdr default-process-coding-system)
(if (memq system-type '(window-nt ms-dos)) 'iso-latin-1 'utf-8))
(if (memq system-type '(windows-nt ms-dos)) 'iso-latin-1 'utf-8))
(coding-system-error
(if (memq system-type '(window-nt ms-dos)) 'iso-latin-1 'utf-8)))))
(if (memq system-type '(windows-nt ms-dos)) 'iso-latin-1 'utf-8)))))
(setq default-process-coding-system
(cons output-coding input-coding)))