From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.ciao.gmane.io!not-for-mail From: Tino Calancha Newsgroups: gmane.emacs.bugs Subject: bug#39280: 27.0.60; wdired-get-filename ignores first argument Date: Sat, 25 Jan 2020 21:05:05 +0100 Message-ID: <87k15fpaj2.fsf@calancha-pc.dy.bbexcite.jp> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="ciao.gmane.io:159.69.161.202"; logging-data="25497"; mail-complaints-to="usenet@ciao.gmane.io" To: 39280@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Jan 25 21:06:18 2020 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ivRhC-0006bH-6p for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 25 Jan 2020 21:06:18 +0100 Original-Received: from localhost ([::1]:57228 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ivRhB-0000gJ-Am for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 25 Jan 2020 15:06:17 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:50171) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ivRgy-0000cE-Ux for bug-gnu-emacs@gnu.org; Sat, 25 Jan 2020 15:06:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ivRgx-00044d-3b for bug-gnu-emacs@gnu.org; Sat, 25 Jan 2020 15:06:04 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:50378) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ivRgw-00042d-1l for bug-gnu-emacs@gnu.org; Sat, 25 Jan 2020 15:06:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ivRgv-0003p9-Om for bug-gnu-emacs@gnu.org; Sat, 25 Jan 2020 15:06:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Tino Calancha Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 25 Jan 2020 20:06:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 39280 X-GNU-PR-Package: emacs X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.157998272014649 (code B ref -1); Sat, 25 Jan 2020 20:06:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 25 Jan 2020 20:05:20 +0000 Original-Received: from localhost ([127.0.0.1]:56351 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ivRgF-0003oD-TW for submit@debbugs.gnu.org; Sat, 25 Jan 2020 15:05:20 -0500 Original-Received: from lists.gnu.org ([209.51.188.17]:57675) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ivRgD-0003o4-TJ for submit@debbugs.gnu.org; Sat, 25 Jan 2020 15:05:18 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:50031) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ivRgC-0008E2-GZ for bug-gnu-emacs@gnu.org; Sat, 25 Jan 2020 15:05:17 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ivRgB-0001Om-4C for bug-gnu-emacs@gnu.org; Sat, 25 Jan 2020 15:05:16 -0500 Original-Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:37358) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ivRgA-0001JY-QR for bug-gnu-emacs@gnu.org; Sat, 25 Jan 2020 15:05:15 -0500 Original-Received: by mail-wr1-x436.google.com with SMTP id w15so6152144wru.4 for ; Sat, 25 Jan 2020 12:05:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version; bh=t3jVgJ8tUMt3gnlXIOsNwYKHikmRWMeEuH/oJ7hXCHs=; b=Bizj2yYFr/KKokfKMNh+wVivKO/eMTL+WhcP/ipFXDYC47Bx8Af3QmX+YA1XYGnwoC FrYtLRmFypCneRaCNYL9699RUeXTjasf0Y2kUAvEA24Jhy8LB3kQAldb+fTklYyR/Bf6 XTxwWLbzvUy8vvQTMm1qKudUf4LX72jJ0L4lPfe8PfziBEwk82X2nS45eNmNewgJDMPr 5FsGbO4C/t3Dy3skHcDOuiA3qzqAyvAw0ZF3wbdqvm+mrQL2QwP3VpLf9V/p/DuYp/AW SjvmKbV+WBCw5tQNB7+LLwh5a7vllkXnpPmZL50EGw56CUW5KuQblA4JA+fe5NAcpRJe Pvfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=t3jVgJ8tUMt3gnlXIOsNwYKHikmRWMeEuH/oJ7hXCHs=; b=NexjqG9mzCJ2zTr2vvAZ7IR9jWwO+PeSwZGN9v0rxf8qNSbM+AegsNBfvkpPkEWY43 kiaQ7JXXAmTmYDLCuARjJWvWR+zHeq2b1dNVTKjzw2bXund13QOyJ6UCDvLW8qpNlgvL 2fLmY3Ez7XNFngShxUMblwhhJZ8mvf8OyxiIQJy/J/cgBaI1y3kvChqnxH3GNSnZF0xL yn5sMotEE0j+No9V0Kge05HaDiCfXnJiCDBxNddWQdJwYipESH0z/u517hDjlGu1ETLA WWZOTZxlHVYcGegREuaXESPtY0H/S/u1IUFn7s5+Blgq9hkGX+TfYgcTZjpOpttr2brn MlvA== X-Gm-Message-State: APjAAAWqCmnoOCwgNryGJs3X5u8nWcW7Hhvx6AJAuh5NIQv3FWZ4zi/p CA90lgDL2iyz3h3M30sO0qYQXz6T X-Google-Smtp-Source: APXvYqzCQX74Ka95Fvi0rMvX4RcI7HN/JrDY+xSV3mnNtE9r04/YNCUUH27cztVmyGu2B5WXXv/Vhg== X-Received: by 2002:adf:f990:: with SMTP id f16mr11997828wrr.185.1579982713008; Sat, 25 Jan 2020 12:05:13 -0800 (PST) Original-Received: from calancha-pc.dy.bbexcite.jp ([31.7.242.222]) by smtp.gmail.com with ESMTPSA id q124sm2992863wme.2.2020.01.25.12.05.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Jan 2020 12:05:12 -0800 (PST) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.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-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:175281 Archived-At: emacs -Q /tmp M-! touch foo RET g j foo RET C-x C-q M-: (wdired-get-filename 'local t) RET => "/tmp/foo" ;; Expected: "foo" --8<-----------------------------cut here---------------start------------->8--- commit 5f7e8975e741298718a4e05aa674873207cb56a6 Author: Tino Calancha Date: Sat Jan 25 21:03:53 2020 +0100 Fix bug in wdired-get-filename * lisp/wdired.el (wdired-get-filename): Acknowledge the first argument. * test/lisp/wdired-tests.el (wdired-test-bug39280): Add test. diff --git a/lisp/wdired.el b/lisp/wdired.el index d470e0a21b..23dc4b9ef5 100644 --- a/lisp/wdired.el +++ b/lisp/wdired.el @@ -344,7 +344,7 @@ wdired-get-filename ;; Don't unquote the old name, it wasn't quoted in the first place (and file (setq file (wdired-normalize-filename file (not old))))) (if (or no-dir old) - file + (if no-dir (file-relative-name file) file) (and file (> (length file) 0) (concat (dired-current-directory) file)))))) diff --git a/test/lisp/wdired-tests.el b/test/lisp/wdired-tests.el index baa547758e..3d5f504205 100644 --- a/test/lisp/wdired-tests.el +++ b/test/lisp/wdired-tests.el @@ -176,6 +176,22 @@ wdired-test-bug34915 (server-force-delete) (delete-directory test-dir t)))) +(ert-deftest wdired-test-bug39280 () + "Test for https://debbugs.gnu.org/39280." + (let* ((test-dir (make-temp-file "test-dir" 'dir)) + (fname "foo") + (full-fname (expand-file-name fname test-dir))) + (make-empty-file full-fname) + (let ((buf (find-file-noselect test-dir))) + (unwind-protect + (with-current-buffer buf + (dired-toggle-read-only) + (dolist (old '(t nil)) + (should (equal fname (wdired-get-filename 'nodir old))) + (should (equal full-fname (wdired-get-filename nil old)))) + (wdired-finish-edit)) + (if buf (kill-buffer buf)) + (delete-directory test-dir t))))) (provide 'wdired-tests) ;;; wdired-tests.el ends here --8<-----------------------------cut here---------------end--------------->8--- In GNU Emacs 27.0.60 (build 24, x86_64-pc-linux-gnu, GTK+ Version 3.24.5) of 2020-01-25 built on calancha-pc.dy.bbexcite.jp Repository revision: baca81e64141aed076fe088e7160f6e0d4a51c68 Repository branch: emacs-27 Windowing system distributor 'The X.Org Foundation', version 11.0.12004000 System Description: Debian GNU/Linux 10 (buster) Recent messages: For information about GNU Emacs and the GNU system, type C-h C-a. (Shell command succeeded with no output) Press C-c C-c when finished or C-c ESC to abort changes "/tmp/foo" Configured features: XPM JPEG TIFF GIF PNG RSVG SOUND GPM DBUS GSETTINGS GLIB NOTIFY INOTIFY ACL LIBSELINUX GNUTLS LIBXML2 FREETYPE HARFBUZZ M17N_FLT LIBOTF XFT ZLIB TOOLKIT_SCROLL_BARS GTK3 X11 XDBE XIM MODULES THREADS LIBSYSTEMD PDUMPER LCMS2 GMP