Merge from trunk.

[gnu-emacs] / lisp / tool-bar.el

diff --git a/lisp/tool-bar.el b/lisp/tool-bar.el
index 578de1def978ee3c91a9bb44c6abee569b0b50fb..8fdce17df861302a0c524fc601ee1da9d89b287e 100644 (file)
--- a/lisp/tool-bar.el
+++ b/lisp/tool-bar.el
@@ -88,7 +88,7 @@ Define this locally to override the global tool bar.")
 
 (defconst tool-bar-keymap-cache (make-hash-table :weakness t :test 'equal))
 
-(defun tool-bar-make-keymap (&optional ignore)
+(defun tool-bar-make-keymap (&optional _ignore)
   "Generate an actual keymap from `tool-bar-map'.
 Its main job is to figure out which images to use based on the display's
 color capability and based on the available image libraries."