diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2022-04-16 13:43:33 -0400 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2022-04-16 13:43:33 -0400 |
| commit | 5890b80bca13b48c6c3fd26ac2721db7f3a3d013 (patch) | |
| tree | ce35c26d11230e6fa9d512b6ab1ada22ac4d7109 /lisp | |
| parent | 6339fcffa1d409fc8c7a82867a89547c453d8bc1 (diff) | |
| parent | 84a285772201d077274dfc932524bbdf0d56848a (diff) | |
| download | emacs-5890b80bca13b48c6c3fd26ac2721db7f3a3d013.tar.gz emacs-5890b80bca13b48c6c3fd26ac2721db7f3a3d013.tar.bz2 emacs-5890b80bca13b48c6c3fd26ac2721db7f3a3d013.zip | |
Merge from origin/emacs-28
84a2857722 Fix scrolling of the stack window in Calc
9dd44505b1 ; * src/window.c (Fset_window_start): Clarify the effect o...
24a6c7c8c0 Update and fix instructions and scripts for updating the W...
886339747b Extend tramp-archive-test45-auto-load
ff997ad786 Ensure local `default-directory' in Tramp when needed
4f27588a16 Clarify "idleness" in the ELisp manual
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/calc/calc.el | 2 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 17 |
2 files changed, 10 insertions, 9 deletions
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el index 3b1cf248fd9..e642d1c5e46 100644 --- a/lisp/calc/calc.el +++ b/lisp/calc/calc.el @@ -1816,7 +1816,7 @@ See calc-keypad for details." (if win (progn (calc-cursor-stack-index 0) - (vertical-motion (- 2 (window-height win))) + (vertical-motion (- 3 (window-height win))) (set-window-start win (point))))) (calc-cursor-stack-index 0) (if (looking-at " *\\.$") diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 1f429edf4f8..d7d375e111d 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -5915,14 +5915,15 @@ verbosity of 6." "Return t if system process PROCESS-NAME is running for `user-login-name'." (when (stringp process-name) (catch 'result - (dolist (pid (list-system-processes)) - (when-let ((attributes (process-attributes pid)) - (comm (cdr (assoc 'comm attributes)))) - (and (string-equal (cdr (assoc 'user attributes)) (user-login-name)) - ;; The returned command name could be truncated to 15 - ;; characters. Therefore, we cannot check for `string-equal'. - (string-prefix-p comm process-name) - (throw 'result t))))))) + (let ((default-directory temporary-file-directory)) + (dolist (pid (list-system-processes)) + (when-let ((attributes (process-attributes pid)) + (comm (cdr (assoc 'comm attributes)))) + (and (string-equal (cdr (assoc 'user attributes)) (user-login-name)) + ;; The returned command name could be truncated to 15 + ;; characters. Therefore, we cannot check for `string-equal'. + (string-prefix-p comm process-name) + (throw 'result t)))))))) ;; When calling "emacs -Q", `auth-source-search' won't be called. If ;; you want to debug exactly this case, call "emacs -Q --eval '(setq |