[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-commit] emacs/lisp/mh-e mh-tool-bar.el ChangeLog
From: |
Bill Wohler |
Subject: |
[Emacs-commit] emacs/lisp/mh-e mh-tool-bar.el ChangeLog |
Date: |
Mon, 03 Jul 2006 23:41:32 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Bill Wohler <wohler> 06/07/03 23:41:32
Modified files:
lisp/mh-e : mh-tool-bar.el ChangeLog
Log message:
(mh-tool-bar-define): Fix XEmacs' vector-list so it refers to the
icons in mh-xemacs-icon-map instead of trying to declare the icons in
situ. This allows mh-tool-bar.el to be compiled under XEmacs. Remove
initial value for mh-tool-bar-folder-buttons,
mh-tool-bar-show-buttons, mh-tool-bar-letter-buttons. The MH-E icons
now appear in XEmacs. In mh-tool-bar-init, check for
mh-xemacs-use-tool-bar-flag sooner. This allows MH-E to be used in
XEmacs in a tty (closes SF #1506846).
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mh-e/mh-tool-bar.el?cvsroot=emacs&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mh-e/ChangeLog?cvsroot=emacs&r1=1.226&r2=1.227
Patches:
Index: mh-tool-bar.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/mh-e/mh-tool-bar.el,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- mh-tool-bar.el 21 Apr 2006 01:32:16 -0000 1.8
+++ mh-tool-bar.el 3 Jul 2006 23:41:32 -0000 1.9
@@ -149,7 +149,7 @@
(name-str (symbol-name name))
(icon (nth 2 button))
(xemacs-icon (mh-do-in-xemacs
- (cdr (assoc (intern icon) mh-xemacs-icon-map))))
+ `(cdr (assoc (quote ,(intern icon))
mh-xemacs-icon-map))))
(full-doc (nth 3 button))
(doc (if (string-match "\\(.*\\)\n" full-doc)
(match-string 1 full-doc)
@@ -189,7 +189,7 @@
(t 'folder-buttons)))
(docs (cond ((eq mbuttons 'letter-buttons) 'letter-docs)
((eq mbuttons 'folder-buttons) 'folder-docs))))
- (add-to-list vector-list `[,xemacs-icon ,function t ,full-doc])
+ (add-to-list vector-list `(vector ,xemacs-icon ',function t
,full-doc))
(add-to-list
setter `(when (member ',name ,list)
(mh-funcall-if-exists
@@ -288,27 +288,28 @@
;; XEmacs specific code
(mh-do-in-xemacs
(defvar mh-tool-bar-folder-vector-map
- ',(loop for button in folder-buttons
+ (list ,@(loop for button in folder-buttons
for vector in folder-vectors
- collect (cons button vector)))
+ collect `(cons ',button ,vector))))
(defvar mh-tool-bar-show-vector-map
- ',(loop for button in show-buttons
+ (list ,@(loop for button in show-buttons
for vector in show-vectors
- collect (cons button vector)))
+ collect `(cons ',button ,vector))))
(defvar mh-tool-bar-letter-vector-map
- ',(loop for button in letter-buttons
+ (list ,@(loop for button in letter-buttons
for vector in letter-vectors
- collect (cons button vector)))
- (defvar mh-tool-bar-folder-buttons nil)
- (defvar mh-tool-bar-show-buttons nil)
- (defvar mh-tool-bar-letter-buttons nil)
+ collect `(cons ',button ,vector))))
+ (defvar mh-tool-bar-folder-buttons)
+ (defvar mh-tool-bar-show-buttons)
+ (defvar mh-tool-bar-letter-buttons)
;; Custom setter functions
(defun mh-tool-bar-letter-buttons-set (symbol value)
(set-default symbol value)
(when mh-xemacs-has-tool-bar-flag
(setq mh-tool-bar-letter-buttons
(loop for b in value
- collect (cdr (assoc b
mh-tool-bar-letter-vector-map))))))
+ collect (cdr
+ (assoc b mh-tool-bar-letter-vector-map))))))
(defun mh-tool-bar-folder-buttons-set (symbol value)
(set-default symbol value)
(when mh-xemacs-has-tool-bar-flag
@@ -320,13 +321,16 @@
collect (cdr (assoc b
mh-tool-bar-show-vector-map))))))
(defun mh-tool-bar-init (mode)
"Install tool bar in MODE."
- (let ((tool-bar (cond ((eq mode :folder) mh-tool-bar-folder-buttons)
- ((eq mode :letter) mh-tool-bar-letter-buttons)
- ((eq mode :show) mh-tool-bar-show-buttons)))
+ (when mh-xemacs-use-tool-bar-flag
+ (let ((tool-bar (cond ((eq mode :folder)
+ mh-tool-bar-folder-buttons)
+ ((eq mode :letter)
+ mh-tool-bar-letter-buttons)
+ ((eq mode :show)
+ mh-tool-bar-show-buttons)))
(height 37)
(width 40)
(buffer (current-buffer)))
- (when mh-xemacs-use-tool-bar-flag
(cond
((eq mh-xemacs-tool-bar-position 'top)
(set-specifier top-toolbar tool-bar buffer)
@@ -369,6 +373,7 @@
;;:package-version '(MH-E "7.1")
))))
+;; The icon names are duplicated in the Makefile and mh-xemacs.el.
(mh-tool-bar-define
((:folder mh-inc-folder mh-mime-save-parts
mh-previous-undeleted-msg mh-page-msg
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/mh-e/ChangeLog,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -b -r1.226 -r1.227
--- ChangeLog 3 Jul 2006 23:30:27 -0000 1.226
+++ ChangeLog 3 Jul 2006 23:41:32 -0000 1.227
@@ -1,3 +1,15 @@
+2006-07-03 Ted Phelps <address@hidden> (tiny change)
+
+ * mh-tool-bar.el (mh-tool-bar-define): Fix XEmacs' vector-list so
+ it refers to the icons in mh-xemacs-icon-map instead of trying to
+ declare the icons in situ. This allows mh-tool-bar.el to be
+ compiled under XEmacs. Remove initial value for
+ mh-tool-bar-folder-buttons, mh-tool-bar-show-buttons,
+ mh-tool-bar-letter-buttons. The MH-E icons now appear in XEmacs.
+ In mh-tool-bar-init, check for mh-xemacs-use-tool-bar-flag sooner.
+ This allows MH-E to be used in XEmacs in a tty (closes SF
+ #1506846).
+
2006-07-03 Bill Wohler <address@hidden>
* mh-e.el: Require mh-buffers and mh-compat before mh-xemacs now
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-commit] emacs/lisp/mh-e mh-tool-bar.el ChangeLog,
Bill Wohler <=