Changeset 4111 for trunk/lisp/mh-e/mh-tool-bar.el
- Timestamp:
- 07/16/06 08:36:52 (2 years ago)
- Files:
-
- trunk/lisp/mh-e/mh-tool-bar.el (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/lisp/mh-e/mh-tool-bar.el
r4073 r4111 150 150 (icon (nth 2 button)) 151 151 (xemacs-icon (mh-do-in-xemacs 152 (cdr (assoc (intern icon) mh-xemacs-icon-map))))152 `(cdr (assoc (quote ,(intern icon)) mh-xemacs-icon-map)))) 153 153 (full-doc (nth 3 button)) 154 154 (doc (if (string-match "\\(.*\\)\n" full-doc) … … 190 190 (docs (cond ((eq mbuttons 'letter-buttons) 'letter-docs) 191 191 ((eq mbuttons 'folder-buttons) 'folder-docs)))) 192 (add-to-list vector-list ` [,xemacs-icon ,function t ,full-doc])192 (add-to-list vector-list `(vector ,xemacs-icon ',function t ,full-doc)) 193 193 (add-to-list 194 194 setter `(when (member ',name ,list) … … 289 289 (mh-do-in-xemacs 290 290 (defvar mh-tool-bar-folder-vector-map 291 ',(loop for button in folder-buttons292 for vector in folder-vectors293 collect (cons button vector)))291 (list ,@(loop for button in folder-buttons 292 for vector in folder-vectors 293 collect `(cons ',button ,vector)))) 294 294 (defvar mh-tool-bar-show-vector-map 295 ',(loop for button in show-buttons296 for vector in show-vectors297 collect (cons button vector)))295 (list ,@(loop for button in show-buttons 296 for vector in show-vectors 297 collect `(cons ',button ,vector)))) 298 298 (defvar mh-tool-bar-letter-vector-map 299 ',(loop for button in letter-buttons300 for vector in letter-vectors301 collect (cons button vector)))302 (defvar mh-tool-bar-folder-buttons nil)303 (defvar mh-tool-bar-show-buttons nil)304 (defvar mh-tool-bar-letter-buttons nil)299 (list ,@(loop for button in letter-buttons 300 for vector in letter-vectors 301 collect `(cons ',button ,vector)))) 302 (defvar mh-tool-bar-folder-buttons) 303 (defvar mh-tool-bar-show-buttons) 304 (defvar mh-tool-bar-letter-buttons) 305 305 ;; Custom setter functions 306 306 (defun mh-tool-bar-letter-buttons-set (symbol value) … … 309 309 (setq mh-tool-bar-letter-buttons 310 310 (loop for b in value 311 collect (cdr (assoc b mh-tool-bar-letter-vector-map)))))) 311 collect (cdr 312 (assoc b mh-tool-bar-letter-vector-map)))))) 312 313 (defun mh-tool-bar-folder-buttons-set (symbol value) 313 314 (set-default symbol value) … … 321 322 (defun mh-tool-bar-init (mode) 322 323 "Install tool bar in MODE." 323 (let ((tool-bar (cond ((eq mode :folder) mh-tool-bar-folder-buttons) 324 ((eq mode :letter) mh-tool-bar-letter-buttons) 325 ((eq mode :show) mh-tool-bar-show-buttons))) 326 (height 37) 327 (width 40) 328 (buffer (current-buffer))) 329 (when mh-xemacs-use-tool-bar-flag 324 (when mh-xemacs-use-tool-bar-flag 325 (let ((tool-bar (cond ((eq mode :folder) 326 mh-tool-bar-folder-buttons) 327 ((eq mode :letter) 328 mh-tool-bar-letter-buttons) 329 ((eq mode :show) 330 mh-tool-bar-show-buttons))) 331 (height 37) 332 (width 40) 333 (buffer (current-buffer))) 330 334 (cond 331 335 ((eq mh-xemacs-tool-bar-position 'top) … … 368 372 collect `(const :tag ,y ,x))) 369 373 ;;:package-version '(MH-E "7.1") 370 )))) 371 374 )))) 375 376 ;; The icon names are duplicated in the Makefile and mh-xemacs.el. 372 377 (mh-tool-bar-define 373 378 ((:folder mh-inc-folder mh-mime-save-parts
