aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorStephen Berman2011-02-27 17:31:20 -0800
committerGlenn Morris2011-02-27 17:31:20 -0800
commitedb574802f7a99c95b4faaf5144239ff3784acea (patch)
tree82b0ec9375c4d649b5f699105b7021da6d5e0e97 /lisp
parent3e478a7cef8293a23a019861b26eb9db9766ab34 (diff)
downloademacs-edb574802f7a99c95b4faaf5144239ff3784acea.tar.gz
emacs-edb574802f7a99c95b4faaf5144239ff3784acea.zip
dired-aux fix for bug#8131.
* lisp/dired-aux.el (dired-update-file-line): Fix 2010-11-09 change.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/dired-aux.el6
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b577bacae64..5c44f82a2ff 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12011-02-28 Stephen Berman <stephen.berman@gmx.net>
2
3 * dired-aux.el (dired-update-file-line):
4 Fix 2010-11-09 change. (Bug#8131)
5
12011-02-28 Eli Zaretskii <eliz@gnu.org> 62011-02-28 Eli Zaretskii <eliz@gnu.org>
2 7
3 * international/mule-cmds.el (set-default-coding-systems): Use the 8 * international/mule-cmds.el (set-default-coding-systems): Use the
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 986c9edfd2d..c533c81be0e 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -1025,9 +1025,9 @@ See Info node `(emacs)Subdir switches' for more details."
1025 ;; Keeps any marks that may be present in column one (doing this 1025 ;; Keeps any marks that may be present in column one (doing this
1026 ;; here is faster than with dired-add-entry's optional arg). 1026 ;; here is faster than with dired-add-entry's optional arg).
1027 ;; Does not update other dired buffers. Use dired-relist-entry for that. 1027 ;; Does not update other dired buffers. Use dired-relist-entry for that.
1028 (let ((char (following-char)) 1028 (let* ((opoint (line-beginning-position))
1029 (opoint (line-beginning-position)) 1029 (char (char-after opoint))
1030 (buffer-read-only)) 1030 (buffer-read-only))
1031 (delete-region opoint (progn (forward-line 1) (point))) 1031 (delete-region opoint (progn (forward-line 1) (point)))
1032 (if file 1032 (if file
1033 (progn 1033 (progn