aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorOleh Krehel2015-10-16 14:45:22 +0200
committerOleh Krehel2015-10-16 14:45:53 +0200
commit3f24a31fb760537e9b9cc994e8431f045d526f4b (patch)
tree7a8f096e920d37bde0bf41e31f778b9faa9cc0e0 /lisp
parent7175459da149da7e46dc799796ad670eb122273d (diff)
downloademacs-3f24a31fb760537e9b9cc994e8431f045d526f4b.tar.gz
emacs-3f24a31fb760537e9b9cc994e8431f045d526f4b.zip
lisp/dired-aux.el (dired-shell-command): Fix compile warning
Diffstat (limited to 'lisp')
-rw-r--r--lisp/dired-aux.el19
-rw-r--r--lisp/dired.el2
2 files changed, 10 insertions, 11 deletions
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 7469eb96364..8c575c6b12e 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -792,16 +792,15 @@ On error, pop up the log buffer."
792 (let ((out-buffer " *dired-check-process output*")) 792 (let ((out-buffer " *dired-check-process output*"))
793 (with-current-buffer (get-buffer-create out-buffer) 793 (with-current-buffer (get-buffer-create out-buffer)
794 (erase-buffer) 794 (erase-buffer)
795 (setq res 795 (let ((res (process-file
796 (process-file 796 shell-file-name
797 shell-file-name 797 nil
798 nil 798 t
799 t 799 nil
800 nil 800 shell-command-switch
801 shell-command-switch 801 cmd)))
802 cmd))) 802 (unless (zerop res)
803 (unless (zerop res) 803 (pop-to-buffer out-buffer))))))
804 (pop-to-buffer out-buffer))))
805 804
806;; Commands that delete or redisplay part of the dired buffer. 805;; Commands that delete or redisplay part of the dired buffer.
807 806
diff --git a/lisp/dired.el b/lisp/dired.el
index 232abf67cc6..14c7f4bdf48 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -3896,7 +3896,7 @@ Ask means pop up a menu for the user to select one of copy, move or link."
3896 3896
3897;;; Start of automatically extracted autoloads. 3897;;; Start of automatically extracted autoloads.
3898 3898
3899;;;### (autoloads nil "dired-aux" "dired-aux.el" "9565afd70e820a750c6452d45776005d") 3899;;;### (autoloads nil "dired-aux" "dired-aux.el" "3921477843dc9d08d6896f07f90e8c6e")
3900;;; Generated autoloads from dired-aux.el 3900;;; Generated autoloads from dired-aux.el
3901 3901
3902(autoload 'dired-diff "dired-aux" "\ 3902(autoload 'dired-diff "dired-aux" "\