diff options
| author | Paul Eggert | 2012-01-09 09:36:10 -0800 |
|---|---|---|
| committer | Paul Eggert | 2012-01-09 09:36:10 -0800 |
| commit | 35cf62d95cdcd5323dcea4a5385942c342ff1d9c (patch) | |
| tree | 90358cbb033a126c4d48793a80fd804b7baaca24 /src/textprop.c | |
| parent | 59815c02506eb39b61e672528ed03885749ba529 (diff) | |
| parent | 7655cb66d86564e792b825f1a0e1a4de7d6e6db5 (diff) | |
| download | emacs-35cf62d95cdcd5323dcea4a5385942c342ff1d9c.tar.gz emacs-35cf62d95cdcd5323dcea4a5385942c342ff1d9c.zip | |
Merge from trunk.
Diffstat (limited to 'src/textprop.c')
| -rw-r--r-- | src/textprop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/textprop.c b/src/textprop.c index 1a635444b00..f9339c66893 100644 --- a/src/textprop.c +++ b/src/textprop.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* Interface code for dealing with text properties. | 1 | /* Interface code for dealing with text properties. |
| 2 | Copyright (C) 1993-1995, 1997, 1999-2011 Free Software Foundation, Inc. | 2 | Copyright (C) 1993-1995, 1997, 1999-2012 Free Software Foundation, Inc. |
| 3 | 3 | ||
| 4 | This file is part of GNU Emacs. | 4 | This file is part of GNU Emacs. |
| 5 | 5 | ||
| @@ -2230,7 +2230,7 @@ This also inhibits the use of the `intangible' text property. */); | |||
| 2230 | 2230 | ||
| 2231 | DEFVAR_LISP ("text-property-default-nonsticky", | 2231 | DEFVAR_LISP ("text-property-default-nonsticky", |
| 2232 | Vtext_property_default_nonsticky, | 2232 | Vtext_property_default_nonsticky, |
| 2233 | doc: /* Alist of properties vs the corresponding non-stickinesses. | 2233 | doc: /* Alist of properties vs the corresponding non-stickiness. |
| 2234 | Each element has the form (PROPERTY . NONSTICKINESS). | 2234 | Each element has the form (PROPERTY . NONSTICKINESS). |
| 2235 | 2235 | ||
| 2236 | If a character in a buffer has PROPERTY, new text inserted adjacent to | 2236 | If a character in a buffer has PROPERTY, new text inserted adjacent to |