From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Joe Kelsey Newsgroups: gmane.emacs.devel Subject: Re: skeleton.el _ versus @, a new patch Date: 17 May 2003 18:31:48 -0700 Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: <1053221508.430.2.camel@zircon> References: <200303242005.h2OK57gr013285@rum.cs.yale.edu> <1048554010.20622.66.camel@zircon> <200303311740.h2VHeZNG017518@rum.cs.yale.edu> <1049242082.66437.15.camel@zircon> <200304020020.h320K4de023432@rum.cs.yale.edu> <1049245381.66437.33.camel@zircon> <20030403084549.2a5aca76.occitan@esperanto.org> <200304091626.h39GQlwc000430@rum.cs.yale.edu> <1050020736.419.11.camel@zircon> <200304112359.h3BNxpw5012335@rum.cs.yale.edu> <1050879051.74664.17.camel@zircon><1050975058.74664.30.camel@zircon> <1051199987.572.9.camel@zircon> <200304282151.h3SLpal0002635@rum.cs.yale.edu> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-l19uMcEC7QZ+58vTIVMR" X-Trace: main.gmane.org 1053221667 21103 80.91.224.249 (18 May 2003 01:34:27 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Sun, 18 May 2003 01:34:27 +0000 (UTC) Cc: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Sun May 18 03:34:25 2003 Return-path: Original-Received: from quimby.gnus.org ([80.91.224.244]) by main.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 19HD4D-0005UD-00 for ; Sun, 18 May 2003 03:34:25 +0200 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.12 #1 (Debian)) id 19HDDJ-0008IS-00 for ; Sun, 18 May 2003 03:43:49 +0200 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.10.13) id 19HD4g-0006Rb-02 for emacs-devel@quimby.gnus.org; Sat, 17 May 2003 21:34:54 -0400 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.10.13) id 19HD3F-0005aV-00 for emacs-devel@gnu.org; Sat, 17 May 2003 21:33:25 -0400 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.10.13) id 19HD2X-00050I-00 for emacs-devel@gnu.org; Sat, 17 May 2003 21:32:42 -0400 Original-Received: from dsl231-043-165.sea1.dsl.speakeasy.net ([216.231.43.165] helo=zircon.seattle.wa.us) by monty-python.gnu.org with smtp (Exim 4.10.13) id 19HD1k-0004dP-00 for emacs-devel@gnu.org; Sat, 17 May 2003 21:31:53 -0400 Original-Received: (qmail 1188 invoked from network); 18 May 2003 01:31:48 -0000 Original-Received: from localhost (HELO ?127.0.0.1?) (127.0.0.1) by localhost with SMTP; 18 May 2003 01:31:48 -0000 Original-To: rms@gnu.org In-Reply-To: X-Mailer: Ximian Evolution 1.2.4 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: Emacs development discussions. List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , Errors-To: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Xref: main.gmane.org gmane.emacs.devel:13960 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:13960 --=-l19uMcEC7QZ+58vTIVMR Content-Type: text/plain Content-Transfer-Encoding: 7bit On Tue, 2003-04-29 at 12:29, Richard Stallman wrote: > Could you send me the proper change, with change log entry and NEWS entry? > I will get it installed. Here is a diff for lisp/skeleton.el and a ChangeLog entry. /Joe --=-l19uMcEC7QZ+58vTIVMR Content-Disposition: attachment; filename=skeleton.el.diff Content-Type: text/plain; name=skeleton.el.diff; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit --- skeleton.el.orig Sat Jul 14 04:21:08 2001 +++ skeleton.el Wed May 7 08:56:30 2003 @@ -262,6 +262,8 @@ \\n go to next line and indent according to mode _ interesting point, interregion here + - interesting point, no interregion interaction, overrides + interesting point set by _ > indent line (or interregion if > _) according to major mode @ add position to `skeleton-positions' & do next ELEMENT iff previous moved point @@ -270,8 +272,8 @@ resume: skipped, continue here if quit is signaled nil skipped -After termination, point will be positioned at the first occurrence -of _ or @ or at the end of the inserted text. +After termination, point will be positioned at the last occurrence of - +or at the first occurrence of _ or at the end of the inserted text. Further elements can be defined via `skeleton-further-elements'. ELEMENT may itself be a SKELETON with an INTERACTOR. The user is prompted repeatedly for @@ -295,6 +297,13 @@ input initial input (string or cons with index) while reading str v1, v2 local variables for memorizing anything you want +Note that the internal skeleton processing modifies the first occurrence +of str in each skeleton into a lisp form to set str to the value of +`skeleton-read' called with the first skeleton list element. Thus, if +you intend to use the value of str in a complex lisp expression, it is +best to simply inert the value first and then use it in a quoted lisp +expression or one which returns nil (as in (progn (blah...) nil) ).. + When done with skeleton, but before going back to `_'-point call `skeleton-end-hook' if that is non-`nil'." (let ((skeleton-regions regions)) @@ -448,13 +457,14 @@ (end-of-line 0))) (or skeleton-point (setq skeleton-point (point))))) + ((eq element '-) + (setq skeleton-point (point))) ((eq element '&) (when skeleton-modified (pop skeleton))) ((eq element '|) (unless skeleton-modified (pop skeleton))) ((eq element '@) - (push (point) skeleton-positions) - (unless skeleton-point (setq skeleton-point (point)))) + (push (point) skeleton-positions)) ((eq 'quote (car-safe element)) (eval (nth 1 element))) ((or (stringp (car-safe element)) --=-l19uMcEC7QZ+58vTIVMR Content-Disposition: attachment; filename=ChangeLog Content-Type: text/plain; name=ChangeLog; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit 2003-05-07 Joe Kelsey * skeleton.el (skeleton-internal-1): Allow - as alternate interesting point marker and revert @ to just setting skeleton-positions. --=-l19uMcEC7QZ+58vTIVMR Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit _______________________________________________ Emacs-devel mailing list Emacs-devel@gnu.org http://mail.gnu.org/mailman/listinfo/emacs-devel --=-l19uMcEC7QZ+58vTIVMR--