User: aidan
Date: 06/06/25 11:18:16
Modified: packages/xemacs-packages/edit-utils ChangeLog
toolbar-utils.el
Log:
Set toolbar to default-toolbar if not passed as an argument. Fix wrong
usage of setcdr when setting specifier. Thank you Jeff Miller!
Revision Changes Path
1.221 +6 -0 XEmacs/packages/xemacs-packages/edit-utils/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/edit-utils/ChangeLog,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -p -r1.220 -r1.221
--- ChangeLog 2006/03/07 07:14:12 1.220
+++ ChangeLog 2006/06/25 09:18:15 1.221
@@ -1,3 +1,9 @@
+2006-06-22 Jeff Miller <jmiller(a)cablespeed.com>
+
+ * toolbar-utils.el (toolbar-kill-item-pos): set toolbar to
+ default-toolbar if not passed as an argument. Fix wrong usage of
+ setcdr when setting specifier.
+
2006-03-07 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 2.34 released.
1.3 +7 -7 XEmacs/packages/xemacs-packages/edit-utils/toolbar-utils.el
Index: toolbar-utils.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/edit-utils/toolbar-utils.el,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- toolbar-utils.el 2002/12/12 03:28:33 1.2
+++ toolbar-utils.el 2006/06/25 09:18:15 1.3
@@ -383,14 +383,14 @@ spacers, and `toolbar-find-button' to lo
See also `toolbar-find-button-by-icon', `toolbar-find-button-by-command',
and `toolbar-find-button-by-help-string'."
(setq locale (or locale 'global))
- (let ((spec (cdadar (specifier-spec-list (or toolbar default-toolbar)
- locale))))
+ (setq toolbar (or toolbar default-toolbar))
+ (let ((spec (cdadar (specifier-spec-list toolbar locale))))
(setq button-palette (cons (nth pos spec) button-palette))
- (set-specifier toolbar (if (eq pos 0)
- (cdr spec)
- (setcdr (nthcdr (1- pos) spec)
- (nthcdr (1+ pos) spec)))
- locale)))
+ (if (eq pos 0)
+ (setq spec (cdr spec))
+ (setcdr (nthcdr (1- pos) spec)
+ (nthcdr (1+ pos) spec)))
+ (set-specifier toolbar spec locale)))
;; locating buttons by their content, returning a position