aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/dired.el20
2 files changed, 15 insertions, 10 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 63a029be1f6..688b6a9e341 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12012-08-22 Martin Rudalics <rudalics@gmx.at>
2
3 * dired.el (dired-mark-remembered): Don't clobber point.
4 (Bug#11795)
5
12012-08-22 Glenn Morris <rgm@gnu.org> 62012-08-22 Glenn Morris <rgm@gnu.org>
2 7
3 * progmodes/bug-reference.el (bug-reference): New custom group. 8 * progmodes/bug-reference.el (bug-reference): New custom group.
diff --git a/lisp/dired.el b/lisp/dired.el
index 6684be3356c..6182e133726 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1331,16 +1331,16 @@ DIRED-FILENAME WINDOW-POINT)."
1331 "Mark all files remembered in ALIST. 1331 "Mark all files remembered in ALIST.
1332Each element of ALIST looks like (FILE . MARKERCHAR)." 1332Each element of ALIST looks like (FILE . MARKERCHAR)."
1333 (let (elt fil chr) 1333 (let (elt fil chr)
1334 (while alist 1334 (save-excursion
1335 (setq elt (car alist) 1335 (while alist
1336 alist (cdr alist) 1336 (setq elt (car alist)
1337 fil (car elt) 1337 alist (cdr alist)
1338 chr (cdr elt)) 1338 fil (car elt)
1339 (if (dired-goto-file fil) 1339 chr (cdr elt))
1340 (save-excursion 1340 (when (dired-goto-file fil)
1341 (beginning-of-line) 1341 (beginning-of-line)
1342 (delete-char 1) 1342 (delete-char 1)
1343 (insert chr)))))) 1343 (insert chr))))))
1344 1344
1345(defun dired-remember-hidden () 1345(defun dired-remember-hidden ()
1346 "Return a list of names of subdirs currently hidden." 1346 "Return a list of names of subdirs currently hidden."