Mercurial > emacs
view lisp/expand.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 | 1e3a407766b9 |
children | ee5932bf781d |
line wrap: on
line source
;;; expand.el --- make abbreviations more usable ;; Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ;; Author: Frederic Lepied <Frederic.Lepied@sugix.frmug.org> ;; Maintainer: Frederic Lepied <Frederic.Lepied@sugix.frmug.org> ;; Keywords: abbrev ;; 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: ;; ;; This package defines abbrevs which expand into structured constructs ;; for certain languages. The construct is indented for you, ;; and contains slots for you to fill in other text. ;; These abbrevs expand only at the end of a line and when not in a comment ;; or a string. ;; ;; Look at the Sample: section for emacs-lisp, perl and c expand lists. ;; For example for c-mode, you could declare your abbrev table with : ;; ;; (defconst c-expand-list ;; '(("if" "if () {\n \n} else {\n \n}" (5 10 21)) ;; ("ifn" "if () {}" (5 8)) ;; ("uns" "unsigned ") ;; ("for" "for(; ; ) {\n\n}" (5 7 9 13)) ;; ("switch" "switch () {\n\n}" (9 13)) ;; ("case" "case :\n\nbreak;\n" (6 8 16)) ;; ("do" "do {\n\n} while ();" (6 16)) ;; ("while" "while () {\n\n}" (8 12)) ;; ("default" "default:\n\nbreak;" 10) ;; ("main" "int\nmain(int argc, char * argv[])\n{\n\n}\n" 37)) ;; "Expansions for C mode") ;; ;; and enter Abbrev mode with the following hook : ;; ;; (add-hook 'c-mode-hook ;; (lambda () ;; (expand-add-abbrevs c-mode-abbrev-table c-expand-list) ;; (abbrev-mode 1))) ;; ;; you can also init some post-process hooks : ;; ;; (add-hook 'expand-load-hook ;; (lambda () ;; (add-hook 'expand-expand-hook 'indent-according-to-mode) ;; (add-hook 'expand-jump-hook 'indent-according-to-mode))) ;; ;; Remarks: ;; ;; Many thanks to Heddy Boubaker <boubaker@cenatls.cena.dgac.fr>, ;; Jerome Santini <santini@chambord.univ-orleans.fr>, ;; Jari Aalto <jaalto@tre.tele.nokia.fi>. ;; ;; Please send me a word to give me your feeling about this feature or ;; to explain me how you use it (your expansions table for example) using ;; the function expand-submit-report. ;;; Code: ;;; Constants: (defgroup expand nil "Make abbreviations more usable." :group 'abbrev) (defcustom expand-load-hook nil "Hooks run when `expand.el' is loaded." :type 'hook :group 'expand) (defcustom expand-expand-hook nil "Hooks run when an abbrev made by `expand-add-abbrevs' is expanded." :type 'hook :group 'expand) (defcustom expand-jump-hook nil "Hooks run by `expand-jump-to-previous-slot' and `expand-jump-to-next-slot'." :type 'hook :group 'expand) ;;; Samples: (define-skeleton expand-c-for-skeleton "For loop skeleton" "Loop var: " "for(" str _ @ "=0; " str @ "; " str @ ") {" \n @ _ \n "}" > \n) (defconst expand-c-sample-expand-list '(("if" "if () {\n \n} else {\n \n}" (5 10 21)) ("ifn" "if () {}" (5 8)) ("uns" "unsigned ") ("for" expand-c-for-skeleton) ("switch" "switch () {\n\n}" (9 13)) ("case" "case :\n\nbreak;\n" (6 8 16)) ("do" "do {\n\n} while ();" (6 16)) ("while" "while () {\n\n}" (8 12)) ("default" "default:\n\nbreak;" 10) ("main" "int\nmain(int argc, char * argv[])\n{\n\n}\n" 37)) "Expansions for C mode. See `expand-add-abbrevs'.") ;; lisp example from Jari Aalto <jaalto@tre.tele.nokia.fi> (defconst expand-sample-lisp-mode-expand-list (list (list "defu" (concat "(defun ()\n" " \"\"\n" " (interactive)\n" " (let* (\n" " )\n" " \n" " ))") (list 8 11 16 32 43 59)) (list "defs" (concat "(defsubst ()\n" " \"\"\n" " (interactive)\n" " )") (list 11 14 19 23 39)) (list "defm" (concat "(defmacro ()\n" " \"\"\n" " `( \n" " ))") (list 11 13 18 25)) (list "defa" (concat "(defadvice (around act)\n" " \"\"\n" " \n" " )") (list 12 22 32 36)) (list "defc" "(defconst nil\n \"\")\n" (list 11 13 20)) (list "defv" "(defvar nil\n \"\")\n" (list 9 11 18)) (list "let" "(let* (\n)\n " (list 8 13)) (list "sav" "(save-excursion\n \n)" (list 18)) (list "aut" "(autoload ' \"\" t t)\n" (list 12 14)) ) "Expansions for Lisp mode. See `expand-add-abbrevs'.") ;; perl example from Jari Aalto <jaalto@tre.tele.nokia.fi> (defconst expand-sample-perl-mode-expand-list (list (list ;; This is default perl4 subroutine template ;; "sub" (concat "#" (make-string 70 ?-) "\n" "sub {\n" " # DESCRIPTION\n" " # \n" " # \n" " # INPUT\n" " # \n" " # \n" " # RETURN\n" " # \n" "\n" " local( $f ) = \"$lib.\";\n" ;; Function name AFTER period " local() = @_;\n" ;; func arguments here " \n" " \n}\n" ) (list 77 88 120 146 159 176)) (list "for" ; foreach (concat "for ( )\n" "{\n\n\}" ) (list 7 12)) (list "whi" ; foreach (concat "while ( )\n" "{\n\n\}" ) (list 9 15)) ;; The normal "if" can be used like ;; print $F "xxxxxx" if defined @arr; ;; (list "iff" (concat "if ( )\n" "{\n\n\}" ) (list 6 12)) (list "loc" "local( $ );" (list 9)) (list "my" "my( $ );" (list 6)) (list "ope" "open(,\"\")\t|| die \"$f: Can't open [$]\";" (list 6 8 36)) (list "clo" "close ;" 7) (list "def" "defined " (list 9)) (list "und" "undef ;" (list 7)) ;; There is no ending colon, because they can be in statement ;; defined $REXP_NOT_NEW && (print "xxxxx" ); ;; (list "pr" "print " 7) (list "pf" "printf " 8) (list "gre" "grep( //, );" (list 8 11)) (list "pus" "push( , );" (list 7 9)) (list "joi" "join( '', );" (list 7 11)) (list "rtu" "return ;" (list 8)) ) "Expansions for Perl mode. See `expand-add-abbrevs'.") ;;; Code: ;;;###autoload (defun expand-add-abbrevs (table abbrevs) "Add a list of abbrev to abbrev table TABLE. ABBREVS is a list of abbrev definitions; each abbrev description entry has the form (ABBREV EXPANSION ARG). ABBREV is the abbreviation to replace. EXPANSION is the replacement string or a function which will make the expansion. For example you, could use the DMacros or skeleton packages to generate such functions. ARG is an optional argument which can be a number or a list of numbers. If ARG is a number, point is placed ARG chars from the beginning of the expanded text. If ARG is a list of numbers, point is placed according to the first member of the list, but you can visit the other specified positions cyclicaly with the functions `expand-jump-to-previous-slot' and `expand-jump-to-next-slot'. If ARG is omitted, point is placed at the end of the expanded text." (if (null abbrevs) table (expand-add-abbrev table (nth 0 (car abbrevs)) (nth 1 (car abbrevs)) (nth 2 (car abbrevs))) (expand-add-abbrevs table (cdr abbrevs)))) (defvar expand-list nil "Temporary variable used by the Expand package.") (defvar expand-pos nil "If non-nil, stores a vector containing markers to positions defined by the last expansion. This variable is local to a buffer.") (make-variable-buffer-local 'expand-pos) (defvar expand-index 0 "Index of the last marker used in `expand-pos'. This variable is local to a buffer.") (make-variable-buffer-local 'expand-index) (defvar expand-point nil "End of the expanded region. This variable is local to a buffer.") (make-variable-buffer-local 'expand-point) (defun expand-add-abbrev (table abbrev expansion arg) "Add one abbreviation and provide the hook to move to the specified positions." (let* ((string-exp (if (and (symbolp expansion) (fboundp expansion)) nil expansion)) (position (if (and arg string-exp) (if (listp arg) (- (length expansion) (1- (car arg))) (- (length expansion) (1- arg))) 0))) (define-abbrev table abbrev (vector string-exp position (if (and (listp arg) (not (null arg))) (cons (length string-exp) arg) nil) (if (and (symbolp expansion) (fboundp expansion)) expansion nil) ) 'expand-abbrev-hook))) (put 'expand-abbrev-hook 'no-self-insert t) ;;;###autoload (defun expand-abbrev-hook () "Abbrev hook used to do the expansion job of expand abbrevs. See `expand-add-abbrevs'. Value is non-nil if expansion was done." ;; Expand only at the end of a line if we are near a word that has ;; an abbrev built from expand-add-abbrev. (if (and (eolp) (not (expand-in-literal))) (let ((p (point))) (setq expand-point nil) ;; don't expand if the preceding char isn't a word constituent (if (and (eq (char-syntax (preceding-char)) ?w) (expand-do-expansion)) (progn ;; expand-point tells us if we have inserted the text ;; ourself or if it is the hook which has done the job. (if expand-point (progn (if (vectorp expand-list) (expand-build-marks expand-point)) (indent-region p expand-point nil)) ;; an outside function can set expand-list to a list of ;; markers in reverse order. (if (listp expand-list) (setq expand-index 0 expand-pos (expand-list-to-markers expand-list) expand-list nil))) (run-hooks 'expand-expand-hook) t) nil)) nil)) (defun expand-do-expansion () (delete-backward-char (length last-abbrev-text)) (let* ((vect (symbol-value last-abbrev)) (text (aref vect 0)) (position (aref vect 1)) (jump-args (aref vect 2)) (hook (aref vect 3))) (cond (text (insert text) (setq expand-point (point)))) (if jump-args (funcall 'expand-build-list (car jump-args) (cdr jump-args))) (if position (backward-char position)) (if hook (funcall hook)) t) ) (defun expand-abbrev-from-expand (word) "Test if an abbrev has a hook." (or (and (intern-soft word local-abbrev-table) (symbol-function (intern-soft word local-abbrev-table))) (and (intern-soft word global-abbrev-table) (symbol-function (intern-soft word global-abbrev-table))))) (defun expand-previous-word () "Return the previous word." (save-excursion (let ((p (point))) (backward-word 1) (buffer-substring p (point))))) ;;;###autoload (defun expand-jump-to-previous-slot () "Move the cursor to the previous slot in the last abbrev expansion. This is used only in conjunction with `expand-add-abbrevs'." (interactive) (if expand-pos (progn (setq expand-index (1- expand-index)) (if (< expand-index 0) (setq expand-index (1- (length expand-pos)))) (goto-char (aref expand-pos expand-index)) (run-hooks 'expand-jump-hook)))) ;;;###autoload (defun expand-jump-to-next-slot () "Move the cursor to the next slot in the last abbrev expansion. This is used only in conjunction with `expand-add-abbrevs'." (interactive) (if expand-pos (progn (setq expand-index (1+ expand-index)) (if (>= expand-index (length expand-pos)) (setq expand-index 0)) (goto-char (aref expand-pos expand-index)) (run-hooks 'expand-jump-hook)))) ;;;###autoload (define-key ctl-x-map "ap" 'expand-jump-to-previous-slot) ;;;###autoload (define-key ctl-x-map "an" 'expand-jump-to-next-slot) (defun expand-build-list (len l) "Build a vector of offset positions from the list of positions." (expand-clear-markers) (setq expand-list (vconcat l)) (let ((i 0) (lenlist (length expand-list))) (while (< i lenlist) (aset expand-list i (- len (1- (aref expand-list i)))) (setq i (1+ i)))) ) (defun expand-build-marks (p) "Transform the offsets vector into a marker vector." (if expand-list (progn (setq expand-index 0) (setq expand-pos (make-vector (length expand-list) nil)) (let ((i (1- (length expand-list)))) (while (>= i 0) (aset expand-pos i (copy-marker (- p (aref expand-list i)))) (setq i (1- i)))) (setq expand-list nil)))) (defun expand-clear-markers () "Make the markers point nowhere." (if expand-pos (progn (let ((i (1- (length expand-pos)))) (while (>= i 0) (set-marker (aref expand-pos i) nil) (setq i (1- i)))) (setq expand-pos nil)))) (defun expand-in-literal () "Test if we are in a comment or in a string." (save-excursion (let* ((lim (or (save-excursion (beginning-of-defun) (point)) (point-min))) (here (point)) (state (parse-partial-sexp lim (point)))) (cond ((nth 3 state) 'string) ((nth 4 state) 'comment) (t nil))))) ;; support functions to add marks to jump from outside function (defun expand-list-to-markers (l) "Transform a list of markers in reverse order into a vector in the correct order." (let* ((len (1- (length l))) (loop len) (v (make-vector (+ len 1) nil))) (while (>= loop 0) (aset v loop (if (markerp (car l)) (car l) (copy-marker (car l)))) (setq l (cdr l) loop (1- loop))) v)) ;; integration with skeleton.el ;; Used in `skeleton-end-hook' to fetch the positions for @ skeleton tags. ;; See `skeleton-insert'. (defun expand-skeleton-end-hook () (if skeleton-positions (setq expand-list skeleton-positions))) (add-hook 'skeleton-end-hook (function expand-skeleton-end-hook)) (provide 'expand) ;; run load hooks (run-hooks 'expand-load-hook) ;; arch-tag: fee53e9e-30e3-4ef3-b191-9785e1f8e885 ;;; expand.el ends here