From 008829b532b439a6fdcf9761f3f8ed6d1a345b4a Mon Sep 17 00:00:00 2001 From: ueno Date: Mon, 10 Apr 2000 07:46:51 +0000 Subject: [PATCH] * liece-xemacs.el (liece-xemacs-setup-toolbar): Run `liece-xemacs-setup-toolbar-hook' only once. (liece-setup-toolbar): Don't check return value of `liece-xemacs-setup-toolbar'. Reported by: Yosuke MITSUMASU --- lisp/ChangeLog | 8 ++++++++ lisp/liece-xemacs.el | 12 ++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 69cf1f1..014560a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2000-04-08 Daiki Ueno + + * liece-xemacs.el (liece-xemacs-setup-toolbar): Run + `liece-xemacs-setup-toolbar-hook' only once. + (liece-setup-toolbar): Don't check return value + of `liece-xemacs-setup-toolbar'. + Reported by: Yosuke MITSUMASU + 2000-04-05 Daiki Ueno * liece-commands.el: Add autoload for liece-command-ctcp-version, diff --git a/lisp/liece-xemacs.el b/lisp/liece-xemacs.el index 06cc66c..0c2d529 100644 --- a/lisp/liece-xemacs.el +++ b/lisp/liece-xemacs.el @@ -209,8 +209,8 @@ If optional argument FORCE is non-nil, always update toolbar." "icon")))) (when (or force (not (symbol-value icon))) - (set icon (liece-toolbar-map-button-list plist))) - (run-hooks 'liece-xemacs-setup-toolbar-hook)))) + (set icon (liece-toolbar-map-button-list plist)))) + (run-hooks 'liece-xemacs-setup-toolbar-hook))) (add-hook 'liece-xemacs-setup-toolbar-hook 'liece-toolbar-setup-crypt-glyph) @@ -265,10 +265,10 @@ If optional argument FORCE is non-nil, always update toolbar." (defun liece-setup-toolbar () "Prepare toolbar if wanted." - (and liece-use-toolbar - (liece-xemacs-setup-toolbar liece-toolbar-spec-list) - (set-specifier (symbol-value liece-use-toolbar) - (cons (current-buffer) liece-toolbar-spec-list)))) + (when liece-use-toolbar + (liece-xemacs-setup-toolbar liece-toolbar-spec-list) + (set-specifier (symbol-value liece-use-toolbar) + (cons (current-buffer) liece-toolbar-spec-list)))) (defun liece-xemacs-modeline-glyph () "Return a glyph of modeline pointer." -- 1.7.10.4