summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2011-01-22 12:10:17 -0800
committerGlenn Morris <rgm@gnu.org>2011-01-22 12:10:17 -0800
commit4d265b4d767984d643db79cd17ec74785b20dc2a (patch)
tree6d92a586c88d80ba65724b3f5ca0c54369c82d85 /doc
parent66e0718be8d6a5ee63208b09ce6b37c2242860ca (diff)
downloademacs-4d265b4d767984d643db79cd17ec74785b20dc2a.tar.gz
Doc fix for make-text-button.
* doc/lispref/display.texi (Making Buttons): Mention limitation of text buttons. * lisp/button.el (make-text-button): Doc fix. (See bug#7881)
Diffstat (limited to 'doc')
-rw-r--r--doc/lispref/ChangeLog6
-rw-r--r--doc/lispref/display.texi9
2 files changed, 7 insertions, 8 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index e1180124c05..f81a3069f80 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-22 Glenn Morris <rgm@gnu.org>
+
+ * display.texi (Making Buttons): Mention limitation of text buttons.
+
2011-01-08 Chong Yidong <cyd@stupidchicken.com>
* files.texi (Directory Names): Move directory-abbrev-alist doc to
@@ -8681,5 +8685,3 @@
You should have received a copy of the GNU General Public License
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
-
-;;; arch-tag: 985ae0ce-df29-475b-b3f8-4bbcbf6f7fda
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 7caa3571aeb..0a9fa30c599 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -4962,8 +4962,9 @@ and returns it.
button actually part of the text instead of being a property of the
buffer. Buttons using text properties do not create markers into the
buffer, which is important for speed when you use extremely large
-numbers of buttons. Both functions return the position of the start
-of the new button:
+numbers of buttons. (However, if there is an existing face text
+property at the site of the button, the button face may not be visible.)
+Both functions return the position of the start of the new button:
@defun make-text-button beg end &rest properties
This makes a button from @var{beg} to @var{end} in the current buffer, using
@@ -5904,7 +5905,3 @@ This hook is used for internal purposes: setting up communication with
the window system, and creating the initial window. Users should not
interfere with it.
@end defvar
-
-@ignore
- arch-tag: ffdf5714-7ecf-415b-9023-fbc6b409c2c6
-@end ignore