Mercurial > emacs
diff lisp/cus-edit.el @ 91327:606f2d163a64
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-312
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 09 Jan 2008 01:21:15 +0000 |
parents | c938ab6810a4 d71a9a15e3d2 |
children | c70e45a7acfd |
line wrap: on
line diff
--- a/lisp/cus-edit.el Tue Jan 08 05:34:24 2008 +0000 +++ b/lisp/cus-edit.el Wed Jan 09 01:21:15 2008 +0000 @@ -1,7 +1,7 @@ ;;; cus-edit.el --- tools for customizing Emacs and Lisp packages ;; ;; Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007 Free Software Foundation, Inc. +;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ;; ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> ;; Maintainer: FSF @@ -4465,15 +4465,12 @@ custom-commands))) (defvar tool-bar-map) -(defvar custom-tool-bar-map - (if (display-graphic-p) - (let ((map (make-sparse-keymap))) - (mapc - (lambda (arg) - (tool-bar-local-item-from-menu - (nth 1 arg) (nth 4 arg) map custom-mode-map)) - custom-commands) - map))) + +;;; `custom-tool-bar-map' used to be set up here. This will fail to +;;; DTRT when `display-graphic-p' returns nil during compilation. Hence +;;; we set this up lazily in `custom-mode'. +(defvar custom-tool-bar-map nil + "Keymap for toolbar in Custom mode.") ;;; The Custom Mode. @@ -4534,7 +4531,17 @@ if that value is non-nil." (use-local-map custom-mode-map) (easy-menu-add Custom-mode-menu) - (set (make-local-variable 'tool-bar-map) custom-tool-bar-map) + (when (display-graphic-p) + (set (make-local-variable 'tool-bar-map) + (or custom-tool-bar-map + ;; Set up `custom-tool-bar-map'. + (let ((map (make-sparse-keymap))) + (mapc + (lambda (arg) + (tool-bar-local-item-from-menu + (nth 1 arg) (nth 4 arg) map custom-mode-map)) + custom-commands) + (setq custom-tool-bar-map map))))) (make-local-variable 'custom-options) (make-local-variable 'custom-local-buffer) (make-local-variable 'widget-documentation-face)