changeset 80837:6b8593097d76

Merge from emacs--rel--22: lisp/dired-x.el: Revert 2007-04-06 change. Patches applied: * emacs--rel--22 (patch 4-5) - Update from CVS 2007-05-01 Romain Francoise <romain@orebokech.com> * lisp/dired-x.el: Revert 2007-04-06 change. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-723
author Miles Bader <miles@gnu.org>
date Tue, 01 May 2007 09:55:06 +0000
parents aa8228dcb143 (current diff) 6f7d1cf40bad (diff)
children 62f4d9a434ab
files admin/FOR-RELEASE lisp/ChangeLog
diffstat 3 files changed, 16 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/admin/FOR-RELEASE	Tue May 01 08:15:56 2007 +0000
+++ b/admin/FOR-RELEASE	Tue May 01 09:55:06 2007 +0000
@@ -42,21 +42,10 @@
 OpenBSD compilation works on i386.
 http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00932.html
 
-** bojohan+news@dd.chalmers.se, April 23: delete-overlay causes recentering
-(This is now the same as the spurious scrolling bug.)
-http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00514.html
-
 ** Spurious redisplay bug not fixed.
 http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00443.html
 http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00732.html
 
-** finish fixing locate.el
-http://lists.gnu.org/archive/html/emacs-pretest-bug/2007-04/msg00437.html
-
-** angeli@caeruleus.net, April 23: Excessive refontification when setting
-  jit-lock-context-unfontify-pos
-http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00993.html
-
 ** michael.ewe@arcor.de, Apr 24: 22.0.98  not starting on Solaris 10/I386
 http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg01113.html
 
@@ -64,10 +53,6 @@
   Gives test case for problem that a dialog box blocks redisplay.
 http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00951.html
 
-** hiroshi.fujishima@gmail.com, Apr 27: emacs-22.0.99 configure problem
-http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg01452.html
-  this is probably an issue for autoconf, rather than Emacs
-
 ** C mode fontification took 50 seconds
 http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg01460.html
 
--- a/lisp/ChangeLog	Tue May 01 08:15:56 2007 +0000
+++ b/lisp/ChangeLog	Tue May 01 09:55:06 2007 +0000
@@ -1,3 +1,7 @@
+2007-05-01  Romain Francoise  <romain@orebokech.com>
+
+	* dired-x.el: Revert 2007-04-06 change.
+
 2007-04-29  Stephen Berman  <Stephen.Berman@gmx.net>
 
 	* find-dired.el (find-dired-filter): Propertize all text down to eob.
--- a/lisp/dired-x.el	Tue May 01 08:15:56 2007 +0000
+++ b/lisp/dired-x.el	Tue May 01 09:55:06 2007 +0000
@@ -45,8 +45,12 @@
 ;; (add-hook 'dired-load-hook
 ;;           (function (lambda ()
 ;;                       (load "dired-x")
-;;                       ;; Set variables here.  For example:
+;;                       ;; Set global variables here.  For example:
 ;;                       ;; (setq dired-guess-shell-gnutar "gtar")
+;;                       )))
+;; (add-hook 'dired-mode-hook
+;;           (function (lambda ()
+;;                       ;; Set buffer-local variables here.  For example:
 ;;                       ;; (dired-omit-mode 1)
 ;;                       )))
 ;;
@@ -1123,11 +1127,17 @@
   :group 'dired-x
   :type '(alist :key-type regexp :value-type (repeat sexp)))
 
+(defcustom dired-guess-shell-case-fold-search t
+  "If non-nil, `dired-guess-shell-alist-default' and
+`dired-guess-shell-alist-user' are matched case-insensitively."
+  :group 'dired-x
+  :type 'boolean)
+
 (defun dired-guess-default (files)
   "Guess a shell commands for FILES.  Return command or list of commands.
 See `dired-guess-shell-alist-user'."
 
-  (let* ((case-fold-search t)
+  (let* ((case-fold-search dired-guess-shell-case-fold-search)
          ;; Prepend the user's alist to the default alist.
          (alist (append dired-guess-shell-alist-user
                         dired-guess-shell-alist-default))