From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ivan Shmakov Newsgroups: gmane.emacs.bugs Subject: bug#19140: dir-locals-collect-variables discrepancy in handling non-file buffers Date: Fri, 21 Nov 2014 16:12:52 +0000 Message-ID: <87zjbky1kr.fsf@violet.siamics.net> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1416586467 25182 80.91.229.3 (21 Nov 2014 16:14:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 21 Nov 2014 16:14:27 +0000 (UTC) To: 19140@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Nov 21 17:14:21 2014 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 1Xrqqg-0005Cy-Le for geb-bug-gnu-emacs@m.gmane.org; Fri, 21 Nov 2014 17:14:18 +0100 Original-Received: from localhost ([::1]:41329 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xrqqg-0004FT-5G for geb-bug-gnu-emacs@m.gmane.org; Fri, 21 Nov 2014 11:14:18 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44186) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrqqX-0004FC-N5 for bug-gnu-emacs@gnu.org; Fri, 21 Nov 2014 11:14:14 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XrqqS-0003fF-Kk for bug-gnu-emacs@gnu.org; Fri, 21 Nov 2014 11:14:09 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:43848) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrqqQ-0003ey-Qj for bug-gnu-emacs@gnu.org; Fri, 21 Nov 2014 11:14:04 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1XrqqQ-0007Ak-7Y for bug-gnu-emacs@gnu.org; Fri, 21 Nov 2014 11:14:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Ivan Shmakov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 21 Nov 2014 16:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 19140 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: submit@debbugs.gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.141658638727497 (code B ref -1); Fri, 21 Nov 2014 16:14:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 21 Nov 2014 16:13:07 +0000 Original-Received: from localhost ([127.0.0.1]:41061 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XrqpW-00079Q-GF for submit@debbugs.gnu.org; Fri, 21 Nov 2014 11:13:06 -0500 Original-Received: from fely.am-1.org ([78.47.74.50]:41736) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XrqpT-00079H-H5 for submit@debbugs.gnu.org; Fri, 21 Nov 2014 11:13:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=siamics.net; s=a2013295; h=Content-Type:MIME-Version:Message-ID:Date:Sender:Subject:To:From; bh=8QV9ZoqEQd1QSnxqifYoY8XgHk+6z7dIYomhyiqhNtc=; b=rGCdoNw8MK980BTVwLQ7GCXu14ubH7fG8hz9HZH0+6YM14tgtGzSwNN9J1dFeZMVXCk8FLg6s5iTvBpoyulY2z06hKN3CUirdzS5HPefdlyQBQwqJ7HP0RJOjMujToG/UoumkmI+QTR0EkVnBWIxavpVUJhj17bf4nYKRXIjMGQ=; Original-Received: from [2a02:2560:6d4:26ca::1:1d] (helo=violet.siamics.net) by fely.am-1.org with esmtps (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1XrqpQ-0002EM-LI for submit@debbugs.gnu.org; Fri, 21 Nov 2014 16:13:00 +0000 Original-Received: from localhost ([::1] helo=violet.siamics.net) by violet.siamics.net with esmtps (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1XrqpJ-0007Pe-AA for submit@debbugs.gnu.org; Fri, 21 Nov 2014 23:12:53 +0700 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.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:96382 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Package: emacs Severity: minor Please consider the patch MIMEd. * lisp/files.el (dir-locals-collect-variables): Use default-directory in place of the file name while working on non-file buffers (as hack-dir-local-variables already does.) The issue I observe is as follows. First, I create ~/foo and ~/foo/ru directories, and a ~/foo/.dir-locals.el file like: ((nil (ispell-local-dictionary . "esperanto")) ("ru" (nil (ispell-local-dictionary . "russian")))) Then: (with-temp-buffer (cd "~/foo/ru/") (hack-dir-local-variables-non-file-buffer) ;; . dir-local-variables-alist) The result is '((ispell-local-dictionary . "esperanto")), contrary to the expected '((=E2=80=A6 . "russian")). This does not happen for buffers associated with files: (with-current-buffer (find-file-noselect "~/foo/ru/bar") (hack-dir-local-variables) ;; . dir-local-variables-alist) Reading the code suggests that dir-locals-collect-variables fails to handle the (stringp key) case properly when =E2=80=98file-name=E2= =80=99 is nil, which is what my patch is intended to fix. --=20 FSF associate member #7257 np. Conclusion =E2=80=94 Apocalyptica =E2=80= =A6 B6A0 230E 334A --=-=-= Content-Type: text/diff Content-Disposition: inline --- a/lisp/files.el +++ b/lisp/files.el @@ -3567,8 +3569,10 @@ (defun dir-locals-collect-variables (class-variables root variables) "Collect entries from CLASS-VARIABLES into VARIABLES. ROOT is the root directory of the project. Return the new variables list." - (let* ((file-name (buffer-file-name)) + (let* ((file-name (or (buffer-file-name) + ;; handle non-file buffers, too + default-directory)) (sub-file-name (if file-name ;; FIXME: Why not use file-relative-name? (substring file-name (length root))))) --=-=-=--