[xemacs-base] Synch skeleton.el to GNU Emacs 22.1.1

xemacs-base Due to a report of a totally egregious bug in `skeleton-pair-insert-maybe' (which makes it clear that nobody's actually using that function :-), I decided to synch skeleton.el. The patch is attached. I need to do a little testing (so far I've only made sure it compiles with some warnings that are basically unavoidable due to use of dynamic scoping), but will probably commit in a day or three. Skeletons are used in the following packages and modes: ada mmm-mode prog-modes/verilog-mode.el sgml/sgml-mode.el sh-script sml-mode texinfo text-modes/css-mode.el xemacs-devel/find-func.el and possibly by Gnus (I think that Gnus actually defines its own skeleton facility and won't be affected by this, but I need to check). When the xemacs-base package gets prereleased with the new skeleton code, I would really appreciate it if heavy users of the above modes would install the prerelease and test it out. You can follow the progress and/or make comments in issue554. ? skeleton.gnu.el cvs server: Diffing . Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xemacs-base/ChangeLog,v retrieving revision 1.213 diff -u -r1.213 ChangeLog --- ChangeLog 23 Jul 2008 18:12:32 -0000 1.213 +++ ChangeLog 8 Aug 2009 16:20:59 -0000 ＠＠ -0,0 +1,76 ＠＠ +2009-08-07 Stephen Turnbull <stephen(a)xemacs.org&gt; + + * skeleton.el: Synch to GNU Emacs 22.1.1. + + Interface changes: + UI: -1 now wraps around region even if not active. + Skips self-insert when called from abbrev. + Matches end of docstring, not end of word in docstring, + when appending to docstring. + API: `skeleton-insert' gets new formatting spec operators. + + (XEmacs changes): + Some docstrings improved over GNU version. Use active-region-p + instead of (and transient-mark-mode mark-active). + (Copyright): + (Author address): + (FSF address): + Update. + + (skeleton-transformation-function): + (skeleton-filter-function): + (skeleton-pair-filter-function): + Rename from similar function. Add 'variable-interactive property. + (skeleton-transformation): + (skeleton-filter): + (skeleton-pair-filter): + Renamed. defvaralias for backward compatibility. + (skeleton-pair-filter-function): + (skeleton-transformation-function): + Update initializer. + (mirror-mode): + Use -function variants of renamed functions. + + (skeleton-end-newline): + (skeleton-positions): + (skeleton-edebug-spec): + (skeleton-pair-default-alist): + New variables. + (skeleton-abbrev-cleanup): + Abolished variable. + (skeleton-end-hook): + Respect it, and document it. + + (define-skeleton): + Declare edebug spec. Skip self-insert when called from abbrev. + Match end of docstring, not end of word in docstring, when + appending to docstring. -1 now wraps around region even if not + active. + (skeleton-proxy-new): + Completely reimplement. + (skeleton-insert): + Add new formatting spec operators. Completely reimplement. + (skeleton-read): + Better formal argument name. Substantial reimplementation. + (skeleton-internal-list): + Clarify implementation. + (skeleton-internal-1): + Completely reimplemented. + + (local-variables-section): + Commented out. + (skeleton-pair-insert-maybe): + Use skeleton-pair-default-alist. Completely reimplement. + + (define-skeleton): + (skeleton-autowrap): + (skeleton-internal-list): + (skeleton-newline-indent-rigidly): + (skeleton-pair-insert-maybe): + (skeleton-read): + (skeleton-untabify): + Improve docstring and/or comments. + Unquote nil. Americanize spelling (for ease of future synchs to GNU). + (style): + Fix various lisp-mnt.el style defects. + Index: skeleton.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xemacs-base/skeleton.el,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 skeleton.el --- skeleton.el 14 Jan 1998 06:32:20 -0000 1.1.1.1 +++ skeleton.el 8 Aug 2009 16:20:59 -0000 ＠＠ -1,7 +1,9 ＠＠ ;;; skeleton.el --- Lisp language extension for writing statement skeletons -;; Copyright (C) 1993, 1994, 1995 by Free Software Foundation, Inc. -;; Author: Daniel.Pfeiffer(a)Informatik.START.dbp.de, fax (+49 69) 7588-2389 +;; Copyright (C) 1993, 1994, 1995, 1996, 2001, 2002, 2003, +;; 2004, 2005, 2006, 2007 Free Software Foundation, Inc. + +;; Author: Daniel Pfeiffer <occitan(a)esperanto.org&gt; ;; Maintainer: FSF ;; Keywords: extensions, abbrev, languages, tools ＠＠ -19,10 +21,10 ＠＠ ;; You should have received a copy of the GNU General Public License ;; along with XEmacs; see the file COPYING. If not, write to the Free -;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -;; 02111-1307, USA. +;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +;; MA 02110-1301, USA. -;;; Synched up with: FSF 19.34. +;;; Synched up with: GNU 22.1.1. ;;; Commentary: ＠＠ -39,45 +41,49 ＠＠ ;; page 3: mirror-mode, an example for setting up paired insertion -(defvar skeleton-transformation nil +(defvar skeleton-transformation-function 'identity "*If non-nil, function applied to literal strings before they are inserted. It should take strings and characters and return them transformed, or nil which means no transformation. Typical examples might be `upcase' or `capitalize'.") +(defvaralias 'skeleton-transformation 'skeleton-transformation-function) ; this should be a fourth argument to defvar -(put 'skeleton-transformation 'variable-interactive +(put 'skeleton-transformation-function 'variable-interactive "aTransformation function: ") - (defvar skeleton-autowrap t - "Controls wrapping behaviour of functions created with `define-skeleton'. -When the region is visible (due to `transient-mark-mode' or marking a region -with the mouse) and this is non-`nil' and the function was called without an -explicit ARG, then the ARG defaults to -1, i.e. wrapping around the visible -region. - -We will probably delete this variable in a future Emacs version -unless we get a substantial number of complaints about the auto-wrap -feature.") + "If non-nil, skeletons may \"wrap around\" the region. +If the region is visible \(due to `zmacs-regions' or marking a region with +the mouse), this variable is non-nil, and the skeleton function was called +with null ARG, then ARG defaults to -1, wrapping around the visible region. + +GNU Emacs plans to delete this variable in a future Emacs version, and +if so XEmacs will follow suit.") + +(defvar skeleton-end-newline t + "If non-nil, make sure that the skeleton inserted ends with a newline. +This just influences the way the default `skeleton-end-hook' behaves.") (defvar skeleton-end-hook (lambda () - (or (eolp) (newline-and-indent))) + (or (eolp) (not skeleton-end-newline) (newline-and-indent))) "Hook called at end of skeleton but before going to point of interest. -By default this moves out anything following to next line. +By default this moves out anything following to next line, + unless `skeleton-end-newline' is set to nil. The variables `v1' and `v2' are still set when calling this.") ;;;###autoload -(defvar skeleton-filter 'identity +(defvar skeleton-filter-function 'identity "Function for transforming a skeleton proxy's aliases' variable value.") +(defvaralias 'skeleton-filter 'skeleton-filter-function) (defvar skeleton-untabify t - "When non-`nil' untabifies when deleting backwards with element -ARG.") + "When non-nil untabifies when deleting backwards with element -ARG.") (defvar skeleton-newline-indent-rigidly nil - "When non-`nil', indent rigidly under current line for element `\\n'. + "When non-nil, indent rigidly under current line for element `\\n'. Else use mode's `indent-line-function'.") (defvar skeleton-further-elements () ＠＠ -94,13 +100,14 ＠＠ "*Replacement for %s in prompts of recursive subskeletons.") -(defvar skeleton-abbrev-cleanup nil - "Variable used to delete the character that led to abbrev expansion.") - -;; XEmacs -- won't byte compile without the wrapper -(eval-and-compile - (defvar skeleton-debug nil - "*If non-nil `define-skeleton' will override previous definition.")) +;; XEmacs -- won't byte compile without eval-and-compile wrapper? +(defvar skeleton-debug nil + "*If non-nil `define-skeleton' will override previous definition.") + +(defvar skeleton-positions nil + "List of positions marked with ＠, after skeleton insertion. +The list describes the most recent skeleton insertion, and its elements +are integer buffer positions in the reverse order of the insertion order.") ;; reduce the number of compiler warnings (defvar skeleton) ＠＠ -108,223 +115,177 ＠＠ (defvar skeleton-point) (defvar skeleton-regions) +(def-edebug-spec skeleton-edebug-spec + ([&or null stringp (stringp &rest stringp) [[&not atom] def-form]] + &rest &or "n" "_" "-" ">" "＠" "&" "!" "resume:" + ("quote" def-form) skeleton-edebug-spec def-form)) ;;;###autoload (defmacro define-skeleton (command documentation &rest skeleton) - "Define a user-configurable COMMAND that enters a statement skeleton. -DOCUMENTATION is that of the command, while the variable of the same name, -which contains the skeleton, has a documentation to that effect. -INTERACTOR and ELEMENT ... are as defined under `skeleton-insert'." + "Define a configurable COMMAND that inserts and completes a skeleton. +DOCUMENTATION describes COMMAND. +SKELETON is as defined under `skeleton-insert'." + (declare (debug (&define name stringp skeleton-edebug-spec))) (if skeleton-debug (set command skeleton)) `(progn + ;; Tell self-insert-command that this function, if called by an + ;; abbrev, should cause the self-insert to be skipped. + (put ',command 'no-self-insert t) (defun ,command (&optional str arg) ,(concat documentation - (if (string-match "\n\\>" documentation) + (if (string-match "\n\\'" documentation) "" "\n") "\n" - "This is a skeleton command (see `skeleton-insert'). + "This is a skeleton command (see `skeleton-insert'). Normally the skeleton text is inserted at point, with nothing \"inside\". If there is a highlighted region, the skeleton text is wrapped around the region text. A prefix argument ARG says to wrap the skeleton around the next ARG words. +A prefix argument of -1 says to wrap around region, even if not highlighted. A prefix argument of zero says to wrap around zero words---that is, nothing. -This is a way of overiding the use of a highlighted region.") +This is a way of overriding the use of a highlighted region.") (interactive "*P\nP") (skeleton-proxy-new ',skeleton str arg)))) ;;;###autoload (defun skeleton-proxy-new (skeleton &optional str arg) - "Insert skeleton defined by variable of same name (see `skeleton-insert'). + "Insert SKELETON. Prefix ARG allows wrapping around words or regions (see `skeleton-insert'). If no ARG was given, but the region is visible, ARG defaults to -1 depending on `skeleton-autowrap'. An ARG of M-0 will prevent this just for once. This command can also be an abbrev expansion (3rd and 4th columns in \\[edit-abbrevs] buffer: \"\" command-name). - -When called as a function, optional first argument STR may also be a string -which will be the value of `str' whereas the skeleton's interactor is then -ignored." - (interactive "*P\nP") - (setq skeleton (funcall skeleton-filter skeleton)) - (if (not skeleton) - (if (memq this-command '(self-insert-command - skeleton-pair-insert-maybe - expand-abbrev)) - (setq buffer-undo-list (primitive-undo 1 buffer-undo-list))) - (skeleton-insert skeleton - (if (setq skeleton-abbrev-cleanup - (or (eq this-command 'self-insert-command) - (eq this-command - 'skeleton-pair-insert-maybe))) - () - ;; Pretend C-x a e passed its prefix arg to us - (if (or arg current-prefix-arg) - (prefix-numeric-value (or arg - current-prefix-arg)) - (and skeleton-autowrap - (or (eq last-command 'mouse-drag-region) - (and (boundp 'transient-mark-mode) - (boundp 'mark-active) - transient-mark-mode mark-active)) - -1))) - (if (stringp str) - str)) - (and skeleton-abbrev-cleanup - (setq skeleton-abbrev-cleanup (point)) - (add-hook 'post-command-hook 'skeleton-abbrev-cleanup nil t)))) -;; This command isn't meant to be called, only it's aliases with meaningful -;; names are. -;;;###autoload -(defun skeleton-proxy (&optional str arg) - "Insert skeleton defined by variable of same name (see `skeleton-insert'). -Prefix ARG allows wrapping around words or regions (see `skeleton-insert'). -If no ARG was given, but the region is visible, ARG defaults to -1 depending -on `skeleton-autowrap'. An ARG of M-0 will prevent this just for once. -This command can also be an abbrev expansion (3rd and 4th columns in -\\[edit-abbrevs] buffer: \"\" command-name). - -When called as a function, optional first argument STR may also be a string -which will be the value of `str' whereas the skeleton's interactor is then -ignored." - (interactive "*P\nP") - (let ((function (nth 1 (backtrace-frame 1)))) - (if (eq function 'nth) ; uncompiled Lisp function - (setq function (nth 1 (backtrace-frame 5))) - (if (eq function 'byte-code) ; tracing byte-compiled function - (setq function (nth 1 (backtrace-frame 2))))) - (if (not (setq function (funcall skeleton-filter (symbol-value function)))) - (if (memq this-command '(self-insert-command - skeleton-pair-insert-maybe - expand-abbrev)) - (setq buffer-undo-list (primitive-undo 1 buffer-undo-list))) - (skeleton-insert function - (if (setq skeleton-abbrev-cleanup - (or (eq this-command 'self-insert-command) - (eq this-command - 'skeleton-pair-insert-maybe))) - () - ;; Pretend C-x a e passed its prefix arg to us - (if (or arg current-prefix-arg) - (prefix-numeric-value (or arg - current-prefix-arg)) - (and skeleton-autowrap - (or (eq last-command 'mouse-drag-region) - (and (boundp 'transient-mark-mode) - (boundp 'mark-active) - transient-mark-mode mark-active)) - -1))) - (if (stringp str) - str)) - (and skeleton-abbrev-cleanup - (setq skeleton-abbrev-cleanup (point)) - (add-hook 'post-command-hook 'skeleton-abbrev-cleanup nil t))))) - - -(defun skeleton-abbrev-cleanup (&rest list) - "Value for `post-command-hook' to remove char that expanded abbrev." - (if (integerp skeleton-abbrev-cleanup) - (progn - (delete-region skeleton-abbrev-cleanup (point)) - (setq skeleton-abbrev-cleanup nil) - (remove-hook 'post-command-hook 'skeleton-abbrev-cleanup t)))) +Optional second argument STR may also be a string which will be the value +of `str' whereas the skeleton's interactor is then ignored." + (skeleton-insert (funcall skeleton-filter-function skeleton) + ;; Pretend C-x a e passed its prefix arg to us + (if (or arg current-prefix-arg) + (prefix-numeric-value (or arg current-prefix-arg)) + (and skeleton-autowrap + (or (eq last-command 'mouse-drag-region) + ;; XEmacs change from transient-mark-mode. + (region-active-p)) + ;; XEmacs change from transient-mark-mode. + ;; Deactivate the region, in case one of the + ;; elements of the skeleton is sensitive + ;; to such situations (e.g. it is itself a + ;; skeleton). + (progn (zmacs-deactivate-region) + -1))) + (if (stringp str) + str)) + ;; Return non-nil to tell expand-abbrev that expansion has happened. + ;; Otherwise the no-self-insert is ignored. + t) ;;;###autoload -(defun skeleton-insert (skeleton &optional skeleton-regions str) +(defun skeleton-insert (skeleton &optional regions str) "Insert the complex statement skeleton SKELETON describes very concisely. -With optional third REGIONS wrap first interesting point (`_') in skeleton -around next REGIONS words, if REGIONS is positive. If REGIONS is negative, -wrap REGIONS preceding interregions into first REGIONS interesting positions -\(successive `_'s) in skeleton. An interregion is the stretch of text between -two contiguous marked points. If you marked A B C [] (where [] is the cursor) -in alphabetical order, the 3 interregions are simply the last 3 regions. But -if you marked B A [] C, the interregions are B-A, A-[], []-C. - -Optional fourth STR is the value for the variable `str' within the skeleton. -When this is non-`nil' the interactor gets ignored, and this should be a valid -skeleton element. +With optional second argument REGIONS, wrap first interesting point +\(`_') in skeleton around next REGIONS words, if REGIONS is positive. +If REGIONS is negative, wrap REGIONS preceding interregions into first +REGIONS interesting positions \(successive `_'s) in skeleton. + +An interregion is the stretch of text between two contiguous marked +points. If you marked A B C [] (where [] is the cursor) in +alphabetical order, the 3 interregions are simply the last 3 regions. +But if you marked B A [] C, the interregions are B-A, A-[], []-C. + +The optional third argument STR, if specified, is the value for the +variable `str' within the skeleton. When this is non-nil, the +interactor gets ignored, and this should be a valid skeleton element. SKELETON is made up as (INTERACTOR ELEMENT ...). INTERACTOR may be nil if not needed, a prompt-string or an expression for complex read functions. If ELEMENT is a string or a character it gets inserted (see also -`skeleton-transformation'). Other possibilities are: +`skeleton-transformation-function'). Other possibilities are: \\n go to next line and indent according to mode - _ interesting point, interregion here, point after termination + _ interesting point, interregion here + - interesting point, no interregion interaction, overrides + interesting point set by _ - & do next ELEMENT if previous moved point - | do next ELEMENT if previous didn't move point + ＠ add position to `skeleton-positions' + & do next ELEMENT iff previous moved point + | do next ELEMENT iff previous didn't move point -num delete num preceding characters (see `skeleton-untabify') resume: skipped, continue here if quit is signaled nil skipped +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 different inputs. The SKELETON is processed as often as the user enters a non-empty string. \\[keyboard-quit] terminates skeleton insertion, but continues after `resume:' and positions at `_' if any. If INTERACTOR in such a subskeleton is a prompt-string which contains a \".. %s ..\" it is -formatted with `skeleton-subprompt'. Such an INTERACTOR may also a list of +formatted with `skeleton-subprompt'. Such an INTERACTOR may also be a list of strings with the subskeleton being repeated once for each string. -Quoted Lisp expressions are evaluated evaluated for their side-effect. +Quoted Lisp expressions are evaluated for their side-effects. Other Lisp expressions are evaluated and the value treated as above. -Note that expressions may not return `t' since this implies an +Note that expressions may not return t since this implies an endless loop. Modes can define other symbols by locally setting them to any valid skeleton element. The following local variables are available: str first time: read a string according to INTERACTOR then: insert previously read string once more - help help-form during interaction with the user or `nil' + help help-form during interaction with the user or nil input initial input (string or cons with index) while reading str v1, v2 local variables for memorizing anything you want When done with skeleton, but before going back to `_'-point call -`skeleton-end-hook' if that is non-`nil'." - (and skeleton-regions - (setq skeleton-regions - (if (> skeleton-regions 0) - (list (point-marker) - (save-excursion (forward-word skeleton-regions) - (point-marker))) - (setq skeleton-regions (- skeleton-regions)) - ;; copy skeleton-regions - 1 elements from `mark-ring' - (let ((l1 (cons (mark-marker) mark-ring)) - (l2 (list (point-marker)))) - (while (and l1 (> skeleton-regions 0)) - (setq l2 (cons (car l1) l2) - skeleton-regions (1- skeleton-regions) - l1 (cdr l1))) - (sort l2 '<)))) - (goto-char (car skeleton-regions)) - (setq skeleton-regions (cdr skeleton-regions))) - (let ((beg (point)) - skeleton-modified skeleton-point resume: help input v1 v2) - (unwind-protect - (eval `(let ,skeleton-further-elements - (skeleton-internal-list skeleton str))) - (run-hooks 'skeleton-end-hook) - (sit-for 0) - (or (pos-visible-in-window-p beg) - (progn - (goto-char beg) - (recenter 0))) - (if skeleton-point - (goto-char skeleton-point))))) +`skeleton-end-hook' if that is non-nil." + (let ((skeleton-regions regions)) + (and skeleton-regions + (setq skeleton-regions + (if (> skeleton-regions 0) + (list (copy-marker (point) t) + (save-excursion (forward-word skeleton-regions) + (point-marker))) + (setq skeleton-regions (- skeleton-regions)) + ;; copy skeleton-regions - 1 elements from `mark-ring' + (let ((l1 (cons (mark-marker) mark-ring)) + (l2 (list (copy-marker (point) t)))) + (while (and l1 (> skeleton-regions 0)) + (push (copy-marker (pop l1) t) l2) + (setq skeleton-regions (1- skeleton-regions))) + (sort l2 '<)))) + (goto-char (car skeleton-regions)) + (setq skeleton-regions (cdr skeleton-regions))) + (let ((beg (point)) + skeleton-modified skeleton-point resume: help input v1 v2) + (setq skeleton-positions nil) + (unwind-protect + (eval `(let ,skeleton-further-elements + (skeleton-internal-list skeleton str))) + (run-hooks 'skeleton-end-hook) + (sit-for 0) + (or (pos-visible-in-window-p beg) + (progn + (goto-char beg) + (recenter 0))) + (if skeleton-point + (goto-char skeleton-point)))))) -(defun skeleton-read (str &optional initial-input recursive) +(defun skeleton-read (prompt &optional initial-input recursive) "Function for reading a string from the minibuffer within skeletons. -PROMPT may contain a `%s' which will be replaced by `skeleton-subprompt'. -If non-`nil' second arg INITIAL-INPUT or variable `input' is a string or -cons with index to insert before reading. If third arg RECURSIVE is non-`nil' + +PROMPT must be a string or a form that evaluates to a string. +It may contain a `%s' which will be replaced by `skeleton-subprompt'. +If non-nil second arg INITIAL-INPUT or variable `input' is a string or +cons with index to insert before reading. If third arg RECURSIVE is non-nil i.e. we are handling the iterator of a subskeleton, returns empty string if user didn't modify input. While reading, the value of `minibuffer-help-form' is variable `help' if that -is non-`nil' or a default string." +is non-nil or a default string." (let ((minibuffer-help-form (or (if (boundp 'help) (symbol-value 'help)) (if recursive "\ As long as you provide input you will insert another subskeleton. ＠＠ -335,7 +296,7 ＠＠ If you quit, the current subskeleton is removed as far as it has been entered. No more of the skeleton will be inserted, except maybe for a syntactically necessary termination." - "\ + "\ You are inserting a skeleton. Standard text gets inserted into the buffer automatically, and you are prompted to fill in the variable parts."))) (eolp (eolp))) ＠＠ -343,41 +304,43 ＠＠ (or eolp (open-line 1)) (unwind-protect - (setq str (if (stringp str) - (read-string (format str skeleton-subprompt) - (setq initial-input - (or initial-input - (symbol-value 'input)))) - (eval str))) + (setq prompt (if (stringp prompt) + (read-string (format prompt skeleton-subprompt) + (setq initial-input + (or initial-input + (symbol-value 'input)))) + (eval prompt))) (or eolp (delete-char 1)))) (if (and recursive - (or (null str) - (string= str "") - (equal str initial-input) - (equal str (car-safe initial-input)))) + (or (null prompt) + (string= prompt "") + (equal prompt initial-input) + (equal prompt (car-safe initial-input)))) (signal 'quit t) - str)) + prompt)) (defun skeleton-internal-list (skeleton &optional str recursive) (let* ((start (save-excursion (beginning-of-line) (point))) (column (current-column)) - (line (buffer-substring start - (save-excursion (end-of-line) (point)))) + (line (buffer-substring start (line-end-position))) opoint) (or str (setq str `(setq str (skeleton-read ',(car skeleton) nil ,recursive)))) + (when (and (eq (cadr skeleton) '\n) (not recursive) + (save-excursion (skip-chars-backward " \t") (bolp))) + (setq skeleton (cons nil (cons '> (cddr skeleton))))) (while (setq skeleton-modified (eq opoint (point)) opoint (point) skeleton (cdr skeleton)) (condition-case quit - (skeleton-internal-1 (car skeleton)) + (skeleton-internal-1 (car skeleton) nil recursive) (quit (if (eq (cdr quit) 'recursive) (setq recursive 'quit skeleton (memq 'resume: skeleton)) - ;; remove the subskeleton as far as it has been shown - ;; the subskeleton shouldn't have deleted outside current line + ;; Remove the subskeleton as far as it has been shown + ;; the subskeleton shouldn't have deleted outside current line. (end-of-line) (delete-region start (point)) (insert line) ＠＠ -391,93 +354,106 ＠＠ (signal 'quit 'recursive) recursive)) - -(defun skeleton-internal-1 (element &optional literal) - (cond ((or (integerp element) - (char-or-string-p element)) - (if (and (integerp element) ; -num - (< element 0)) - (if skeleton-untabify - (backward-delete-char-untabify (- element)) - (delete-backward-char (- element))) - (insert-before-markers (if (and skeleton-transformation - (not literal)) - (funcall skeleton-transformation element) - element)))) - ((eq element '\n) ; actually (eq '\n 'n) - (if (and skeleton-regions - (eq (nth 1 skeleton) '_)) - (progn - (or (eolp) - (newline)) - (indent-region (point) (car skeleton-regions) nil)) - (if skeleton-newline-indent-rigidly - (indent-to (prog1 (current-indentation) - (newline))) - (newline) - (indent-according-to-mode)))) - ((eq element '>) - (if (and skeleton-regions - (eq (nth 1 skeleton) '_)) - (indent-region (point) (car skeleton-regions) nil) - (indent-according-to-mode))) - ((eq element '_) - (if skeleton-regions - (progn - (goto-char (car skeleton-regions)) - (setq skeleton-regions (cdr skeleton-regions)) - (and (<= (current-column) (current-indentation)) - (eq (nth 1 skeleton) '\n) - (end-of-line 0))) - (or skeleton-point - (setq skeleton-point (point))))) - ((eq element '&) - (if skeleton-modified - (setq skeleton (cdr skeleton)))) - ((eq element '|) - (or skeleton-modified - (setq skeleton (cdr skeleton)))) - ((eq 'quote (car-safe element)) - (eval (nth 1 element))) - ((or (stringp (car-safe element)) - (consp (car-safe element))) - (if (symbolp (car-safe (car element))) - (while (skeleton-internal-list element nil t)) - (setq literal (car element)) - (while literal - (skeleton-internal-list element (car literal)) - (setq literal (cdr literal))))) - ((null element)) - ((skeleton-internal-1 (eval element) t)))) - - +(defun skeleton-internal-1 (element &optional literal recursive) + (cond + ((char-or-string-p element) + (if (and (integerp element) ; -num + (< element 0)) + (if skeleton-untabify + (backward-delete-char-untabify (- element)) + (delete-backward-char (- element))) + (insert (if (not literal) + (funcall skeleton-transformation-function element) + element)))) + ((or (eq element '\n) ; actually (eq '\n 'n) + ;; The sequence `> \n' is handled specially so as to indent the first + ;; line after inserting the newline (to get the proper indentation). + (and (eq element '>) (eq (nth 1 skeleton) '\n) (pop skeleton))) + (let ((pos (if (eq element '>) (point)))) + (cond + ((and skeleton-regions (eq (nth 1 skeleton) '_)) + (or (eolp) (newline)) + (if pos (save-excursion (goto-char pos) (indent-according-to-mode))) + (indent-region (line-beginning-position) + (car skeleton-regions) nil)) + ;; \n as last element only inserts \n if not at eol. + ((and (null (cdr skeleton)) (not recursive) (eolp)) + (if pos (indent-according-to-mode))) + (skeleton-newline-indent-rigidly + (let ((pt (point))) + (newline) + (indent-to (save-excursion + (goto-char pt) + (if pos (indent-according-to-mode)) + (current-indentation))))) + (t (if pos (reindent-then-newline-and-indent) + (newline) + (indent-according-to-mode)))))) + ((eq element '>) + (if (and skeleton-regions (eq (nth 1 skeleton) '_)) + (indent-region (line-beginning-position) + (car skeleton-regions) nil) + (indent-according-to-mode))) + ((eq element '_) + (if skeleton-regions + (progn + (goto-char (pop skeleton-regions)) + (and (<= (current-column) (current-indentation)) + (eq (nth 1 skeleton) '\n) + (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)) + ((eq 'quote (car-safe element)) + (eval (nth 1 element))) + ((and (consp element) + (or (stringp (car element)) (listp (car element)))) + ;; Don't forget: `symbolp' is also true for nil. + (if (symbolp (car-safe (car element))) + (while (and (skeleton-internal-list element nil t) + ;; If the interactor is nil, don't infinite loop. + (car element))) + (setq literal (car element)) + (while literal + (skeleton-internal-list element (car literal)) + (setq literal (cdr literal))))) + ((null element)) + (t (skeleton-internal-1 (eval element) t recursive)))) + ;; Maybe belongs into simple.el or elsewhere -;###autoload -(define-skeleton local-variables-section - "Insert a local variables section. Use current comment syntax if any." - (completing-read "Mode: " obarray - (lambda (symbol) - (if (commandp symbol) - (string-match "-mode$" (symbol-name symbol)))) - t) - '(save-excursion - (if (re-search-forward page-delimiter nil t) - (error "Not on last page."))) - comment-start "Local Variables:" comment-end \n - comment-start "mode: " str - & -5 | '(kill-line 0) & -1 | comment-end \n - ( (completing-read (format "Variable, %s: " skeleton-subprompt) - obarray - (lambda (symbol) - (or (eq symbol 'eval) - (user-variable-p symbol))) - t) - comment-start str ": " - (read-from-minibuffer "Expression: " nil read-expression-map nil - 'read-expression-history) | _ - comment-end \n) - resume: - comment-start "End:" comment-end \n) +;; ;;;###autoload +;; (define-skeleton local-variables-section +;; "Insert a local variables section. Use current comment syntax if any." +;; (completing-read "Mode: " obarray +;; (lambda (symbol) +;; (if (commandp symbol) +;; (string-match "-mode$" (symbol-name symbol)))) +;; t) +;; '(save-excursion +;; (if (re-search-forward page-delimiter nil t) +;; (error "Not on last page"))) +;; comment-start "Local Variables:" comment-end \n +;; comment-start "mode: " str +;; & -5 | '(kill-line 0) & -1 | comment-end \n +;; ( (completing-read (format "Variable, %s: " skeleton-subprompt) +;; obarray +;; (lambda (symbol) +;; (or (eq symbol 'eval) +;; (user-variable-p symbol))) +;; t) +;; comment-start str ": " +;; (read-from-minibuffer "Expression: " nil read-expression-map nil +;; 'read-expression-history) | _ +;; comment-end \n) +;; resume: +;; comment-start "End:" comment-end \n)  ;; Variables and command for automatically inserting pairs like () or "". ＠＠ -491,7 +467,7 ＠＠ "*If this is nil, paired insertion is inhibited before or inside a word.") -(defvar skeleton-pair-filter (lambda ()) +(defvar skeleton-pair-filter-function (lambda () nil) "Attempt paired insertion if this function returns nil, before inserting. This allows for context-sensitive checking whether pairing is appropriate.") ＠＠ -503,6 +479,12 ＠＠ Elements might be (?` ?` _ \"''\"), (?\\( ? _ \" )\") or (?{ \\n > _ \\n ?} >).") +(defvar skeleton-pair-default-alist '((?( _ ?)) (?\)) + (?[ _ ?]) (?\]) + (?{ _ ?}) (?\}) + (?< _ ?>) (?\>) + (?« _ ?») (?\») + (?` _ ?'))) ;;;###autoload (defun skeleton-pair-insert-maybe (arg) ＠＠ -511,36 +493,32 ＠＠ With no ARG, if `skeleton-pair' is non-nil, pairing can occur. If the region is visible the pair is wrapped around it depending on `skeleton-autowrap'. Else, if `skeleton-pair-on-word' is non-nil or we are not before or inside a -word, and if `skeleton-pair-filter' returns nil, pairing is performed. +word, and if `skeleton-pair-filter-function' returns nil, pairing is performed. +Pairing is also prohibited if we are right after a quoting character +such as backslash. If a match is found in `skeleton-pair-alist', that is inserted, else the defaults are used. These are (), [], {}, <> and `' for the symmetrical ones, and the same character twice for the others." (interactive "*P") - (let ((mark (and skeleton-autowrap - (or (eq last-command 'mouse-drag-region) - (and (boundp 'transient-mark-mode) - (boundp 'mark-active) - transient-mark-mode mark-active)))) - (skeleton-end-hook)) - (if (or arg - (not skeleton-pair) - (and (not mark) - (or overwrite-mode - (if (not skeleton-pair-on-word) (looking-at "\\w")) - (funcall skeleton-pair-filter)))) - (self-insert-command (prefix-numeric-value arg)) - (setq last-command-char (logand last-command-char 255)) - (or skeleton-abbrev-cleanup - (skeleton-insert - (cons nil (or (assq last-command-char skeleton-pair-alist) - (assq last-command-char '((?( _ ?)) - (?[ _ ?]) - (?{ _ ?}) - (?< _ ?>) - (?` _ ?'))) - `(,last-command-char _ ,last-command-char))) - (if mark -1)))))) + (if (or arg (not skeleton-pair)) + (self-insert-command (prefix-numeric-value arg)) + (let* ((mark (and skeleton-autowrap + (or (eq last-command 'mouse-drag-region) + ;; XEmacs change from transient-mark-mode. + (region-active-p)))) + (skeleton-end-hook) + (char last-command-char) + (skeleton (or (assq char skeleton-pair-alist) + (assq char skeleton-pair-default-alist) + `(,char _ ,char)))) + (if (or (memq (char-syntax (preceding-char)) '(?\\ ?/)) + (and (not mark) + (or overwrite-mode + (if (not skeleton-pair-on-word) (looking-at "\\w")) + (funcall skeleton-pair-filter-function)))) + (self-insert-command (prefix-numeric-value arg)) + (skeleton-insert (cons nil skeleton) (if mark -1))))))  ;; A more serious example can be found in sh-script.el ＠＠ -552,13 +530,13 ＠＠ ;; (kill-all-local-variables) ;; (make-local-variable 'skeleton-pair) ;; (make-local-variable 'skeleton-pair-on-word) -;; (make-local-variable 'skeleton-pair-filter) +;; (make-local-variable 'skeleton-pair-filter-function) ;; (make-local-variable 'skeleton-pair-alist) ;; (setq major-mode 'mirror-mode ;; mode-name "Mirror" ;; skeleton-pair-on-word t ;; ;; in the middle column insert one or none if odd window-width -;; skeleton-pair-filter (lambda () +;; skeleton-pair-filter-function (lambda () ;; (if (>= (current-column) ;; (/ (window-width) 2)) ;; ;; insert both on next line ＠＠ -584,8 +562,8 ＠＠ ;; (aset map i nil) ;; (aset map (+ i 128) nil) ;; (setq i (1+ i)))) -;; (run-hooks 'mirror-mode-hook)) +;; (run-mode-hooks 'mirror-mode-hook)) (provide 'skeleton) -;; skeleton.el ends here +;;; skeleton.el ends here cvs server: Diffing etc _______________________________________________ XEmacs-Beta mailing list XEmacs-Beta(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta