procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge from trunk

Browse source
This commit is contained in:
Joakim Verona 2013-09-13 19:40:40 +02:00
commit 9523ac3289
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2013-09-13 Glenn Morris <rgm@gnu.org>
* dired-x.el (dired-guess-shell-alist-user): Doc fix.
(dired-guess-default): Make `file' available in the env. (Bug#15363)
2013-09-13 Dmitry Antipov <dmantipov@yandex.ru>
* frame.el (x-focus-frame): Mark as declared in frame.c.

7
lisp/dired-x.el
View file

@ -1047,7 +1047,8 @@ Each element of this list looks like
(REGEXP COMMAND...)
where each COMMAND can either be a string or a Lisp expression that evaluates
to a string. If several COMMANDs are given, the first one will be the default
to a string. This expression can access the file name as the variable `file'.
If several COMMANDs are given, the first one will be the default
and the rest will be added temporarily to the history and can be retrieved
with \\[previous-history-element] (M-p) .
@ -1105,8 +1106,8 @@ See `dired-guess-shell-alist-user'."
;; Return commands or nil if flist is still non-nil.
;; Evaluate the commands in order that any logical testing will be done.
(if (cdr cmds)
(delete-dups (mapcar #'eval cmds))
(eval (car cmds))))) ; single command
(delete-dups (mapcar (lambda (cmd) (eval cmd `((file . ,file)))) cmds))
(eval (car cmds) `((file . ,file)))))) ; single command
(defun dired-guess-shell-command (prompt files)
"Ask user with PROMPT for a shell command, guessing a default from FILES."