From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Tino Calancha Newsgroups: gmane.emacs.devel Subject: file-name-as-directory: Update doc. string Date: Mon, 12 Sep 2016 16:04:09 +0900 (JST) Message-ID: NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; format=flowed; charset=US-ASCII X-Trace: blaine.gmane.org 1473664000 3599 195.159.176.226 (12 Sep 2016 07:06:40 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 12 Sep 2016 07:06:40 +0000 (UTC) User-Agent: Alpine 2.20 (DEB 67 2015-01-07) Cc: tino.calancha@gmail.com To: Emacs developers Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Sep 12 09:06:37 2016 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bjLK3-0008T0-P1 for ged-emacs-devel@m.gmane.org; Mon, 12 Sep 2016 09:06:31 +0200 Original-Received: from localhost ([::1]:40707 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjLK1-00043v-TO for ged-emacs-devel@m.gmane.org; Mon, 12 Sep 2016 03:06:29 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42535) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjLIs-0003mZ-2b for emacs-devel@gnu.org; Mon, 12 Sep 2016 03:05:19 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bjLIn-00042h-P6 for emacs-devel@gnu.org; Mon, 12 Sep 2016 03:05:16 -0400 Original-Received: from mail-pf0-f195.google.com ([209.85.192.195]:32974) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjLIn-00042U-KE for emacs-devel@gnu.org; Mon, 12 Sep 2016 03:05:13 -0400 Original-Received: by mail-pf0-f195.google.com with SMTP id 128so7671856pfb.0 for ; Mon, 12 Sep 2016 00:05:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:date:to:cc:subject:message-id:user-agent:mime-version; bh=xgKJGgzK9AinQnbMYG42uaOhv++ZnWyLWCQNbaIqBRs=; b=beNGBRoTzR3N3dhyi1Vr7AC+GGTV+izwYb/lTDWrHOZ88VgOBq0U8FWN5x6fKHSlKf J1o/0ZMSXVPU8dpimvfxkiQ2M1WeInuZhHJ2/Xcvzo+I35t2/p959lCIATNSFgnHLPWV HxYiYUy+84Yxm+C4IGXt9y+wziOHkqocA5XMWFoX+0Ylk8m9HQ4uY3uY6XccIkPHT875 kVqPGMzaXkKmpKBkAR3n9nfGOVHgDLPfJZzpvxm6MoCbVlZB+JAsFugG4k/Cx8XSdlAG 6l8apA1um5/ZopclpSiok01+iYmd3xWwrCYBsdsIlsRmW6hKX/zz8IHSCU1itCjIdaS0 +GZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:date:to:cc:subject:message-id:user-agent :mime-version; bh=xgKJGgzK9AinQnbMYG42uaOhv++ZnWyLWCQNbaIqBRs=; b=NbPiWVeoOD1fVk2uEiW5IMbSWsUFPsA/kTwOg3QQUpOTBvWP6RzxXFljnwQfYxOkGz X9NU+9fU4nuC1JKZyptuhvx1JDxtTlboJKGUzXn33DpHpRWh5lIJYlF+gbc7nS5shEFp j7JmH58cNyNqyYwhKoPNlv6KjpNWJN8ZPa6ceU5nYs3/XKkwnI639tIoU5Y5ggXVwyTo dNcmjroWEqbsYcMYNlIp564v/VUtRE+tqByFarkpEeNRFy2zDdZCnHY93cg770fyrkYo xYFNOZzGygljIwDm7fNqqF2EKBo607au/KrULbswPUB3SGxk3MxMIAxlYo6i/ixIm7id fy3Q== X-Gm-Message-State: AE9vXwOqlbShRo2rJbUm+kVv8FWhEjdKFhhZp5I4jIs7zoMXcRhzPQjFXNXu8pgLqyyREA== X-Received: by 10.98.138.201 with SMTP id o70mr31376616pfk.55.1473663852835; Mon, 12 Sep 2016 00:04:12 -0700 (PDT) Original-Received: from calancha-pc (57.92.100.220.dy.bbexcite.jp. [220.100.92.57]) by smtp.gmail.com with ESMTPSA id ci9sm16239987pad.34.2016.09.12.00.04.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Sep 2016 00:04:12 -0700 (PDT) X-Google-Original-From: Tino Calancha X-X-Sender: calancha@calancha-pc X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.192.195 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:207375 Archived-At: Hi, Doc. string for `file-name-as-directory' is out of date; this doc. string suggests that expand-file-name only accepts a directory name as its second argument. It is explicitely mentioned in expand-file-name doc. string that the second argument can be a directory file name as well. This is just a doc fix: should go to emacs-25 branch? Regards, Tino ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; >From 2e5dc72a2c6f354ece75b552c3f145d7b9d7367a Mon Sep 17 00:00:00 2001 From: Tino Calancha Date: Mon, 12 Sep 2016 15:54:45 +0900 Subject: [PATCH] file-name-as-directory: Doc fix * src/fileio.c (file-name-as-directory): expand-file-name accepts as its secong argument both, the directory name and a directory's file name. --- src/fileio.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/fileio.c b/src/fileio.c index c3b2be7..638ccf8 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -508,8 +508,7 @@ DEFUN ("file-name-as-directory", Ffile_name_as_directory, doc: /* Return a string representing the file name FILE interpreted as a directory. This operation exists because a directory is also a file, but its name as a directory is different from its name as a file. -The result can be used as the value of `default-directory' -or passed as second argument to `expand-file-name'. +The result can be used as the value of `default-directory'. For a Unix-syntax file name, just appends a slash. */) (Lisp_Object file) { -- 2.9.3 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; In GNU Emacs 25.1.1 (x86_64-pc-linux-gnu, GTK+ Version 3.21.5) of 2016-09-12 built on calancha-pc Repository revision: ea0f750e5c1baa21c3ae1b22364662915c2b038f