aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2011-07-11 15:46:46 +0200
committerLars Magne Ingebrigtsen2011-07-11 15:46:46 +0200
commiteea84fe52e76f84b02df004e31c638a3fb2ab6e6 (patch)
treefbe569708e76c0d5d2ff394ad25bae047e2dbefd
parent8a93078b2442ac562f37203b27b8e7735fb4263c (diff)
downloademacs-eea84fe52e76f84b02df004e31c638a3fb2ab6e6.tar.gz
emacs-eea84fe52e76f84b02df004e31c638a3fb2ab6e6.zip
(dired-guess-shell-alist-user): Clarify the example a bit
Fixes: debbugs:2030
-rw-r--r--lisp/ChangeLog1
-rw-r--r--lisp/dired-x.el11
2 files changed, 6 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0245c0beb9d..a767eab06f4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,7 @@
3 * dired-x.el (dired-guess-default): Remove duplicate shell command 3 * dired-x.el (dired-guess-default): Remove duplicate shell command
4 entries (bug#2028). 4 entries (bug#2028).
5 (dired-guess-default): Fix grammar in doc string (bug#2028). 5 (dired-guess-default): Fix grammar in doc string (bug#2028).
6 (dired-guess-shell-alist-user): Clarify the example a bit (bug#2030).
6 7
7 * subr.el (remove-duplicates): New conveniency function. 8 * subr.el (remove-duplicates): New conveniency function.
8 9
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index e1a38847fa5..a341e4f07a1 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -1056,12 +1056,11 @@ You can set this variable in your ~/.emacs. For example, to add rules for
1056`.foo' and `.bar' files, write 1056`.foo' and `.bar' files, write
1057 1057
1058 \(setq dired-guess-shell-alist-user 1058 \(setq dired-guess-shell-alist-user
1059 (list (list \"\\\\.foo\\\\'\" \"FOO-COMMAND\");; fixed rule 1059 '((\"\\\\.foo\\\\'\" \"FOO-COMMAND\")
1060 ;; possibly more rules ... 1060 (\"\\\\.bar\\\\'\"
1061 (list \"\\\\.bar\\\\'\";; rule with condition test 1061 (if condition
1062 '(if condition 1062 \"BAR-COMMAND-1\"
1063 \"BAR-COMMAND-1\" 1063 \"BAR-COMMAND-2\"))))"
1064 \"BAR-COMMAND-2\")))\)"
1065 :group 'dired-x 1064 :group 'dired-x
1066 :type '(alist :key-type regexp :value-type (repeat sexp))) 1065 :type '(alist :key-type regexp :value-type (repeat sexp)))
1067 1066