Correct documentation relating to tool-bar-position

* doc/emacs/android.texi (Android Windowing): Don't claim that
tool-bar-position is unsupported on Android.

* lisp/tool-bar.el (tool-bar-position): Update doc string to
mention that bottom is supported on all systems but Nextstep.

(cherry picked from commit b82a003544c607b5c54bab13870d52b53e70aeb8)

diff --git a/doc/emacs/android.texi b/doc/emacs/android.texi
index 3226b1a238c1fdf7ab255ccd9005ff9635e6d6b0..889661c70361befca89f40599d679548f98751a9 100644 (file)
--- a/doc/emacs/android.texi
+++ b/doc/emacs/android.texi
@@ -904,9 +904,9 @@ devices.
 @item
 The @code{alpha}, @code{alpha-background}, @code{z-group},
 @code{override-redirect}, @code{mouse-color}, @code{title},
-@code{wait-for-wm}, @code{sticky}, @code{undecorated} and
-@code{tool-bar-position} frame parameters (@pxref{Frame Parameters,,,
-elisp, the Emacs Lisp Reference Manual}) are unsupported.
+@code{wait-for-wm}, @code{sticky}, and @code{undecorated} frame
+parameters (@pxref{Frame Parameters,,, elisp, the Emacs Lisp Reference
+Manual}) are unsupported.
 
 @item
 On Android 4.0 and earlier, the @code{fullscreen} frame parameter is

diff --git a/lisp/tool-bar.el b/lisp/tool-bar.el
index 96b61c7b22957ffb5ba3316feaa8c2867736f268..0f64533867440ffaf5b5e502389de9d05fc6c166 100644 (file)
--- a/lisp/tool-bar.el
+++ b/lisp/tool-bar.el
@@ -360,11 +360,12 @@ holds a keymap."
 (if (featurep 'move-toolbar)
     (defcustom tool-bar-position 'top
       "Specify on which side the tool bar shall be.
-Possible values are `top' (tool bar on top), `bottom' (tool bar at bottom),
-`left' (tool bar on left) and `right' (tool bar on right).
-This option has effect only on graphical frames and only
-if Emacs was built with GTK.
-Customize `tool-bar-mode' if you want to show or hide the tool bar."
+Possible values are `top' (tool bar on top), `bottom' (tool bar at
+bottom), `left' (tool bar on left) and `right' (tool bar on right).
+This option takes effect only on graphical frames, the values `left' and
+`right' only if Emacs was built with GTK, and `bottom' only on systems
+besides Nextstep.  Customize `tool-bar-mode' if you want to show or hide
+the tool bar."
       :version "24.1"
       :type '(choice (const top)
                     (const bottom)