From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#11795: 24.1.50; wdired: C-c C-c loses marks and positions of renamed files Date: Fri, 23 Nov 2012 09:30:31 +0200 Organization: JURTA Message-ID: <87boeohj3c.fsf@mail.jurta.org> References: <87r4t1sk9o.fsf@web.de> <87sjdhily5@ch.ristopher.com> <06AF8E7E174A4F768ADB2B901755EA3C@us.oracle.com> <87sj95ad3l.fsf@mail.jurta.org> <87vce0xah6.fsf@web.de> <87a9v85l3p.fsf@mail.jurta.org> <87pq44rs4z.fsf@web.de> <87ip9wf08t.fsf@mail.jurta.org> <87txsiuhkl.fsf@mail.jurta.org> <87zk296v7m.fsf@web.de> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1353656085 19263 80.91.229.3 (23 Nov 2012 07:34:45 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 23 Nov 2012 07:34:45 +0000 (UTC) Cc: 11795@debbugs.gnu.org To: Michael Heerdegen Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Nov 23 08:34:54 2012 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Tbnmo-0000Vh-Eg for geb-bug-gnu-emacs@m.gmane.org; Fri, 23 Nov 2012 08:34:54 +0100 Original-Received: from localhost ([::1]:59605 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tbnmd-0008E8-NC for geb-bug-gnu-emacs@m.gmane.org; Fri, 23 Nov 2012 02:34:43 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:45627) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tbnma-0008Ds-5s for bug-gnu-emacs@gnu.org; Fri, 23 Nov 2012 02:34:41 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TbnmY-0006Z2-Ah for bug-gnu-emacs@gnu.org; Fri, 23 Nov 2012 02:34:40 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:51864) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TbnmY-0006Yt-6q for bug-gnu-emacs@gnu.org; Fri, 23 Nov 2012 02:34:38 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1Tbnnu-00040w-FD for bug-gnu-emacs@gnu.org; Fri, 23 Nov 2012 02:36:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 23 Nov 2012 07:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 11795 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 11795-submit@debbugs.gnu.org id=B11795.135365610315347 (code B ref 11795); Fri, 23 Nov 2012 07:36:02 +0000 Original-Received: (at 11795) by debbugs.gnu.org; 23 Nov 2012 07:35:03 +0000 Original-Received: from localhost ([127.0.0.1]:33878 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Tbnmx-0003zU-9M for submit@debbugs.gnu.org; Fri, 23 Nov 2012 02:35:03 -0500 Original-Received: from ps18281.dreamhost.com ([69.163.218.105]:40681 helo=ps18281.dreamhostps.com) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Tbnmu-0003z6-VL for 11795@debbugs.gnu.org; Fri, 23 Nov 2012 02:35:01 -0500 Original-Received: from localhost (ps18281.dreamhostps.com [69.163.218.105]) by ps18281.dreamhostps.com (Postfix) with ESMTP id 6FBEC451CDCF; Thu, 22 Nov 2012 23:33:34 -0800 (PST) In-Reply-To: <87zk296v7m.fsf@web.de> (Michael Heerdegen's message of "Fri, 23 Nov 2012 01:04:13 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (x86_64-pc-linux-gnu) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:67338 Archived-At: > 1. When I prepend a letter z to the first file in a buffer, so that it > will be under the last files after reverting, and I hit C-c C-c, then > point is at another file afterwards. This was an issue of the original > report. This is not a regression, so it could be fixed in the trunk in the same way as for `wdired-old-marks', i.e. to store the original value returned from `dired-save-positions', changing original filenames to renamed filenames in the returned value, and calling `dired-restore-positions' with the new value after `revert-buffer'. A simple patch below does this. > 2. If renamed files are also visible in another dired buffer, they > just disappear there. That makes no sense. The problem where other Dired buffers are not updated in `wdired-finish-edit' is not a regression too. WDired worked this way from its first version. If you want, you could try to rewrite WDired so that it correctly maintains consistency with renamed files without using `revert-buffer' and by using `dired-add-file' like `dired-do-rename' does. Your previous patch doesn't do this correctly - it inserts duplicate file lines, so Dired displays two versions of the same file, but fortunately `revert-buffer' fixes this mess. Instead of this, much simpler would be to keep the current design of WDired that uses `revert-buffer' to maintain consistency with renames. Then a simpler fix would be to call `revert-buffer' in all other Dired buffers that display renamed files by using (dired-fun-in-all-buffers dired-directory nil (function revert-buffer)) This patch for the trunk demonstrates how these problems could be fixed. Do you see more problems with this approach? === modified file 'lisp/wdired.el' --- lisp/wdired.el 2012-11-21 10:29:30 +0000 +++ lisp/wdired.el 2012-11-23 07:28:39 +0000 @@ -194,6 +194,7 @@ (defvar wdired-mode-hook nil (defvar wdired-col-perm) ;; Column where the permission bits start (defvar wdired-old-content) (defvar wdired-old-point) +(defvar wdired-old-positions) (defvar wdired-old-marks) (defun wdired-mode () @@ -237,6 +238,8 @@ (defun wdired-change-to-wdired-mode () (buffer-substring (point-min) (point-max))) (set (make-local-variable 'wdired-old-marks) (dired-remember-marks (point-min) (point-max))) + (set (make-local-variable 'wdired-old-positions) + (dired-save-positions)) (set (make-local-variable 'wdired-old-point) (point)) (set (make-local-variable 'query-replace-skip-read-only) t) (add-hook 'isearch-filter-predicates 'wdired-isearch-filter-read-only nil t) @@ -406,6 +409,8 @@ (defun wdired-finish-edit () (when mark (push (cons (substitute-in-file-name file-new) mark) wdired-old-marks)))) + (when (equal (cadr (car wdired-old-positions)) file-old) + (setcar (cdr (car wdired-old-positions)) file-new)) (push (cons file-old (substitute-in-file-name file-new)) files-renamed)))) (forward-line -1))) @@ -423,9 +428,12 @@ (defun wdired-finish-edit () (= (length files-renamed) 1)) (setq dired-directory (cdr (car files-renamed)))) ;; Re-sort the buffer. - (revert-buffer) + (if (stringp dired-directory) + (dired-fun-in-all-buffers dired-directory nil (function revert-buffer)) + (revert-buffer)) (let ((inhibit-read-only t)) - (dired-mark-remembered wdired-old-marks))) + (dired-mark-remembered wdired-old-marks)) + (dired-restore-positions wdired-old-positions)) (let ((inhibit-read-only t)) (remove-text-properties (point-min) (point-max) '(old-name nil end-name nil old-link nil