insert-directory

[Luc Teirlinck <teirllm@dms.auburn.edu>]

Using the 'i' command in the *Locate* buffer one gets after `m-x locate'
currently does not work, because `insert-directory' mistakenly
believes that the last two lines of the buffer are:

//DIRED// 69 75 134 141 200 207 266 273 332 335
//DIRED-OPTIONS// --quoting-style=(null)

They are not, because locate.el sets dired-actual-switches to "".
`insert-directory' at present is not able to handle values of
dired-actual-switches that do not contain "-l".  The patch below tries
to support modes like locate-mode that, for some reason or another
need to set dired-actual-switches to a value not containing "-l".
I have the impression that it actually makes `insert-directory' safer
anyway, because, if for some reason these last two lines are not what
they are supposed to be, they should probably not be erased.  This is
what the patch does: check whether the last two lines are what we
think they are and not erase them otherwise.

After applying my patch, `i' in the *Locate* buffer seems to work
perfectly.

I will wait for a couple of days before installing the patch, to see
whether there are any objections and to check for possible problems in
my own usage.

===File ~/files-diff========================================
*** files.el	22 May 2004 14:29:26 -0500	1.695
--- files.el	23 May 2004 16:40:13 -0500	
***************
*** 4336,4356 ****
              (when (looking-at "//SUBDIRED//")
                (delete-region (point) (progn (forward-line 1) (point)))
                (forward-line -1))
! 	    (let ((end (line-end-position)))
! 	      (forward-word 1)
! 	      (forward-char 3)
! 	      (while (< (point) end)
! 		(let ((start (+ beg (read (current-buffer))))
! 		      (end (+ beg (read (current-buffer)))))
! 		  (if (= (char-after end) ?\n)
! 		      (put-text-property start end 'dired-filename t)
! 		    ;; It seems that we can't trust ls's output as to
! 		    ;; byte positions of filenames.
! 		    (put-text-property beg (point) 'dired-filename nil)
! 		    (end-of-line))))
! 	      (goto-char end)
! 	      (beginning-of-line)
! 	      (delete-region (point) (progn (forward-line 2) (point)))))
  
  	  ;; Now decode what read if necessary.
  	  (let ((coding (or coding-system-for-read
--- 4336,4358 ----
              (when (looking-at "//SUBDIRED//")
                (delete-region (point) (progn (forward-line 1) (point)))
                (forward-line -1))
! 	    (if (looking-at "//DIRED//")
! 		(let ((end (line-end-position)))
! 		  (forward-word 1)
! 		  (forward-char 3)
! 		  (while (< (point) end)
! 		    (let ((start (+ beg (read (current-buffer))))
! 			  (end (+ beg (read (current-buffer)))))
! 		      (if (= (char-after end) ?\n)
! 			  (put-text-property start end 'dired-filename t)
! 			;; It seems that we can't trust ls's output as to
! 			;; byte positions of filenames.
! 			(put-text-property beg (point) 'dired-filename nil)
! 			(end-of-line))))
! 		  (goto-char end)
! 		  (beginning-of-line)
! 		  (delete-region (point) (progn (forward-line 2) (point))))
! 	      (forward-line 2)))
  
  	  ;; Now decode what read if necessary.
  	  (let ((coding (or coding-system-for-read
============================================================