aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2013-08-06 03:03:08 +0200
committerJuanma Barranquero2013-08-06 03:03:08 +0200
commit1d237bbae7fe9bb69708760abc9ae435513a0465 (patch)
tree2d127d633fa131591fab262b105fe95e3f5c8b2c
parentdc6c0edad789a8aab129ae12b8f064d0e912cca7 (diff)
downloademacs-1d237bbae7fe9bb69708760abc9ae435513a0465.tar.gz
emacs-1d237bbae7fe9bb69708760abc9ae435513a0465.zip
lisp/dired.el (dired-insert-directory): Revert change in 2013-06-21T12:24:37Z!lekktu@gmail.com.
Fixes: debbugs:15028
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/dired.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ad7d82c30d7..c3f908b83ae 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12013-08-06 Juanma Barranquero <lekktu@gmail.com>
2
3 * dired.el (dired-insert-directory): Revert change in 2013-06-21T12:24:37Z!lekktu@gmail.com
4 to use looking-at-p instead of looking-at. (Bug#15028)
5
12013-08-05 Stefan Monnier <monnier@iro.umontreal.ca> 62013-08-05 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 Revert introduction of isearch-filter-predicates (bug#14714). 8 Revert introduction of isearch-filter-predicates (bug#14714).
diff --git a/lisp/dired.el b/lisp/dired.el
index c44cf574889..48f1b463f4a 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1225,7 +1225,7 @@ see `dired-use-ls-dired' for more details.")
1225 (save-excursion 1225 (save-excursion
1226 (goto-char opoint) 1226 (goto-char opoint)
1227 (when (and (or hdr wildcard) 1227 (when (and (or hdr wildcard)
1228 (not (and (looking-at-p "^ \\(.*\\):$") 1228 (not (and (looking-at "^ \\(.*\\):$")
1229 (file-name-absolute-p (match-string 1))))) 1229 (file-name-absolute-p (match-string 1)))))
1230 ;; Note that dired-build-subdir-alist will replace the name 1230 ;; Note that dired-build-subdir-alist will replace the name
1231 ;; by its expansion, so it does not matter whether what we insert 1231 ;; by its expansion, so it does not matter whether what we insert