diff options
| author | John Wiegley <johnw@newartisans.com> | 2016-01-11 22:48:10 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2016-01-11 22:48:10 -0800 |
| commit | 4b739f70a54579b134ab6da313a3d665640a6a3f (patch) | |
| tree | a5c8bba0bd10e8c4b2de062d6a5f905ac139f121 /lisp/textmodes/tildify.el | |
| parent | 540bfa7680268a55fc617ffb822e962cb9fb6c59 (diff) | |
| parent | 43662a240b682de94299e797452ba56d01a04883 (diff) | |
| download | emacs-4b739f70a54579b134ab6da313a3d665640a6a3f.tar.gz emacs-4b739f70a54579b134ab6da313a3d665640a6a3f.tar.bz2 emacs-4b739f70a54579b134ab6da313a3d665640a6a3f.zip | |
Merge from origin/emacs-25
43662a2 ; Clarify that xref is still experimental
0a6e6ca ; * admin/release-process: Remove some obsolete records.
c2e9e3d * lisp/progmodes/fortran.el (fortran-make-syntax-propertize-function):
8637f3d (semantic-symref-derive-find-filepatterns): Return a list
0a7ad07 ; Re-arrange xref-related entries in NEWS.
fe903ef Fix xref-find-references on MS-Windows
55a28d8 ; Fixed visual bell artifact problem on NextStep.
d064034 Document new features of tildify-mode
964bea7 Document new features of Whitespace mode
cd68f47 Improve documentation of new Hide-IfDef features
723b8bf Fix regression in font-locking cl-assert and cl-check-type
Diffstat (limited to 'lisp/textmodes/tildify.el')
| -rw-r--r-- | lisp/textmodes/tildify.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/textmodes/tildify.el b/lisp/textmodes/tildify.el index b11569cd14c..eb799c09510 100644 --- a/lisp/textmodes/tildify.el +++ b/lisp/textmodes/tildify.el @@ -282,7 +282,7 @@ corresponding text part and can be either: CALLBACK is a function accepting two arguments -- REG-BEG and REG-END -- that will be called for portions of the buffer outside of the environments defined by -PAIRS regexes. +PAIRS regexps. The function will return as soon as CALLBACK returns nil or point goes past END. CALLBACK may be called on portions of the buffer outside of [BEG END); in fact @@ -479,7 +479,7 @@ which is assumed to be a space character, should be replaced with a hard space." ;;;###autoload (define-minor-mode tildify-mode - "Adds electric behaviour to space character. + "Adds electric behavior to space character. When space is inserted into a buffer in a position where hard space is required instead (determined by `tildify-space-pattern' and `tildify-space-predicates'), |