auto upstream

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 @@
+2012-12-12  Glenn Morris  <rgm@gnu.org>
+
+        * button.el (button--area-button-p): Fix typo.
+
 2012-12-12  Sam Steingold  <sds@gnu.org>
 
         * 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."
   "Return t if BUTTON has button-type TYPE, or one of TYPE's subtypes."
   (button-type-subtype-p (button-get button 'type) type))
 
-(defun button--area-button-p (b) (stringp (car-safe b))
+(defun button--area-button-p (b)
   "Return non-nil if BUTTON is an area button.
-Such area buttons are used for buttons in the mode-line and header-line.")
+Such area buttons are used for buttons in the mode-line and header-line."
+  (stringp (car-safe b)))
 
 (defalias 'button--area-button-string #'car
   "Return area button BUTTON's button-string.")