HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from trunk.
[bpt/emacs.git]
/
lisp
/
skeleton.el
diff --git
a/lisp/skeleton.el
b/lisp/skeleton.el
index
b3ba621
..
34d69a7
100644
(file)
--- a/
lisp/skeleton.el
+++ b/
lisp/skeleton.el
@@
-1,7
+1,6
@@
;;; skeleton.el --- Lisp language extension for writing statement skeletons -*- coding: utf-8 -*-
;;; 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, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1996, 2001-2012 Free Software Foundation, Inc.
;; Author: Daniel Pfeiffer <occitan@esperanto.org>
;; Maintainer: FSF
;; Author: Daniel Pfeiffer <occitan@esperanto.org>
;; Maintainer: FSF
@@
-38,7
+37,7
@@
(defvar skeleton-transformation-function 'identity
(defvar skeleton-transformation-function 'identity
- "
*
If non-nil, function applied to literal strings before they are inserted.
+ "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'.")
It should take strings and characters and return them transformed, or nil
which means no transformation.
Typical examples might be `upcase' or `capitalize'.")
@@
-96,11
+95,11
@@
skeleton elements.")
(defvar skeleton-subprompt
(substitute-command-keys
"RET, \\<minibuffer-local-map>\\[abort-recursive-edit] or \\[help-command]")
(defvar skeleton-subprompt
(substitute-command-keys
"RET, \\<minibuffer-local-map>\\[abort-recursive-edit] or \\[help-command]")
- "
*
Replacement for %s in prompts of recursive subskeletons.")
+ "Replacement for %s in prompts of recursive subskeletons.")
(defvar skeleton-debug nil
(defvar skeleton-debug nil
- "
*
If non-nil `define-skeleton' will override previous definition.")
+ "If non-nil `define-skeleton' will override previous definition.")
(defvar skeleton-positions nil
"List of positions marked with @, after skeleton insertion.
(defvar skeleton-positions nil
"List of positions marked with @, after skeleton insertion.
@@
-122,7
+121,7
@@
are integer buffer positions in the reverse order of the insertion order.")
"Define a user-configurable COMMAND that enters a statement skeleton.
DOCUMENTATION is that of the command.
SKELETON is as defined under `skeleton-insert'."
"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)))
+ (declare (d
oc-string 2) (d
ebug (&define name stringp skeleton-edebug-spec)))
(if skeleton-debug
(set command skeleton))
`(progn
(if skeleton-debug
(set command skeleton))
`(progn
@@
-457,7
+456,7
@@
automatically, and you are prompted to fill in the variable parts.")))
;; obarray
;; (lambda (symbol)
;; (or (eq symbol 'eval)
;; obarray
;; (lambda (symbol)
;; (or (eq symbol 'eval)
-;; (
user
-variable-p symbol)))
+;; (
custom
-variable-p symbol)))
;; t)
;; comment-start str ": "
;; (read-from-minibuffer "Expression: " nil read-expression-map nil
;; t)
;; comment-start str ": "
;; (read-from-minibuffer "Expression: " nil read-expression-map nil
@@
-469,13
+468,13
@@
automatically, and you are prompted to fill in the variable parts.")))
;; Variables and command for automatically inserting pairs like () or "".
(defvar skeleton-pair nil
;; 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.
+ "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
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.")
+ "If this is nil, paired insertion is inhibited before or inside a word.")
(defvar skeleton-pair-filter-function (lambda () nil)
(defvar skeleton-pair-filter-function (lambda () nil)