Mercurial > emacs
view lisp/skeleton.el @ 94414:d86cb59eea9f
2008-04-27 Carsten Dominik <dominik@science.uva.nl>
* org/org.el (org-html-level-start): Always have id's in HTML
(org-export-as-html): Use `org-link-protocols' to
retrieve the export form of the link.
(org-add-link-type): Final parameter renamed from PUBLISH. Better
documentation of how it is to be used. Avoid double entries for
the same link type.
(org-add-link-props): New function.
(org-modules-loaded): New variable.
(org-load-modules-maybe, org-set-modules): New function.
(org-modules): New option.
(org-mode, org-cycle, orgstruct-mode, org-run-like-in-org-mode)
(orgtbl-mode, org-store-link, org-insert-link-global)
(org-open-at-point): Call `org-load-modules-maybe'.
(org-search-view): Add more text properties.
(org-agenda-schedule, org-agenda-deadline): Allow also in
search-type agendas.
(org-search-view): Order of arguments has been changed.
Interpret prefix-arg as TODO-ONLY.
(org-agenda, org-run-agenda-series, org-agenda-manipulate-query):
Take new argument order of `org-search-view' into account.
(org-todo-only): New variable.
(org-search-syntax-table): New variable and function.
(org-search-view): Do the search with the special syntax table.
(define-obsolete-function-alias): Make work with XEmacs.
(org-add-planning-info): Use old date as default when modifying an
existing deadline or scheduled item.
(org-agenda-compute-time-span): Make argument N optional.
(org-agenda-format-date-aligned): Require `cal-iso'.
(org-agenda-list): Include week into into agenda heading, don't
list it at each date (only on Mondays).
(org-read-date-analyze): Define local variable `iso-date'.
(org-agenda-format-date-aligned): Remove dependency on
`calendar-time-from-absolute'.
(org-remember-apply-template, org-go-to-remember-target):
Interpret filenames relative to `org-directory'.
(org-complete): Silently fail when trying to complete
keywords that don't have a default value.
(org-get-current-options): Added a #+DATE: option.
(org-additional-option-like-keywords): Removed "DATE:" from the
list of additional keywords.
(org-export-as-html): Removed (current-time) as unnecessary second
argument of `format-time-string'.
(org-clock-find-position): Handle special case at end of
buffer.
(org-agenda-day-view): New argument DAY-OF-YEAR, pass it on to
`org-agenda-change-time-span'.
(org-agenda-week-view): New argument ISO-WEEK, pass it on to
`org-agenda-change-time-span'.
(org-agenda-month-view): New argument MONTH, pass it on to
`org-agenda-change-time-span'.
(org-agenda-year-view): New argument YEAR, pass it on to
`org-agenda-change-time-span'.
(org-agenda-change-time-span): New optional argument N, pass it on
to `org-agenda-compute-time-span'.
(org-agenda-compute-time-span): New argument N, interpret it by
changing the starting day.
(org-small-year-to-year): New function.
(org-scheduled-past-days): Respect
`org-scheduled-past-days'.
(org-auto-repeat-maybe): Make sure that repeating
dates are pushed into the future, and that the shift is at least
one interval, never 0.
(org-update-checkbox-count): Fix bug with checkbox
counting.
(org-add-note): New command.
(org-add-log-setup): Renamed from `org-add-log-maybe'.
(org-log-note-headings): New entry for plain notes (i.e. notes not
related to state changes or clocking).
(org-get-org-file): Check for availability of
`remember-data-file'.
(org-cached-entry-get): Allow a regexp value for
`org-use-property-inheritance'.
(org-use-property-inheritance): Allow regexp value. Fix bug in
customization type.
(org-use-tag-inheritance): Allow a list and a regexp value for
this variable.
(org-scan-tags, org-get-tags-at): Implement selective tag
inheritance.
(org-entry-get): Respect value `selective' for the INHERIT
argument.
(org-tag-inherit-p, org-property-inherit-p): New functions.
(org-agenda-format-date-aligned): Allow 10 characters for
weekday, to acomodate German locale.
(org-add-archive-files): New function.
(org-agenda-files): New argument `ext', to
get archive files as well.
(org-tbl-menu): Protect the use of variables that
are only available when org-table.el gets loaded.
(org-read-agenda-file-list): Error if `org-agenda-files' is a
single directory.
(org-open-file): Allow a batch process to trigger
waiting after executing a system command.
(org-store-link): Link to headline when there is not
target and no region in an org-mode buffer when creating a link.
(org-link-types-re): New variable.
(org-make-link-regexps): Compute `org-link-types-re'.
(org-make-link-description-function): New option.
(org-agenda-date, org-agenda-date-weekend): New faces.
(org-archive-sibling-heading): New option.
(org-archive-to-archive-sibling): New function.
(org-iswitchb): New command.
(org-buffer-list): New function.
(org-agenda-columns): Also try the #+COLUMNS line in
the buffer associated with the entry at point (or with the first
entry in the agenda view).
(org-modules): Add entry for org-bibtex.el.
(org-completion-fallback-command): Moved into `org-completion'
group.
(org-clock-heading-function): Moved to `org-progress' group.
(org-auto-repeat-maybe): Make sure that a note can
be enforces if `org-log-repeat' is `note'.
(org-modules): Allow additional symbols for external
packages.
(org-ctrl-c-ctrl-c): Allow for `org-clock-overlays' to be
undefined.
(org-clock-goto): Hide drawers after showing an
entry with `org-clock-goto.'
(org-shiftup, org-shiftdown, org-shiftright, org-shiftleft): Try
also a clocktable block shift.
(org-clocktable-try-shift): New function.
(org-columns-hscoll-title): New function.
(org-columns-previous-hscroll): New variable.
(org-columns-full-header-line-format): New variable.
(org-columns-display-here-title, org-columns-remove-overlays):
Install `org-columns-hscoll-title' in post-command-hook.
* org/org.el: Split into many small files.
* org/org-agenda.el: New file, split off from org.el.
* org/org-archive.el: New file, split off from org.el.
* org/org-bbdb.el: New file.
* org/org-bibtex.el: New file, split off from org.el.
* org/org-clock.el: New file, split off from org.el.
* org/org-colview.el: New file, split off from org.el.
* org/org-compat.el: New file, split off from org.el.
* org/org-exp.el: New file, split off from org.el.
* org/org-faces.el: New file, split off from org.el.
* org/org-gnus.el: New file, split off from org.el.
* org/org-info.el: New file, split off from org.el.
* org/org-infojs.el: New file.
* org/org-irc.el: New file.
* org/org-macs.el: New file, split off from org.el.
* org/org-mew.el: New file.
* org/org-mhe.el: New file, split off from org.el.
* org/org-publish.el: New file, split off from org.el.
* org/org-remember.el: New file, split off from org.el.
* org/org-rmail.el: New file, split off from org.el.
* org/org-table.el: New file, split off from org.el.
* org/org-vm.el: New file, split off from org.el.
* org/org-wl.el: New file, split off from org.el.
2008-04-27 Jason Riedy <jason@acm.org>
* lisp/org-table.el (orgtbl-to-generic): Add a :remove-nil-lines
parameter that supresses lines that evaluate to NIL.
(orgtbl-get-fmt): New inline function for
picking apart formats that may be lists.
(orgtbl-apply-fmt): New inline function for applying formats that
may be functions.
(orgtbl-eval-str): New inline function for strings that may be
functions.
(orgtbl-format-line, orgtbl-to-generic): Use and document.
(orgtbl-to-latex, orgtbl-to-texinfo): Document.
(*orgtbl-llfmt*, *orgtbl-llstart*)
(*orgtbl-llend*): Dynamic variables for last-line formatting.
(orgtbl-format-section): Shift formatting to support detecting the
last line and formatting it specially.
(orgtbl-to-generic): Document :ll* formats. Set to the non-ll
formats unless overridden.
(orgtbl-to-latex): Suggest using :llend to suppress the final \\.
(*orgtbl-table*, *orgtbl-rtn*): Dynamically
bound variables to hold the input collection of lines and output
formatted text.
(*orgtbl-hline*, *orgtbl-sep*, *orgtbl-fmt*, *orgtbl-efmt*,
(*orgtbl-lfmt*, *orgtbl-lstart*, *orgtbl-lend*): Dynamically bound
format parameters.
(orgtbl-format-line): New function encapsulating formatting for a
single line.
(orgtbl-format-section): Similar for each section. Rebinding the
dynamic vars customizes the formatting for each section.
(orgtbl-to-generic): Use orgtbl-format-line and
orgtbl-format-section.
(org-get-param): Now unused, so delete.
(orgtbl-gather-send-defs): New function to
gather all the SEND definitions before a table.
(orgtbl-send-replace-tbl): New function to find the RECEIVE
corresponding to the current name.
(orgtbl-send-table): Use the previous two functions and implement
multiple destinations for each table.
* doc/org.texi (A LaTeX example): Note that fmt may be a
one-argument function, and efmt may be a two-argument function.
(Radio tables): Document multiple destinations.
2008-04-27 Carsten Dominik <dominik@science.uva.nl>
* org/org-agenda.el (org-add-to-diary-list): New function.
(org-prefix-has-effort): New variable.
(org-sort-agenda-noeffort-is-high): New option.
(org-agenda-columns-show-summaries)
(org-agenda-columns-compute-summary-properties): New options.
(org-format-agenda-item): Compute the duration of the item.
(org-agenda-weekend-days): New variable.
(org-agenda-list, org-timeline): Use the proper faces for dates in
the agenda and timeline buffers.
(org-agenda-archive-to-archive-sibling): New command.
(org-agenda-start-with-clockreport-mode): New option.
(org-agenda-clockreport-parameter-plist): New option.
(org-agenda-clocktable-mode): New variable.
(org-agenda-deadline-leaders): Allow a function value for the
deadline leader.
(org-agenda-get-deadlines): Deal with new function value.
* lisp/org-clock.el (org-clock): New customization group.
(org-clock-into-drawer, org-clock-out-when-done)
(org-clock-in-switch-to-state, org-clock-heading-function): Moved
into the new group.
(org-clock-out-remove-zero-time-clocks): New option.
(org-clock-out): Use `org-clock-out-remove-zero-time-clocks'.
(org-dblock-write:clocktable): Allow a Lisp form for the scope
parameter.
(org-dblock-write:clocktable): Fixed bug with total time
calculation.
(org-dblock-write:clocktable): Request the unrestricted list of
files.
(org-get-clocktable): New function.
(org-dblock-write:clocktable): Make sure :tstart and :tend can not
only be strings but also integers (an absolute day number) and
lists (m d y).
* org/org-colview.el (org-columns-next-allowed-value)
(org-columns-edit-value): Limit the effort for updatig in the
agenda to recomputing a single file.
(org-columns-compute): Only write property value if it has
changed. This avoids raising the buffer-change-flag
unnecessarily.
(org-agenda-colview-summarize)
(org-agenda-colview-compute): New functions.
(org-agenda-columns): Call `org-agenda-colview-summarize'.
* org/org-exp.el (org-export-run-in-background): New option.
(org-export-icalendar): Allow a batch process to trigger waiting
after executing a system command.
(org-export-preprocess-string): Renamed-from
`org-cleaned-string-for-export'.
(org-export-html-style): Made target class look like normal text.
(org-export-as-html): Make use of the better proprocessing in
`org-cleaned-string-for-export'.
(org-cleaned-string-for-export): Better treatment of heuristic
targets, many more internal links will now work in HTML export.
(org-get-current-options): Incorporate LINK_UP, LINK_HOME, and
INFOJS.
(org-export-inbuffer-options-extra): New variable.
(org-export-options-filters): New hook.
(org-infile-export-plist): Find also the settings keywords in
`org-export-inbuffer-options-extra'.
(org-infile-export-plist): Allow multiple #+OPTIONS lines and
multiple #+INFOJS_OPT lines.
(org-export-html-handle-js-options): New function.
(org-export-html-infojs-setup): New option.
(org-export-as-html): Call `org-export-html-handle-js-options'.
Add autoload to all entry points.
(org-skip-comments): Function removed.
* org/org-table.el (org-table-make-reference): Extra parenthesis
around single fields, to make sure that algebraic formulas get
correctly interpreted by calc.
(org-table-current-column): No longer interactive.
* org/org-export-latex.el (org-export-latex-preprocess): Renamed
from `org-export-latex-cleaned-string'.
2008-04-27 Bastien Guerry <bzg@altern.org>
* org/org-publish.el (org-publish-get-base-files-1): New function.
(org-publish-get-base-files): Use it.
(org-publish-temp-files): New variable.
Don't require 'dired-aux anymore.
(org-publish-initial-buffer): New variable.
(org-publish-org-to, org-publish): Use it.
(org-publish-get-base-files-1): Bug fix: get
the proper list of files when recursing thru a directory.
(org-publish-get-base-files): Use the :exclude property to skip
both files and directories.
author | Carsten Dominik <dominik@science.uva.nl> |
---|---|
date | Sun, 27 Apr 2008 18:33:39 +0000 |
parents | b6c3fde83add |
children | ee5932bf781d |
line wrap: on
line source
;;; skeleton.el --- Lisp language extension for writing statement skeletons -*- coding: utf-8 -*- ;; Copyright (C) 1993, 1994, 1995, 1996, 2001, 2002, 2003, ;; 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ;; Author: Daniel Pfeiffer <occitan@esperanto.org> ;; Maintainer: FSF ;; Keywords: extensions, abbrev, languages, tools ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 3, or (at your option) ;; any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. ;;; Commentary: ;; A very concise language extension for writing structured statement ;; skeleton insertion commands for programming language modes. This ;; originated in shell-script mode and was applied to ada-mode's ;; commands which shrunk to one third. And these commands are now ;; user configurable. ;;; Code: ;; page 1: statement skeleton language definition & interpreter ;; page 2: paired insertion ;; page 3: mirror-mode, an example for setting up paired insertion (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-function 'variable-interactive "aTransformation function: ") (defvar skeleton-autowrap t "Controls wrapping behavior 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.") (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) (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, unless `skeleton-end-newline' is set to nil. The variables `v1' and `v2' are still set when calling this.") ;;;###autoload (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.") (defvar skeleton-newline-indent-rigidly nil "When non-nil, indent rigidly under current line for element `\\n'. Else use mode's `indent-line-function'.") (defvar skeleton-further-elements () "A buffer-local varlist (see `let') of mode specific skeleton elements. These variables are bound while interpreting a skeleton. Their value may in turn be any valid skeleton element if they are themselves to be used as skeleton elements.") (make-variable-buffer-local 'skeleton-further-elements) (defvar skeleton-subprompt (substitute-command-keys "RET, \\<minibuffer-local-map>\\[abort-recursive-edit] or \\[help-command]") "*Replacement for %s in prompts of recursive subskeletons.") (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) (defvar skeleton-modified) (defvar skeleton-point) (defvar skeleton-regions) (def-edebug-spec skeleton-edebug-spec ([&or null stringp (stringp &rest stringp) [[¬ 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. 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) "" "\n") "\n" "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 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. 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). 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) (and transient-mark-mode mark-active)) ;; Deactivate the mark, in case one of the ;; elements of the skeleton is sensitive ;; to such situations (e.g. it is itself a ;; skeleton). (progn (deactivate-mark) -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 regions str) "Insert the complex statement skeleton SKELETON describes very concisely. 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-function'). Other possibilities are: \\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 if previous moved point | do next ELEMENT if 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 be a list of strings with the subskeleton being repeated once for each string. 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 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 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." (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 (prompt &optional initial-input recursive) "Function for reading a string from the minibuffer within skeletons. 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." (let ((minibuffer-help-form (or (if (boundp 'help) (symbol-value 'help)) (if recursive "\ As long as you provide input you will insert another subskeleton. If you enter the empty string, the loop inserting subskeletons is left, and the current one is removed as far as it has been entered. 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))) ;; since Emacs doesn't show main window's cursor, do something noticeable (or eolp (open-line 1)) (unwind-protect (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 prompt) (string= prompt "") (equal prompt initial-input) (equal prompt (car-safe initial-input)))) (signal 'quit t) prompt)) (defun skeleton-internal-list (skeleton &optional str recursive) (let* ((start (save-excursion (beginning-of-line) (point))) (column (current-column)) (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) 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. (end-of-line) (delete-region start (point)) (insert line) (move-to-column column) (if (cdr quit) (setq skeleton () recursive nil) (signal 'quit 'recursive))))))) ;; maybe continue loop or go on to next outer resume: section (if (eq recursive 'quit) (signal 'quit 'recursive) recursive)) (defun skeleton-internal-1 (element &optional literal recursive) (cond ((or (integerp element) (stringp 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) ;; Variables and command for automatically inserting pairs like () or "". (defvar skeleton-pair nil "*If this is nil pairing is turned off, no matter what else is set. Otherwise modes with `skeleton-pair-insert-maybe' on some keys will attempt to insert pairs of matching characters.") (defvar skeleton-pair-on-word nil "*If this is nil, paired insertion is inhibited before or inside a word.") (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.") (defvar skeleton-pair-alist () "An override alist of pairing partners matched against `last-command-char'. Each alist element, which looks like (ELEMENT ...), is passed to `skeleton-insert' with no interactor. Variable `str' does nothing. Elements might be (?` ?` _ \"''\"), (?\\( ? _ \" )\") or (?{ \\n > _ \\n ?} >).") (defvar skeleton-pair-default-alist '((?( _ ?)) (?\)) (?[ _ ?]) (?\]) (?{ _ ?}) (?\}) (?< _ ?>) (?\>) (?« _ ?») (?\») (?` _ ?'))) ;;;###autoload (defun skeleton-pair-insert-maybe (arg) "Insert the character you type ARG times. 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-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") (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) (and transient-mark-mode mark-active)))) (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 ;; (defun mirror-mode () ;; "This major mode is an amusing little example of paired insertion. ;;All printable characters do a paired self insert, while the other commands ;;work normally." ;; (interactive) ;; (kill-all-local-variables) ;; (make-local-variable 'skeleton-pair) ;; (make-local-variable 'skeleton-pair-on-word) ;; (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-function (lambda () ;; (if (>= (current-column) ;; (/ (window-width) 2)) ;; ;; insert both on next line ;; (next-line 1) ;; ;; insert one or both? ;; (= (* 2 (1+ (current-column))) ;; (window-width)))) ;; ;; mirror these the other way round as well ;; skeleton-pair-alist '((?) _ ?() ;; (?] _ ?[) ;; (?} _ ?{) ;; (?> _ ?<) ;; (?/ _ ?\\) ;; (?\\ _ ?/) ;; (?` ?` _ "''") ;; (?' ?' _ "``")) ;; ;; in this mode we exceptionally ignore the user, else it's no fun ;; skeleton-pair t) ;; (let ((map (make-vector 256 'skeleton-pair-insert-maybe)) ;; (i 0)) ;; (use-local-map `(keymap ,map)) ;; (while (< i ? ) ;; (aset map i nil) ;; (aset map (+ i 128) nil) ;; (setq i (1+ i)))) ;; (run-mode-hooks 'mirror-mode-hook)) (provide 'skeleton) ;; arch-tag: ccad7bd5-eb5d-40de-9ded-900197215c3e ;;; skeleton.el ends here