comparison lisp/eshell/em-unix.el @ 31241:3099993cba0f

See ChangeLog

31240:10b1c85c0bbe

(defcustom eshell-ln-interactive-query (= (user-uid) 0)
  "*If non-nil, `ln' will query before overwriting anything."
  :type 'boolean
  :group 'eshell-unix)

(defcustom eshell-ln-overwrite-files t
  "*If non-nil, `ln' will overwrite files without warning."
  :type 'boolean
  :group 'eshell-unix)

(require 'esh-opt)

	 (unless (or preview
		     (and interactive
			  (not (y-or-n-p (format "rm: delete buffer `%s'? "
						 entry)))))
	   (eshell-funcalln 'kill-buffer entry)))
	((processp entry)
	 (if verbose
	     (eshell-printn (format "rm: killing process `%s'" entry)))
	 (unless (or preview
		     (and interactive
			  (not (y-or-n-p (format "rm: kill process `%s'? "

			(eshell-printn
			 (format "%s: making directory %s"
				 command target)))
		    (unless preview
		      (eshell-funcalln 'make-directory target)))
		  (eshell-shuffle-files command action
					(mapcar
					 (function
					  (lambda (file)
					    (concat source "/" file)))
					 (directory-files source))
					target func t args)
		  (when (eq func 'rename-file)
		    (if verbose
			(eshell-printn
			 (format "%s: deleting directory %s"
				 command source)))

(defun eshell/cat (&rest args)
  "Implementation of cat in Lisp."
  (if eshell-in-pipeline-p
      (throw 'eshell-replace-command
	     (eshell-parse-command "*cat" args))
    (eshell-init-print-buffer)
    (eshell-eval-using-options
     "cat" args
     '((?h "help" nil nil "show this usage screen")
       :external "cat"

	     (list 'lambda nil
		   (list 'setq 'process-environment
			 (list 'quote (eshell-copy-environment))))))
	(compile (concat "make " (eshell-flatten-and-stringify args))))
    (throw 'eshell-replace-command
	   (eshell-parse-command "*make" args))))

(defun eshell-occur-mode-goto-occurrence ()
  "Go to the occurrence the current line describes."
  (interactive)
  (let ((pos (occur-mode-find-occurrence)))

    (if (or eshell-plain-grep-behavior
	    (not (and (eshell-interactive-output-p)
		      (not eshell-in-pipeline-p)
		      (not eshell-in-subcommand-p))))
	(throw 'eshell-replace-command
	       (eshell-parse-command (concat "*" command) args))
      (let* ((compilation-process-setup-function
	      (list 'lambda nil
		    (list 'setq 'process-environment
			  (list 'quote (eshell-copy-environment)))))
	     (args (mapconcat 'identity

			      (caar entries)))
	       (symlink (and (stringp (cadr (car entries)))
			     (cadr (car entries)))))
	  (unless (or (and symlink (not dereference-links))
		      (and only-one-filesystem
			   (not (= only-one-filesystem
				   (nth 12 (car entries))))))
	    (if symlink
		(setq entry symlink))
	    (setq size
		  (+ size
		     (if (eq t (cadr (car entries)))

	(eshell-print (concat (eshell-du-size-string size)
			      (directory-file-name path) "\n")))
    size))

(defun eshell/du (&rest args)
  "Implementation of \"du\" in Lisp, passing RAGS."
  (if (eshell-search-path "du")
      (throw 'eshell-replace-command
	     (eshell-parse-command "*du" args))
    (eshell-eval-using-options
     "du" args
     '((?a "all" nil show-all
	   "write counts for all files, not just directories")
       (nil "block-size" t block-size

  (if eshell-diff-window-config
      (set-window-configuration eshell-diff-window-config)))

(defun eshell/diff (&rest args)
  "Alias \"diff\" to call Emacs `diff' function."
  (if (or eshell-plain-diff-behavior
	  (not (and (eshell-interactive-output-p)
		    (not eshell-in-pipeline-p)
		    (not eshell-in-subcommand-p))))
      (throw 'eshell-replace-command
	     (eshell-parse-command "*diff" args))
    (setq args (eshell-flatten-list args))
    (if (< (length args) 2)
	(error "diff: missing operand"))
    (let ((old (car (last args 2)))
	  (new (car (last args)))
	  (config (current-window-configuration)))
      (if (= (length args) 2)
	  (setq args nil)
	(setcdr (last args 3) nil))
      (with-current-buffer
	  (diff old new (eshell-flatten-and-stringify args))
	(when (fboundp 'diff-mode)
	  (diff-mode)
	  (set (make-local-variable 'eshell-diff-window-config) config)
	  (local-set-key [?q] 'eshell-diff-quit)
	  (if (fboundp 'turn-on-font-lock-if-enabled)
	      (turn-on-font-lock-if-enabled))))
      (other-window 1)
      (goto-char (point-min))
      nil)))

(defun eshell/locate (&rest args)
  "Alias \"locate\" to call Emacs `locate' function."
  (if (or eshell-plain-locate-behavior
	  (not (and (eshell-interactive-output-p)
		    (not eshell-in-pipeline-p)
		    (not eshell-in-subcommand-p)))
	  (and (stringp (car args))
	       (string-match "^-" (car args))))
      (throw 'eshell-replace-command
	     (eshell-parse-command "*locate" args))
    (save-selected-window
      (let ((locate-history-list (list (car args))))
	(locate-with-filter (car args) (cadr args))))))

(defun eshell/occur (&rest args)

31241:3099993cba0f

(defcustom eshell-ln-interactive-query (= (user-uid) 0)
  "*If non-nil, `ln' will query before overwriting anything."
  :type 'boolean
  :group 'eshell-unix)

(defcustom eshell-ln-overwrite-files nil
  "*If non-nil, `ln' will overwrite files without warning."
  :type 'boolean
  :group 'eshell-unix)

(require 'esh-opt)

	 (unless (or preview
		     (and interactive
			  (not (y-or-n-p (format "rm: delete buffer `%s'? "
						 entry)))))
	   (eshell-funcalln 'kill-buffer entry)))
	((eshell-processp entry)
	 (if verbose
	     (eshell-printn (format "rm: killing process `%s'" entry)))
	 (unless (or preview
		     (and interactive
			  (not (y-or-n-p (format "rm: kill process `%s'? "

			(eshell-printn
			 (format "%s: making directory %s"
				 command target)))
		    (unless preview
		      (eshell-funcalln 'make-directory target)))
		  (apply 'eshell-shuffle-files
			 command action
			 (mapcar
			  (function
			   (lambda (file)
			     (concat source "/" file)))
			  (directory-files source))
			 target func t args)
		  (when (eq func 'rename-file)
		    (if verbose
			(eshell-printn
			 (format "%s: deleting directory %s"
				 command source)))

(defun eshell/cat (&rest args)
  "Implementation of cat in Lisp."
  (if eshell-in-pipeline-p
      (throw 'eshell-replace-command
	     (eshell-parse-command "*cat" (eshell-flatten-list args)))
    (eshell-init-print-buffer)
    (eshell-eval-using-options
     "cat" args
     '((?h "help" nil nil "show this usage screen")
       :external "cat"

	     (list 'lambda nil
		   (list 'setq 'process-environment
			 (list 'quote (eshell-copy-environment))))))
	(compile (concat "make " (eshell-flatten-and-stringify args))))
    (throw 'eshell-replace-command
	   (eshell-parse-command "*make" (eshell-flatten-list args)))))

(defun eshell-occur-mode-goto-occurrence ()
  "Go to the occurrence the current line describes."
  (interactive)
  (let ((pos (occur-mode-find-occurrence)))

    (if (or eshell-plain-grep-behavior
	    (not (and (eshell-interactive-output-p)
		      (not eshell-in-pipeline-p)
		      (not eshell-in-subcommand-p))))
	(throw 'eshell-replace-command
	       (eshell-parse-command (concat "*" command)
				     (eshell-flatten-list args)))
      (let* ((compilation-process-setup-function
	      (list 'lambda nil
		    (list 'setq 'process-environment
			  (list 'quote (eshell-copy-environment)))))
	     (args (mapconcat 'identity

			      (caar entries)))
	       (symlink (and (stringp (cadr (car entries)))
			     (cadr (car entries)))))
	  (unless (or (and symlink (not dereference-links))
		      (and only-one-filesystem
			   (/= only-one-filesystem
			       (nth 12 (car entries)))))
	    (if symlink
		(setq entry symlink))
	    (setq size
		  (+ size
		     (if (eq t (cadr (car entries)))

	(eshell-print (concat (eshell-du-size-string size)
			      (directory-file-name path) "\n")))
    size))

(defun eshell/du (&rest args)
  "Implementation of \"du\" in Lisp, passing ARGS."
  (if (eshell-search-path "du")
      (throw 'eshell-replace-command
	     (eshell-parse-command "*du" (eshell-flatten-list args)))
    (eshell-eval-using-options
     "du" args
     '((?a "all" nil show-all
	   "write counts for all files, not just directories")
       (nil "block-size" t block-size

  (if eshell-diff-window-config
      (set-window-configuration eshell-diff-window-config)))

(defun eshell/diff (&rest args)
  "Alias \"diff\" to call Emacs `diff' function."
  (let ((orig-args (eshell-flatten-list args)))
    (if (or eshell-plain-diff-behavior
	    (not (and (eshell-interactive-output-p)
		      (not eshell-in-pipeline-p)
		      (not eshell-in-subcommand-p))))
	(throw 'eshell-replace-command
	       (eshell-parse-command "*diff" orig-args))
      (setq args (eshell-copy-list orig-args))
      (if (< (length args) 2)
	  (throw 'eshell-replace-command
		 (eshell-parse-command "*diff" orig-args)))
      (let ((old (car (last args 2)))
	    (new (car (last args)))
	    (config (current-window-configuration)))
	(if (= (length args) 2)
	    (setq args nil)
	  (setcdr (last args 3) nil))
	(with-current-buffer
	    (condition-case err
		(diff old new (eshell-flatten-and-stringify args))
	      (error
	       (throw 'eshell-replace-command
		      (eshell-parse-command "*diff" orig-args))))
	  (when (fboundp 'diff-mode)
	    (diff-mode)
	    (set (make-local-variable 'eshell-diff-window-config) config)
	    (local-set-key [?q] 'eshell-diff-quit)
	    (if (fboundp 'turn-on-font-lock-if-enabled)
		(turn-on-font-lock-if-enabled))))
	(other-window 1)
	(goto-char (point-min))
	nil))))

(defun eshell/locate (&rest args)
  "Alias \"locate\" to call Emacs `locate' function."
  (if (or eshell-plain-locate-behavior
	  (not (and (eshell-interactive-output-p)
		    (not eshell-in-pipeline-p)
		    (not eshell-in-subcommand-p)))
	  (and (stringp (car args))
	       (string-match "^-" (car args))))
      (throw 'eshell-replace-command
	     (eshell-parse-command "*locate" (eshell-flatten-list args)))
    (save-selected-window
      (let ((locate-history-list (list (car args))))
	(locate-with-filter (car args) (cadr args))))))

(defun eshell/occur (&rest args)