aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann1999-10-20 13:55:59 +0000
committerGerd Moellmann1999-10-20 13:55:59 +0000
commit42afed7ca43ace4fcb7e2a5eb48aaf007866ae24 (patch)
tree413c7b6f62279723758406ecb333b5d765183ea6
parent1bac2ebbe234d5f3a902ba0ed0bf3c562e200758 (diff)
downloademacs-42afed7ca43ace4fcb7e2a5eb48aaf007866ae24.tar.gz
emacs-42afed7ca43ace4fcb7e2a5eb48aaf007866ae24.zip
(dired-move-to-filename-regexp): Fix long comment lines
that were split so that part of the comment appeared as Lisp code.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/dired.el9
2 files changed, 8 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4ac1340ff7b..7da51a8e0c1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
11999-10-20 Gerd Moellmann <gerd@gnu.org>
2
3 * dired.el (dired-move-to-filename-regexp): Fix long comment lines
4 that were split so that part of the comment appeared as Lisp code.
5
11999-10-20 Vinicius Jose Latorre <vinicius@cpqd.com.br> 61999-10-20 Vinicius Jose Latorre <vinicius@cpqd.com.br>
2 7
3 * ps-bdf.el: Doc fix. 8 * ps-bdf.el: Doc fix.
diff --git a/lisp/dired.el b/lisp/dired.el
index 52d945f1238..895c95fc78e 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1410,14 +1410,11 @@ DIR must be a directory name, not a file name."
1410 s "\\(" HH:MM "\\|" s "?" yyyy "\\|" yyyy s 1410 s "\\(" HH:MM "\\|" s "?" yyyy "\\|" yyyy s
1411"\\)")) 1411"\\)"))
1412 (japanese (concat mm k s dd k s "\\(" s HH:MM "\\|" yyyy k "\\)"))) 1412 (japanese (concat mm k s dd k s "\\(" s HH:MM "\\|" yyyy k "\\)")))
1413 ;; The "[0-9]" below requires the previous column to end in a 1413 ;; The "[0-9]" below requires the previous column to end in a digit.
1414digit.
1415 ;; This avoids recognizing `1 may 1997' as a date in the line: 1414 ;; This avoids recognizing `1 may 1997' as a date in the line:
1416 ;; -r--r--r-- 1 may 1997 1168 Oct 19 16:49 README 1415 ;; -r--r--r-- 1 may 1997 1168 Oct 19 16:49 README
1417 ;; The ".*" below finds the last match if there are multiple 1416 ;; The ".*" below finds the last match if there are multiple matches.
1418matches. 1417 ;; This avoids recognizing `jservice 10 1024' as a date in the line:
1419 ;; This avoids recognizing `jservice 10 1024' as a date in the
1420line:
1421 ;; drwxr-xr-x 3 jservice 10 1024 Jul 2 1997 esg-host 1418 ;; drwxr-xr-x 3 jservice 10 1024 Jul 2 1997 esg-host
1422 (concat ".*[0-9]" s "\\(" western "\\|" japanese "\\)" s)) 1419 (concat ".*[0-9]" s "\\(" western "\\|" japanese "\\)" s))
1423 "Regular expression to match up to the file name in a directory listing. 1420 "Regular expression to match up to the file name in a directory listing.