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-03-16 19:56:25 +08:00
commit 3702389a50
3 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/net/tramp-sh.el
View file

@ -2427,7 +2427,7 @@ The method used must be an out-of-band method."
;; This is neded for ssh or PuTTY based processes, and
;; only if the respective options are set. Perhaps,
;; the setting could be more fine-grained.
(process-put p 'shared-socket t)
;; (process-put p 'shared-socket t)
(process-put p 'adjust-window-size-function #'ignore)
(set-process-query-on-exit-flag p nil)
@ -3760,7 +3760,7 @@ Fall back to normal file name handler if no Tramp handler exists."
;; This is neded for ssh or PuTTY based processes, and only if
;; the respective options are set. Perhaps, the setting could
;; be more fine-grained.
(process-put p 'shared-socket t)
;; (process-put p 'shared-socket t)
;; Needed for process filter.
(process-put p 'events events)
(process-put p 'watch-name localname)
@ -5124,7 +5124,7 @@ connection if a previous connection has died for some reason."
;; This is neded for ssh or PuTTY based processes, and
;; only if the respective options are set. Perhaps,
;; the setting could be more fine-grained.
(process-put p 'shared-socket t)
;; (process-put p 'shared-socket t)
(process-put p 'adjust-window-size-function #'ignore)
(set-process-query-on-exit-flag p nil)
(setq tramp-current-connection (cons vec (current-time)))

3
lisp/net/tramp.el
View file

@ -5091,7 +5091,7 @@ substitution. SPEC-LIST is a list of char/value pairs used for
;; This is neded for ssh or PuTTY based processes, and
;; only if the respective options are set. Perhaps, the
;; setting could be more fine-grained.
(process-put p 'shared-socket t)
;; (process-put p 'shared-socket t)
(process-put p 'remote-command orig-command)
(tramp-set-connection-property p "remote-command" orig-command)
@ -5809,6 +5809,7 @@ If the user quits via `C-g', it is propagated up to `tramp-file-name-handler'."
;; There could be other processes which use the same socket for
;; communication. This could block the output for the current
;; process. Read such output first. (Bug#61350)
;; The process property isn't set anymore due to Bug#62194.
(when-let (((process-get proc 'shared-socket))
(v (process-get proc 'vector)))
(dolist (p (delq proc (process-list)))

13
lisp/progmodes/elixir-ts-mode.el
View file

@ -44,7 +44,6 @@
;;; Code:
(require 'treesit)
(require 'heex-ts-mode)
(eval-when-compile (require 'rx))
(declare-function treesit-parser-create "treesit.c")
@ -480,6 +479,10 @@
:host 'elixir
'((sigil (sigil_name) @name (:match "^[HF]$" @name) (quoted_content) @heex)))))
(defvar heex-ts--sexp-regexp)
(defvar heex-ts--indent-rules)
(defvar heex-ts--font-lock-settings)
(defun elixir-ts--forward-sexp (&optional arg)
"Move forward across one balanced expression (sexp).
With ARG, do it many times. Negative ARG means move backward."
@ -566,8 +569,12 @@ Return nil if NODE is not a defun node or doesn't have a name."
(when (treesit-ready-p 'elixir)
;; The HEEx parser has to be created first for elixir to ensure elixir
;; is the first language when looking for treesit ranges.
(if (treesit-ready-p 'heex)
(treesit-parser-create 'heex))
(when (treesit-ready-p 'heex)
;; Require heex-ts-mode only when we load elixir-ts-mode
;; so that we don't get a tree-sitter compilation warning for
;; elixir-ts-mode.
(require 'heex-ts-mode)
(treesit-parser-create 'heex))
(treesit-parser-create 'elixir)