comparison lisp/files.el @ 30907:46752ce55a92

(insert-directory): Don't lose original file name, undoing an undocumented change.

30906:cab5c3c01776

This works by running a directory listing program
whose name is in the variable `insert-directory-program'.
If WILDCARD, it also runs the shell specified by `shell-file-name'."
  ;; We need the directory in order to find the right handler.
  (let* ((file (expand-file-name file))
         (handler (find-file-name-handler file 'insert-directory)))
    (if handler
	(funcall handler 'insert-directory file switches
		 wildcard full-directory-p)
      (if (eq system-type 'vax-vms)
	  (vms-read-directory file switches (current-buffer))
	(let* ((coding-system-for-read

	       ;; This is to control encoding the arguments in call-process.
	       (coding-system-for-write coding-system-for-read)
	       (result
		(if wildcard
		    ;; Run ls in the directory of the file pattern we asked for
		    (let ((default-directory (file-name-directory file))
			  (pattern (file-name-nondirectory file)))
		      (call-process
                       shell-file-name nil t nil
                       "-c" (concat (if (memq system-type '(ms-dos windows-nt))
					""
				      "\\") ; Disregard Unix shell aliases!
                                    insert-directory-program
                                    " -d "
                                    (if (stringp switches)
                                        switches
                                        (mapconcat 'identity switches " "))
                                    " -- "
				    ;; Quote some characters that have
				    ;; special meanings in shells; but
				    ;; don't quote the wildcards--we
				    ;; want them to be special.  We
				    ;; also currently don't quote the
				    ;; quoting characters in case
				    ;; people want to use them
				    ;; explicitly to quote wildcard
				    ;; characters.
                                    (shell-quote-wildcard-pattern pattern))))
		  ;; SunOS 4.1.3, SVr4 and others need the "." to list the
		  ;; directory if FILE is a symbolic link.
		  (apply 'call-process
			  insert-directory-program nil t nil
                          (append
                           (if (listp switches) switches
                               (unless (equal switches "")
                                 ;; Split the switches at any spaces so we can
                                 ;; pass separate options as separate args.
                                 (split-string switches)))
                           ;; Avoid lossage if FILE starts with `-'.
                           '("--")
                           (progn
                             (if (string-match "\\`~" file)
                                 (setq file (expand-file-name file)))
                             (list
                              (if full-directory-p
                                  (concat (file-name-as-directory file) ".")
                                  file))))))))
	  (if (/= result 0)
	      ;; We get here if `insert-directory-program' failed.
	      ;; On non-Posix systems, we cannot open a directory, so
	      ;; don't even try, because that will always result in
	      ;; the ubiquitous "Access denied".  Instead, show them

30907:46752ce55a92

This works by running a directory listing program
whose name is in the variable `insert-directory-program'.
If WILDCARD, it also runs the shell specified by `shell-file-name'."
  ;; We need the directory in order to find the right handler.
  (let ((handler (find-file-name-handler (expand-file-name file)
					 'insert-directory)))
   (if handler
	(funcall handler 'insert-directory file switches
		 wildcard full-directory-p)
      (if (eq system-type 'vax-vms)
	  (vms-read-directory file switches (current-buffer))
	(let* ((coding-system-for-read

	       ;; This is to control encoding the arguments in call-process.
	       (coding-system-for-write coding-system-for-read)
	       (result
		(if wildcard
		    ;; Run ls in the directory of the file pattern we asked for
		    (let ((default-directory
			    (if (file-name-absolute-p file)
				(file-name-directory file)
			      (file-name-directory (expand-file-name file))))
			  (pattern (file-name-nondirectory file)))
		      (call-process
		       shell-file-name nil t nil
		       "-c" (concat (if (memq system-type '(ms-dos windows-nt))
					""
				      "\\") ; Disregard Unix shell aliases!
				    insert-directory-program
				    " -d "
				    (if (stringp switches)
					switches
				      (mapconcat 'identity switches " "))
				    " -- "
				    ;; Quote some characters that have
				    ;; special meanings in shells; but
				    ;; don't quote the wildcards--we
				    ;; want them to be special.  We
				    ;; also currently don't quote the
				    ;; quoting characters in case
				    ;; people want to use them
				    ;; explicitly to quote wildcard
				    ;; characters.
				    (shell-quote-wildcard-pattern pattern))))
		  ;; SunOS 4.1.3, SVr4 and others need the "." to list the
		  ;; directory if FILE is a symbolic link.
		  (apply 'call-process
			 insert-directory-program nil t nil
			 (append
			  (if (listp switches) switches
			    (unless (equal switches "")
			      ;; Split the switches at any spaces so we can
			      ;; pass separate options as separate args.
			      (split-string switches)))
			  ;; Avoid lossage if FILE starts with `-'.
			  '("--")
			  (progn
			    (if (string-match "\\`~" file)
				(setq file (expand-file-name file)))
			    (list
			     (if full-directory-p
				 (concat (file-name-as-directory file) ".")
			       file))))))))
	  (if (/= result 0)
	      ;; We get here if `insert-directory-program' failed.
	      ;; On non-Posix systems, we cannot open a directory, so
	      ;; don't even try, because that will always result in
	      ;; the ubiquitous "Access denied".  Instead, show them