unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
* bug#64791: 30.0.50; [PATCH] Fix dired mismatch on some filenames
@ 2023-07-22 13:22 Manuel Giraud via Bug reports for GNU Emacs, the Swiss army knife of text editors
  2023-07-22 13:50 ` Eli Zaretskii
  0 siblings, 1 reply; 27+ messages in thread
From: Manuel Giraud via Bug reports for GNU Emacs, the Swiss army knife of text editors @ 2023-07-22 13:22 UTC (permalink / raw)
  To: 64791

[-- Attachment #1: Type: text/plain, Size: 314 bytes --]


Hi,

I have found a file on my disk named "31 octobre 2022 Paris.zip" that is
currently mismatch by dired.  A 'n' from the previous line sets the
cursor on the P of "Paris" and i'm not able to open or even edit the
name of this file from dired.

I propose the attached patch that fixes this issue.

Best regards,

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fix-dired-mismatch-on-some-filenames.patch --]
[-- Type: text/x-patch, Size: 1546 bytes --]

From 6bb77e5c364e4627c7b12519aa95d097fa80ee96 Mon Sep 17 00:00:00 2001
From: Manuel Giraud <manuel@ledu-giraud.fr>
Date: Sat, 22 Jul 2023 14:40:56 +0200
Subject: [PATCH] Fix dired mismatch on some filenames

* lisp/files.el (directory-listing-before-filename-regexp): Look for
the first five columns of a 'ls -l' entry instead of searching for a
size pattern.
---
 lisp/files.el | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lisp/files.el b/lisp/files.el
index f8867432000..6090327def0 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -30,6 +30,7 @@
 
 (eval-when-compile
   (require 'pcase)
+  (require 'rx)
   (require 'easy-mmode)) ; For `define-minor-mode'.
 
 (defvar font-lock-keywords)
@@ -7765,9 +7766,12 @@ directory-listing-before-filename-regexp
          ;; parentheses:
          ;; -rw-r--r-- (modified) 2005-10-22 21:25 files.el
          ;; This is not supported yet.
-    (purecopy (concat "\\([0-9][BkKMGTPEZYRQ]? " iso
-		      "\\|.*[0-9][BkKMGTPEZYRQ]? "
-	              "\\(" western "\\|" western-comma
+    (purecopy (concat "\\("
+                      ;; Five columns before modification time: mode,
+                      ;; links, owner, group and size
+                      (rx (repeat 5 (and (one-or-more graph)
+				         (one-or-more space))))
+	              "\\(" iso "\\|" western "\\|" western-comma
                       "\\|" DD-MMM-YYYY "\\|" east-asian "\\)"
 		      "\\) +")))
   "Regular expression to match up to the file name in a directory listing.
-- 
2.40.0


[-- Attachment #3: Type: text/plain, Size: 7905 bytes --]



In GNU Emacs 30.0.50 (build 2, x86_64-unknown-openbsd7.3, cairo version
 1.17.8) of 2023-07-22 built on computer
Repository revision: 7298e66604d2119c72c4f7abd5160b29340737af
Repository branch: mgi/dired-regex
Windowing system distributor 'The X.Org Foundation', version 11.0.12101006
System Description: OpenBSD computer 7.3 GENERIC.MP#1125 amd64

Configured using:
 'configure --prefix=/home/manuel/emacs --bindir=/home/manuel/bin
 --with-x-toolkit=no --with-toolkit-scroll-bars=no --without-sound
 --without-compress-install CPPFLAGS=-I/usr/local/include
 LDFLAGS=-L/usr/local/lib'

Configured features:
CAIRO DBUS FREETYPE GIF GLIB GMP GNUTLS GSETTINGS HARFBUZZ JPEG JSON
LCMS2 LIBOTF LIBXML2 MODULES NOTIFY KQUEUE OLDXMENU PDUMPER PNG RSVG
SQLITE3 THREADS TIFF TREE_SITTER WEBP X11 XDBE XIM XINPUT2 XPM ZLIB

Important settings:
  value of $LC_ALL: en_US.UTF-8
  locale-coding-system: utf-8-unix

Major mode: Magit

Minor modes in effect:
  global-git-commit-mode: t
  magit-auto-revert-mode: t
  display-time-mode: t
  display-battery-mode: t
  server-mode: t
  hyperbole-mode: t
  override-global-mode: t
  repeat-mode: t
  desktop-save-mode: t
  global-eldoc-mode: t
  show-paren-mode: t
  electric-indent-mode: t
  mouse-wheel-mode: t
  menu-bar-mode: t
  file-name-shadow-mode: t
  global-font-lock-mode: t
  font-lock-mode: t
  blink-cursor-mode: t
  buffer-read-only: t
  line-number-mode: t
  indent-tabs-mode: t
  transient-mark-mode: t
  auto-composition-mode: t
  auto-encryption-mode: t
  auto-compression-mode: t

Load-path shadows:
/home/manuel/.emacs.d/elpa/ef-themes-1.2.0/theme-loaddefs hides /home/manuel/emacs/share/emacs/30.0.50/lisp/theme-loaddefs

Features:
(shadow mail-extr emacsbug whitespace magit-patch magit-extras
face-remap magit-bookmark magit-submodule magit-obsolete magit-blame
magit-stash magit-reflog magit-bisect magit-push magit-pull magit-fetch
magit-clone magit-remote magit-commit magit-sequence magit-notes
magit-worktree magit-tag magit-merge magit-branch magit-reset
magit-files magit-refs magit-status magit magit-repos magit-apply
magit-wip magit-log which-func magit-diff smerge-mode diff git-commit
log-edit add-log magit-core magit-autorevert magit-margin
magit-transient magit-process with-editor magit-mode transient magit-git
magit-section magit-utils dash cus-edit cus-start kotl-autoloads
css-mode sgml-mode facemenu imenu vc-cvs vc-rcs log-view pcvs-util
make-mode sh-script smie treesit executable vc pascal vc-hg conf-mode
reveal gnus-dired mule-util vc-git diff-mode bug-reference paredit time
battery org-indent vc-dispatcher vc-svn oc-basic ol-eww eww url-queue
mm-url ol-rmail ol-mhe ol-irc ol-info ol-gnus nnselect ol-docview
doc-view jka-compr image-mode exif ol-bibtex bibtex ol-bbdb ol-w3m
ol-doi org-link-doi org-agenda cus-load exwm-randr xcb-randr exwm-config
ido exwm exwm-input xcb-keysyms xcb-xkb exwm-manage exwm-floating
xcb-cursor xcb-render exwm-layout exwm-workspace exwm-core xcb-ewmh
xcb-icccm xcb xcb-xproto xcb-types xcb-debug server modus-operandi-theme
modus-themes zone speed-type url-http url-auth url-gw nsm compat ytdious
mingus libmpdee reporter edebug detached-init detached autorevert
filenotify transmission calc-bin calc-ext calc calc-loaddefs rect
calc-macs supercite regi ebdb-message ebdb-gnus ebdb-mua ebdb-com crm
ebdb-format ebdb eieio-opt speedbar ezimage dframe eieio-base pcase
timezone gnus-icalendar org-capture icalendar visual-basic-mode cl
web-mode disp-table erlang-start smart-tabs-mode skeleton cc-mode
cc-fonts cc-guess cc-menus cc-cmds cc-styles cc-align cc-engine cc-vars
cc-defs slime-asdf grep slime-tramp slime-fancy slime-indentation
slime-cl-indent cl-indent slime-trace-dialog slime-fontifying-fu
slime-package-fu slime-references slime-compiler-notes-tree advice
slime-scratch slime-presentations bridge slime-macrostep macrostep
slime-mdot-fu slime-enclosing-context slime-fuzzy slime-fancy-trace
slime-fancy-inspector slime-c-p-c slime-editing-commands slime-autodoc
slime-repl slime-parse slime apropos arc-mode archive-mode hyperspec
thingatpt slime-autoloads hyperbole hinit hibtypes hib-doc-id klink
hib-kbd hib-debbugs hib-social hsys-www hypb-ert ert ewoc debug
backtrace hactypes bookmark pp hui-mini hui hui-mouse hmouse-key hargs
etags fileloop xref project hsys-org org-element org-persist org-id
org-refile avl-tree generator org ob ob-tangle ob-ref ob-lob ob-table
ob-exp org-macro org-src ob-comint org-pcomplete org-list org-footnote
org-faces org-entities ob-emacs-lisp ob-core ob-eval org-cycle org-table
ol org-fold org-fold-core org-keys oc org-loaddefs find-func org-version
org-compat org-macs hui-menu hyrolo-menu hyrolo sort hui-jmenu hpath
tramp rx tramp-loaddefs trampver tramp-integration files-x tramp-compat
xdg shell pcomplete format-spec noutline outline icons hmouse-sh
hmouse-drv hui-window pulse color hycontrol hui-select hsettings
hui-em-but hbut view hbdata hgnus gnus-msg gnus-art mm-uu mml2015
mm-view mml-smime smime gnutls dig gnus-sum shr pixel-fill kinsoku
url-file svg dom gnus-group gnus-undo gnus-start gnus-dbus gnus-cloud
nnimap nnmail mail-source utf7 nnoo parse-time iso8601 gnus-spec
gnus-int gnus-range gnus-win gnus nnheader range wid-edit hsmail message
sendmail yank-media puny rfc822 mml mml-sec epa derived epg rfc6068
epg-config gnus-util time-date mm-decode mm-bodies mm-encode mail-parse
rfc2231 rfc2047 rfc2045 mm-util ietf-drums mail-prsvr mailabbrev
mail-utils gmm-utils mailheader hmail htz cal-julian hbmap hmoccur hvar
hypb locate hact hhist compile text-property-search comint ansi-osc
ansi-color ring set hversion hload-path edmacro kmacro
use-package-bind-key bind-key appt diary-lib diary-loaddefs cal-menu
calendar cal-loaddefs dired-x dired-aux dired dired-loaddefs
notifications dbus xml cl-extra help-mode use-package-core repeat
easy-mmode desktop frameset debbugs-autoloads detached-autoloads
ebdb-autoloads ef-themes-autoloads exwm-autoloads hyperbole-autoloads
magit-autoloads git-commit-autoloads finder-inf magit-section-autoloads
dash-autoloads osm-autoloads paredit-autoloads rust-mode-autoloads
speed-type-autoloads transmission-autoloads visual-fill-column-autoloads
with-editor-autoloads info compat-autoloads ytdious-autoloads package
browse-url url url-proxy url-privacy url-expand url-methods url-history
url-cookie generate-lisp-file url-domsuf url-util mailcap url-handlers
url-parse auth-source cl-seq eieio eieio-core cl-macs password-cache
json subr-x map byte-opt gv bytecomp byte-compile url-vars cl-loaddefs
cl-lib rmc iso-transl tooltip cconv eldoc paren electric uniquify
ediff-hook vc-hooks lisp-float-type elisp-mode mwheel term/x-win x-win
term/common-win x-dnd tool-bar dnd fontset image regexp-opt fringe
tabulated-list replace newcomment text-mode lisp-mode prog-mode register
page tab-bar menu-bar rfn-eshadow isearch easymenu timer select
scroll-bar mouse jit-lock font-lock syntax font-core term/tty-colors
frame minibuffer nadvice seq simple cl-generic indonesian philippine
cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao
korean japanese eucjp-ms cp51932 hebrew greek romanian slovak czech
european ethiopic indian cyrillic chinese composite emoji-zwj charscript
charprop case-table epa-hook jka-cmpr-hook help abbrev obarray oclosure
cl-preloaded button loaddefs theme-loaddefs faces cus-face macroexp
files window text-properties overlay sha1 md5 base64 format env
code-pages mule custom widget keymap hashtable-print-readable backquote
threads dbusbind kqueue lcms2 dynamic-setting system-font-setting
font-render-setting cairo xinput2 x multi-tty move-toolbar
make-network-process emacs)

Memory information:
((conses 16 763799 139807) (symbols 48 62414 8)
 (strings 32 202382 14370) (string-bytes 1 6422275)
 (vectors 16 121262) (vector-slots 8 2342839 99930) (floats 8 641 507)
 (intervals 56 19677 523) (buffers 984 91))

-- 
Manuel Giraud

^ permalink raw reply related	[flat|nested] 27+ messages in thread
end of thread, other threads:[~2023-09-25  9:39 UTC | newest]

Thread overview: 27+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-07-22 13:22 bug#64791: 30.0.50; [PATCH] Fix dired mismatch on some filenames Manuel Giraud via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-07-22 13:50 ` Eli Zaretskii
2023-07-22 14:46   ` Manuel Giraud via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-07-22 15:24     ` Eli Zaretskii
2023-09-03 11:34       ` Stefan Kangas
2023-09-03 11:44         ` Eli Zaretskii
2023-09-03 14:04         ` Manuel Giraud via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-09-03 18:18           ` Stefan Kangas
2023-09-03 18:24             ` Eli Zaretskii
2023-09-03 18:54               ` Stefan Kangas
2023-09-03 19:25                 ` Eli Zaretskii
2023-09-04  7:57                   ` Stefan Kangas
2023-09-04  8:05                   ` Manuel Giraud via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-09-04  8:22                     ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-09-04  8:36                       ` Manuel Giraud via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-09-04 19:22                       ` Stefan Kangas
2023-09-05  0:20                         ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-09-05 21:57                           ` Stefan Kangas
2023-09-04 12:17                   ` Eli Zaretskii
2023-09-05 22:27                     ` Stefan Kangas
2023-09-05 22:43                       ` Stefan Kangas
2023-09-06 11:28                         ` Eli Zaretskii
2023-09-24 12:34                           ` Stefan Kangas
2023-09-24 15:32                             ` Eli Zaretskii
2023-09-25  9:39                               ` Stefan Kangas
2023-09-24 15:41                             ` Manuel Giraud via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-09-24 15:56                               ` Stefan Kangas

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).