emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 23f49999896 1/5: Merge from origin/emacs-29


From: Eli Zaretskii
Subject: master 23f49999896 1/5: Merge from origin/emacs-29
Date: Fri, 4 Aug 2023 03:18:15 -0400 (EDT)

branch: master
commit 23f4999989607950dbed7d34d251c31b81c8e0c1
Merge: 12427976c8a 0c29f53ab87
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Merge from origin/emacs-29
    
    0c29f53ab87 Fix 'string-pixel-width' under 'line-prefix'
    7bbd7cae074 Fix find-dired-with-command for remote directories
    c4a8572025e ; * etc/HISTORY: Fix Emacs 28.3 entry.
---
 etc/HISTORY               | 3 ++-
 lisp/emacs-lisp/subr-x.el | 9 ++++++---
 lisp/find-dired.el        | 4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/etc/HISTORY b/etc/HISTORY
index 70f8669cb29..f6df3e6fe60 100644
--- a/etc/HISTORY
+++ b/etc/HISTORY
@@ -228,7 +228,8 @@ GNU Emacs 28.1 (2022-04-04) emacs-28.1
 
 GNU Emacs 28.2 (2022-09-12) emacs-28.2
 
-GNU Emacs 28.3 (2023-02-17) emacs-28.3 (was not actually released)
+GNU Emacs 28.3 (2023-02-17) emacs-28.3-rc1
+Was not actually released.
 
 GNU Emacs 29.1 (2023-07-30) emacs-29.1
 
diff --git a/lisp/emacs-lisp/subr-x.el b/lisp/emacs-lisp/subr-x.el
index 9e906930b92..78dc58e0bcd 100644
--- a/lisp/emacs-lisp/subr-x.el
+++ b/lisp/emacs-lisp/subr-x.el
@@ -337,12 +337,15 @@ as the new values of the bound variables in the recursive 
invocation."
     ;; Keeping a work buffer around is more efficient than creating a
     ;; new temporary buffer.
     (with-current-buffer (get-buffer-create " *string-pixel-width*")
-      ;; `display-line-numbers-mode' is enabled in internal buffers
-      ;; that breaks width calculation, so need to disable (bug#59311)
+      ;; If `display-line-numbers-mode' is enabled in internal
+      ;; buffers, it breaks width calculation, so disable it (bug#59311)
       (when (bound-and-true-p display-line-numbers-mode)
         (display-line-numbers-mode -1))
       (delete-region (point-min) (point-max))
-      (insert string)
+      ;; Disable line-prefix and wrap-prefix, for the same reason.
+      (setq line-prefix nil
+           wrap-prefix nil)
+      (insert (propertize string 'line-prefix nil 'wrap-prefix nil))
       (car (buffer-text-pixel-size nil nil t)))))
 
 ;;;###autoload
diff --git a/lisp/find-dired.el b/lisp/find-dired.el
index db2f5e7d026..48408d35499 100644
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -247,8 +247,8 @@ it finishes, type \\[kill-find]."
     (erase-buffer)
     (setq default-directory dir)
     ;; Start the find process.
-    (shell-command (concat command "&") (current-buffer))
-    (let ((proc (get-buffer-process (current-buffer))))
+    (let ((proc (start-file-process-shell-command
+                 (buffer-name) (current-buffer) command)))
       ;; Initialize the process marker; it is used by the filter.
       (move-marker (process-mark proc) (point) (current-buffer))
       (set-process-filter proc #'find-dired-filter)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]