aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Francoise2007-05-01 09:33:51 +0000
committerRomain Francoise2007-05-01 09:33:51 +0000
commitd7af463c596fbad9d3939b9831ed4ba125299800 (patch)
tree7acdea5e53e50852f9ba527981b426e134136c84
parent0f6da68b858c1f568a5648de96948740c22e63b4 (diff)
downloademacs-d7af463c596fbad9d3939b9831ed4ba125299800.tar.gz
emacs-d7af463c596fbad9d3939b9831ed4ba125299800.zip
Revert 2007-04-06 change.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/dired-x.el14
2 files changed, 16 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 29436b53eb3..4d8f0d81ebf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12007-05-01 Romain Francoise <romain@orebokech.com>
2
3 * dired-x.el: Revert 2007-04-06 change.
4
12007-04-30 Nick Roberts <nickrob@snap.net.nz> 52007-04-30 Nick Roberts <nickrob@snap.net.nz>
2 6
3 * progmodes/gud.el (gud-menu-map): Pdb can't handle SIGINT so 7 * progmodes/gud.el (gud-menu-map): Pdb can't handle SIGINT so
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index eecb1dbb709..75b6456a5cf 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -45,8 +45,12 @@
45;; (add-hook 'dired-load-hook 45;; (add-hook 'dired-load-hook
46;; (function (lambda () 46;; (function (lambda ()
47;; (load "dired-x") 47;; (load "dired-x")
48;; ;; Set variables here. For example: 48;; ;; Set global variables here. For example:
49;; ;; (setq dired-guess-shell-gnutar "gtar") 49;; ;; (setq dired-guess-shell-gnutar "gtar")
50;; )))
51;; (add-hook 'dired-mode-hook
52;; (function (lambda ()
53;; ;; Set buffer-local variables here. For example:
50;; ;; (dired-omit-mode 1) 54;; ;; (dired-omit-mode 1)
51;; ))) 55;; )))
52;; 56;;
@@ -1123,11 +1127,17 @@ You can set this variable in your ~/.emacs. For example, to add rules for
1123 :group 'dired-x 1127 :group 'dired-x
1124 :type '(alist :key-type regexp :value-type (repeat sexp))) 1128 :type '(alist :key-type regexp :value-type (repeat sexp)))
1125 1129
1130(defcustom dired-guess-shell-case-fold-search t
1131 "If non-nil, `dired-guess-shell-alist-default' and
1132`dired-guess-shell-alist-user' are matched case-insensitively."
1133 :group 'dired-x
1134 :type 'boolean)
1135
1126(defun dired-guess-default (files) 1136(defun dired-guess-default (files)
1127 "Guess a shell commands for FILES. Return command or list of commands. 1137 "Guess a shell commands for FILES. Return command or list of commands.
1128See `dired-guess-shell-alist-user'." 1138See `dired-guess-shell-alist-user'."
1129 1139
1130 (let* ((case-fold-search t) 1140 (let* ((case-fold-search dired-guess-shell-case-fold-search)
1131 ;; Prepend the user's alist to the default alist. 1141 ;; Prepend the user's alist to the default alist.
1132 (alist (append dired-guess-shell-alist-user 1142 (alist (append dired-guess-shell-alist-user
1133 dired-guess-shell-alist-default)) 1143 dired-guess-shell-alist-default))