aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Rudalics2008-01-26 17:23:56 +0000
committerMartin Rudalics2008-01-26 17:23:56 +0000
commite31720013490deeb31fb429e5beb18ce63147a1f (patch)
tree922f9c2f10fa02c05e33387f4465d8acf2545486
parent9db3bfaeaf0fb657f5caffd1d5e1977e432f5555 (diff)
downloademacs-e31720013490deeb31fb429e5beb18ce63147a1f.tar.gz
emacs-e31720013490deeb31fb429e5beb18ce63147a1f.zip
(wdired-get-filename): Change `(1+ beg)' to `beg' so
that the filename end is found even when the filename is empty. Fixes error and spurious newlines when marking files for deletion.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/wdired.el6
2 files changed, 11 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0b0a7dca4de..1e67505cb70 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12008-01-26 Phil Sung <psung@mit.edu> (tiny change)
2
3 * wdired.el (wdired-get-filename): Change `(1+ beg)' to `beg' so
4 that the filename end is found even when the filename is empty.
5 Fixes error and spurious newlines when marking files for deletion.
6
12008-01-26 Martin Rudalics <rudalics@gmx.at> 72008-01-26 Martin Rudalics <rudalics@gmx.at>
2 8
3 * subr.el (find-tag-default): Simplify using exclusively 9 * subr.el (find-tag-default): Simplify using exclusively
diff --git a/lisp/wdired.el b/lisp/wdired.el
index 287e2119c8d..36725db5db5 100644
--- a/lisp/wdired.el
+++ b/lisp/wdired.el
@@ -323,7 +323,11 @@ non-nil means return old filename."
323 (unless (eq beg end) 323 (unless (eq beg end)
324 (if old 324 (if old
325 (setq file (get-text-property beg 'old-name)) 325 (setq file (get-text-property beg 'old-name))
326 (setq end (next-single-property-change (1+ beg) 'end-name)) 326 ;; In the following form changed `(1+ beg)' to `beg' so that
327 ;; the filename end is found even when the filename is empty.
328 ;; Fixes error and spurious newlines when marking files for
329 ;; deletion.
330 (setq end (next-single-property-change beg 'end-name))
327 (setq file (buffer-substring-no-properties (1+ beg) end))) 331 (setq file (buffer-substring-no-properties (1+ beg) end)))
328 (and file (setq file (wdired-normalize-filename file)))) 332 (and file (setq file (wdired-normalize-filename file))))
329 (if (or no-dir old) 333 (if (or no-dir old)