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

Merge remote-tracking branch 'origin/master' into feature/android

Browse source
This commit is contained in:
Po Lu 2023-08-04 07:50:56 +08:00
commit 1dedd84e42
2 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/progmodes/ruby-mode.el
View file

@ -2697,12 +2697,12 @@ Currently there are `ruby-mode' and `ruby-ts-mode'."
;;;###autoload
(add-to-list 'auto-mode-alist
(cons (purecopy (concat "\\(?:\\.\\(?:"
"rbw?\\|ru\\|rake\\|thor"
"rbw?\\|ru\\|rake\\|thor\\|axlsx"
"\\|jbuilder\\|rabl\\|gemspec\\|podspec"
"\\)"
"\\|/"
"\\(?:Gem\\|Rake\\|Cap\\|Thor"
"\\|Puppet\\|Berks\\|Brew"
"\\|Puppet\\|Berks\\|Brew\\|Fast"
"\\|Vagrant\\|Guard\\|Pod\\)file"
"\\)\\'"))
'ruby-mode))

15
test/lisp/uniquify-tests.el
View file

@ -89,21 +89,6 @@
'("a/dir/" "b/dir/")))
(mapc #'kill-buffer bufs))))))
(ert-deftest uniquify-home ()
"uniquify works, albeit confusingly, in the presence of directories named \"~\""
(let (bufs)
(save-excursion
(push (find-file-noselect "~") bufs)
(push (find-file-noselect "./~") bufs)
(should (equal (mapcar #'buffer-name bufs)
'("~<test>" "~<>")))
(push (find-file-noselect "~/foo") bufs)
(push (find-file-noselect "./~/foo") bufs)
(should (equal (mapcar #'buffer-name bufs)
'("foo<~>" "foo</nonexistent>" "~<test>" "~<>")))
(while bufs
(kill-buffer (pop bufs))))))
(ert-deftest uniquify-rename-to-dir ()
"Giving a buffer a name which matches a directory doesn't rename the buffer"
(let ((uniquify-buffer-name-style 'forward)