diff options
| author | Kenichi Handa | 2012-01-21 20:36:42 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2012-01-21 20:36:42 +0900 |
| commit | 678fb7066698ebfe3aecba722294025ed26da01b (patch) | |
| tree | 951ac3055141d950974051d13c10e5d7c6a98e31 /src/textprop.c | |
| parent | 71784361eb381ec2b12bd8283724a7addec49079 (diff) | |
| parent | 959ad23fb9020a121c4520946835e9f0aeb9bcb2 (diff) | |
| download | emacs-678fb7066698ebfe3aecba722294025ed26da01b.tar.gz emacs-678fb7066698ebfe3aecba722294025ed26da01b.zip | |
merge 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 a1c7593f568..688b32eb4ec 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 | ||
| @@ -2227,7 +2227,7 @@ This also inhibits the use of the `intangible' text property. */); | |||
| 2227 | 2227 | ||
| 2228 | DEFVAR_LISP ("text-property-default-nonsticky", | 2228 | DEFVAR_LISP ("text-property-default-nonsticky", |
| 2229 | Vtext_property_default_nonsticky, | 2229 | Vtext_property_default_nonsticky, |
| 2230 | doc: /* Alist of properties vs the corresponding non-stickinesses. | 2230 | doc: /* Alist of properties vs the corresponding non-stickiness. |
| 2231 | Each element has the form (PROPERTY . NONSTICKINESS). | 2231 | Each element has the form (PROPERTY . NONSTICKINESS). |
| 2232 | 2232 | ||
| 2233 | If a character in a buffer has PROPERTY, new text inserted adjacent to | 2233 | If a character in a buffer has PROPERTY, new text inserted adjacent to |