[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
feature/android e18cbd0cc64: Merge remote-tracking branch 'origin/master
From: |
Po Lu |
Subject: |
feature/android e18cbd0cc64: Merge remote-tracking branch 'origin/master' into feature/android |
Date: |
Thu, 2 Mar 2023 07:45:52 -0500 (EST) |
branch: feature/android
commit e18cbd0cc6422096e6f5385593f28d03de36eefb
Merge: a6a586ffc1b 3b39873ce21
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>
Merge remote-tracking branch 'origin/master' into feature/android
---
lisp/dired.el | 16 ++++++++++++++--
lisp/man.el | 2 +-
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/lisp/dired.el b/lisp/dired.el
index 55a5bbd9800..8e3244356fe 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -490,6 +490,11 @@ to nil: a pipe using `zcat' or `gunzip -c' will be used."
(string :tag "Switches"))
:version "29.1")
+(defcustom dired-hide-details-preserved-columns nil
+ "List of columns which are not hidden in `dired-hide-details-mode'."
+ :type '(repeat integer)
+ :version "30.1")
+
;;; Internal variables
@@ -1880,8 +1885,15 @@ other marked file as well. Otherwise, unmark all files."
(put-text-property (line-beginning-position)
(1+ (line-end-position))
'invisible 'dired-hide-details-information))
- (put-text-property (+ (line-beginning-position) 1) (1- (point))
- 'invisible 'dired-hide-details-detail)
+ (save-excursion
+ (let ((end (1- (point)))
+ (opoint (goto-char (1+ (pos-bol))))
+ (i 0))
+ (put-text-property opoint end 'invisible
'dired-hide-details-detail)
+ (while (re-search-forward "[^ ]+" end t)
+ (when (member (cl-incf i) dired-hide-details-preserved-columns)
+ (put-text-property opoint (point) 'invisible nil))
+ (setq opoint (point)))))
(when (and dired-mouse-drag-files (fboundp 'x-begin-drag))
(put-text-property (point)
(save-excursion
diff --git a/lisp/man.el b/lisp/man.el
index 3ab9aa5b4dd..479bf9f9a3c 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -103,7 +103,7 @@ When this is non-nil, call the \"man\" program synchronously
(rather than asynchronously, which is the default behavior)."
:type 'boolean
:group 'man
- :version 30.1)
+ :version "30.1")
(defcustom Man-filter-list nil
"Manpage cleaning filter command phrases.