diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2023-09-30 13:50:07 -0400 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2023-09-30 13:50:07 -0400 |
| commit | 46978fa1eff286ea15248ee358fe62608ca070c5 (patch) | |
| tree | a9cce889b60229e11006585e276a018719e5fdad /.gitignore | |
| parent | e6dd64aaba55b93340de1d7e0d6783da6de2af2f (diff) | |
| parent | 4776d90c31b3d5bc4117ca7ecde95444adf402ac (diff) | |
| download | emacs-46978fa1eff286ea15248ee358fe62608ca070c5.tar.gz | |
Merge from origin/emacs-29
4776d90c31b Add new Tramp test
ca5b48fd76d Fix tmm-mid-prompt :type (Bug#66179)
7447d3df94e Fix tree-sitter indentation conflict with multiple languages
bee18e52737 Fix bug#66093 in Tramp
7d5fee0feaa Support regeneration of ja-dic.el under '--with-small-ja-...
Conflicts:
make-dist
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 0a68121009d..81abc4c90ff 100644 --- a/.gitignore +++ b/.gitignore @@ -127,6 +127,7 @@ lisp/cedet/semantic/grammar-wy.el lisp/eshell/esh-groups.el lisp/finder-inf.el lisp/leim/ja-dic/ +leim/small-ja-dic-option lisp/leim/leim-list.el lisp/leim/quail/4Corner.el lisp/leim/quail/ARRAY30.el |