From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Kevin Rodgers Newsgroups: gmane.emacs.bugs Subject: auto-insert generates file names with concat instead of expand-file-name Date: Wed, 14 Jul 2004 12:04:21 -0600 Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Message-ID: <40F575A5.70501@yahoo.com> NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit X-Trace: sea.gmane.org 1089828665 26053 80.91.224.253 (14 Jul 2004 18:11:05 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Wed, 14 Jul 2004 18:11:05 +0000 (UTC) Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Jul 14 20:10:49 2004 Return-path: Original-Received: from lists.gnu.org ([199.232.76.165]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1BkoDQ-0002EG-00 for ; Wed, 14 Jul 2004 20:10:49 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1BkoFr-0003UA-JR for geb-bug-gnu-emacs@m.gmane.org; Wed, 14 Jul 2004 14:13:19 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1BkoF2-000351-FE for bug-gnu-emacs@gnu.org; Wed, 14 Jul 2004 14:12:28 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1BkoF0-00034N-BR for bug-gnu-emacs@gnu.org; Wed, 14 Jul 2004 14:12:28 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1BkoF0-00033u-8e for bug-gnu-emacs@gnu.org; Wed, 14 Jul 2004 14:12:26 -0400 Original-Received: from [199.232.41.8] (helo=mx20.gnu.org) by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168) (Exim 4.34) id 1BkoCH-0007hz-QZ for bug-gnu-emacs@gnu.org; Wed, 14 Jul 2004 14:09:38 -0400 Original-Received: from [132.239.1.61] (helo=mailbox9.ucsd.edu) by mx20.gnu.org with esmtp (Exim 4.34) id 1BkoAm-0002iV-Eq for bug-gnu-emacs@gnu.org; Wed, 14 Jul 2004 14:08:08 -0400 Original-Received: from Mail.FU-Berlin.DE (mail.fu-berlin.de [130.133.1.2]) by mailbox9.ucsd.edu (8.13.0.Alpha0/8.13.0.Alpha0) with ESMTP id i6EI4IUq063064 for ; Wed, 14 Jul 2004 11:04:19 -0700 (PDT) Original-Received: by Mail.FU-Berlin.DE (Exim 4.34) from curry.zedat.fu-berlin.de ([160.45.10.36]) for gnu-emacs-bug@moderators.isc.org with esmtp id <1Bko77-0003qs-Ma>; Wed, 14 Jul 2004 20:04:17 +0200 Original-Received: by Curry.ZEDAT.FU-Berlin.DE (Smail3.2.0.98) from news.uni-berlin.de with bsmtp id ; Wed, 14 Jul 2004 20:04:17 +0200 (MEST) Original-To: gnu-emacs-bug@moderators.isc.org Original-Path: not-for-mail Original-Newsgroups: gnu.emacs.bug Original-Lines: 45 X-Orig-X-Trace: news.uni-berlin.de 0cUiI1FK636XWYG0Sqe3JwGbDGhF8q5ds1ty1EYY6wB1LCk+g= User-Agent: Mozilla/5.0 (X11; U; SunOS i86pc; en-US; rv:0.9.4.1) Gecko/20020406 Netscape6/6.2.2 X-Accept-Language: en-us X-Spamscanner: mailbox9.ucsd.edu (v1.4 May 20 2004 13:55:33, 2.2/5.0 2.63) X-MailScanner: PASSED (v1.2.8 43408 i6EI4IUq063064 mailbox9.ucsd.edu) X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list 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 Xref: main.gmane.org gmane.emacs.bugs:8414 X-Report-Spam: http://spam.gmane.org/gmane.emacs.bugs:8414 *** emacs-21.3/lisp/autoinsert.el~ Fri Aug 2 11:56:49 2002 --- emacs-21.3/lisp/autoinsert.el Wed Jul 14 12:02:12 2004 *************** *** 233,239 **** ;; Now, if we found something, do it (and action (if (stringp action) ! (file-readable-p (concat auto-insert-directory action)) t) (if auto-insert-query (or (if (eq auto-insert-query 'function) --- 233,240 ---- ;; Now, if we found something, do it (and action (if (stringp action) ! (file-readable-p ! (expand-file-name action auto-insert-directory)) t) (if auto-insert-query (or (if (eq auto-insert-query 'function) *************** *** 244,250 **** (lambda (action) (if (stringp action) (if (file-readable-p ! (setq action (concat auto-insert-directory action))) (insert-file-contents action)) (save-window-excursion ;; make buffer visible before skeleton or function --- 245,252 ---- (lambda (action) (if (stringp action) (if (file-readable-p ! (setq action ! (expand-file-name action auto-insert-directory))) (insert-file-contents action)) (save-window-excursion ;; make buffer visible before skeleton or function -- Kevin Rodgers