aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/button.el5
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index adf8d9f88f0..3d3892a12be 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12012-12-12 Glenn Morris <rgm@gnu.org>
2
3 * button.el (button--area-button-p): Fix typo.
4
12012-12-12 Sam Steingold <sds@gnu.org> 52012-12-12 Sam Steingold <sds@gnu.org>
2 6
3 * frame.el (frame-maximization-style): New user option. 7 * frame.el (frame-maximization-style): New user option.
diff --git a/lisp/button.el b/lisp/button.el
index f15f09f24db..f93d08f2e3d 100644
--- a/lisp/button.el
+++ b/lisp/button.el
@@ -258,9 +258,10 @@ header-line) a string."
258 "Return t if BUTTON has button-type TYPE, or one of TYPE's subtypes." 258 "Return t if BUTTON has button-type TYPE, or one of TYPE's subtypes."
259 (button-type-subtype-p (button-get button 'type) type)) 259 (button-type-subtype-p (button-get button 'type) type))
260 260
261(defun button--area-button-p (b) (stringp (car-safe b)) 261(defun button--area-button-p (b)
262 "Return non-nil if BUTTON is an area button. 262 "Return non-nil if BUTTON is an area button.
263Such area buttons are used for buttons in the mode-line and header-line.") 263Such area buttons are used for buttons in the mode-line and header-line."
264 (stringp (car-safe b)))
264 265
265(defalias 'button--area-button-string #'car 266(defalias 'button--area-button-string #'car
266 "Return area button BUTTON's button-string.") 267 "Return area button BUTTON's button-string.")