unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
* bug#7308: [patch] locate under windoze
@ 2010-10-30 19:50 Eduard Wiebe
  2010-10-30 21:21 ` Eli Zaretskii
                   ` (3 more replies)
  0 siblings, 4 replies; 24+ messages in thread
From: Eduard Wiebe @ 2010-10-30 19:50 UTC (permalink / raw)
  To: 7308

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


  Hello,

i want to use `locate' under windoze system.  Unfortunately locate (in
interaction with dired) doesn't work proper in such a case.
The problem is the unquoted backslash in a located file path.
So i fix this issue by following patch. BTW i customized hook variables
and added autoloads.

-- 
Eduard Wiebe

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: locate_under_windoze.diff --]
[-- Type: text/x-diff, Size: 2557 bytes --]

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d7a6399..37f09e7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-23  Eduard Wiebe <usenet@pusto.de>
+
+	* dired.el (dired-get-filename): Quote path delimiter under
+	windows-nt and ms-dos systems, needed for `locate' under this
+	systems.
+	* locate.el (locate-default-make-command-line): Simplify
+	`directory-listing-before-filename-regexp'.
+	(locate-post-command-hook, locate-post-command-hook): Customized
+	and add autoload.
+
 2010-10-30  Alan Mackenzie  <acm@muc.de>
 
 	* progmodes/cc-fonts.el (c-font-lock-enum-tail): New function
diff --git a/lisp/dired.el b/lisp/dired.el
index f840b60..d1c2ccb 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -2011,6 +2011,10 @@ Otherwise, an error occurs in these cases."
           ;; with quotation marks in their names.
 	  (while (string-match "\\(?:[^\\]\\|\\`\\)\\(\"\\)" file)
 	    (setq file (replace-match "\\\"" nil t file 1)))
+	  
+	  (when (member system-type '(ms-dos windows-nt))
+	    (setq file (replace-regexp-in-string "\\\\" "\\\\\\\\" file)))
+
           (setq file (read (concat "\"" file "\"")))
 	  ;; The above `read' will return a unibyte string if FILE
 	  ;; contains eight-bit-control/graphic characters.
diff --git a/lisp/locate.el b/lisp/locate.el
index f1983a3..e07acde 100644
--- a/lisp/locate.el
+++ b/lisp/locate.el
@@ -145,6 +145,12 @@ the version.)"
   :type 'string
   :group 'locate)
 
+;;;###autoload
+(defcustom locate-post-command-hook nil
+  "List of hook functions run after `locate' (see `run-hooks')."
+  :type  'hook
+  :group 'locate)
+
 (defvar locate-history-list nil
   "The history list used by the \\[locate] command.")
 
@@ -226,6 +232,12 @@ that is, with a prefix arg, you get the default behavior."
   :group 'locate
   :type 'boolean)
 
+;;;###autoload
+(defcustom locate-mode-hook nil
+  "List of hook functions run by `locate-mode' (see `run-mode-hooks')."
+  :type  'hook
+  :group 'locate)
+
 ;; Functions
 
 (defun locate-default-make-command-line (search-string)
@@ -473,9 +485,9 @@ do not work in subdirectories.
   (make-local-variable 'directory-listing-before-filename-regexp)
   ;; This should support both Unix and Windoze style names
   (setq directory-listing-before-filename-regexp
-	(concat "^."
+	(concat "^.\\("
 		(make-string (1- locate-filename-indentation) ?\s)
-		"\\(/\\|[A-Za-z]:\\)\\|"
+		 "\\)\\|"
 		(default-value 'directory-listing-before-filename-regexp)))
   (make-local-variable 'dired-actual-switches)
   (setq dired-actual-switches "")

^ permalink raw reply related	[flat|nested] 24+ messages in thread

end of thread, other threads:[~2010-11-28 19:46 UTC | newest]

Thread overview: 24+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-30 19:50 bug#7308: [patch] locate under windoze Eduard Wiebe
2010-10-30 21:21 ` Eli Zaretskii
2010-10-31  9:36   ` Eduard Wiebe
2010-10-31  9:48     ` Thierry Volpiatto
2010-10-31 10:51     ` Eli Zaretskii
2010-10-31 19:54       ` Eduard Wiebe
2010-10-31 20:26         ` Eli Zaretskii
2010-10-31  6:56 ` Thierry Volpiatto
2010-10-31  7:49   ` Eli Zaretskii
2010-10-31  9:41     ` Thierry Volpiatto
2010-10-31 10:47       ` Eli Zaretskii
2010-10-31 11:13         ` Thierry Volpiatto
2010-11-01  6:54 ` Glenn Morris
2010-11-01  7:46   ` Eduard Wiebe
2010-11-01 14:06   ` Stefan Monnier
2010-11-01 14:59 ` Eduard Wiebe
2010-11-12 20:28   ` Eduard Wiebe
2010-11-13 18:57     ` Chong Yidong
2010-11-13 21:18       ` Eli Zaretskii
2010-11-13 22:33         ` Eduard Wiebe
2010-11-14  3:59           ` Eli Zaretskii
2010-11-14  9:15             ` Eduard Wiebe
2010-11-27  9:59               ` Eli Zaretskii
     [not found]                 ` <87bp5970hs.fsf@pusto.de>
2010-11-28 19:46                   ` bug#5462: " Eli Zaretskii

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).