4:31 a.m.
Since Jeff's recent changes, without this patch, I cannot build
hyperbole. It appears the package smoketest is broken as well (from
http://labb.contactor.se/~matsl/smoketest/logs/2006-07-31-18:02_buildAll_...
:
Loading hmouse-sh...
Initializing Hyperbole, please wait... # bind (
stack-trace-on-signal debug-on-signal stack-trace-on-error debug-on-error)
signal(file-error ("Cannot open load file" "ibuffer"))
# bind (data error-symbol)
signal-error(file-error ("Cannot open load file" "ibuffer"))
# bind (error-data)
normal-top-level()
# (condition-case ... . error)
# (catch top-levelmake[2]: *** [auto-autoloads.elc] Killed
make[2]: Leaving directory
`/home/matsl/work/smoketest/build/packages/xemacs-packages/hyperbole'
make[1]: *** [hyperbole/bytecompile.target] Error 2
make[1]: Leaving directory
`/home/matsl/work/smoketest/build/packages/xemacs-packages'
make: *** [xemacs-packages/bytecompile.target] Error 2
------ End of build -- all from top level
Ville, do you want me to commit this?
- Vin
packages source patch:
Diff command: cvs -q diff -u
Files affected: xemacs-packages/hyperbole/Makefile
Index: xemacs-packages/hyperbole/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/hyperbole/ChangeLog,v
retrieving revision 1.15
diff -a -u -u -r1.15 ChangeLog
--- xemacs-packages/hyperbole/ChangeLog 2004/10/04 12:07:46 1.15
+++ xemacs-packages/hyperbole/ChangeLog 2006/08/01 03:26:05
＠＠ -1,3 +1,7 ＠＠
+2006-07-31 Vin Shelton <acs(a)xemacs.org>
+
+ * Makefile (REQUIRES): Add ibuffer.
+
2004-09-29 Steve Youngs <steve(a)youngs.au.com>
* Makefile (REQUIRES): Add ecrypto.
Index: xemacs-packages/hyperbole/Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/hyperbole/Makefile,v
retrieving revision 1.9
diff -a -u -u -r1.9 Makefile
--- xemacs-packages/hyperbole/Makefile 2004/10/04 12:07:46 1.9
+++ xemacs-packages/hyperbole/Makefile 2006/08/01 03:26:05
＠＠ -25,7 +25,7 ＠＠
PACKAGE = hyperbole
PKG_TYPE = regular
REQUIRES = xemacs-base mail-lib calendar vm text-modes gnus mh-e rmail apel tm \
- sh-script net-utils ecrypto
+ sh-script net-utils ecrypto ibuffer
CATEGORY = standard
EXTRA_SOURCES = hsite.el hui-em19-b.el hui-ep-but.el hui-epV4-b.el \
7:45 a.m.
On Mon, 2006-07-31 at 23:31 -0400, Vin Shelton wrote:
Ville, do you want me to commit this?
Hm, I'm not sure why you're asking me, Mats Lidell is listed as the
hyperbole maintainer and Norbert is generally in charge with the
packages...
By the way, Jeff should probably be set as the calendar maintainer in
packages/MAINTAINERS.
9:44 a.m.
>>>> Ville wrote:
Ville> Hm, I'm not sure why you're asking me, Mats Lidell is listed as
Ville> the hyperbole maintainer and Norbert is generally in charge
Ville> with the packages...
... and I was just thinking when will someone fix this. :-)
Hyperbole hasn't been changed in a while, in the xemacs packages, but
I guess due to the dependencies to other packages there can be some
load problem.
I'll guess there is a missing dependency or something. Anyway. I'll
have a look at it during the day.
Yours
--
%% Mats
5:59 a.m.
>>>> "Mats" == Mats Lidell
<matsl(a)xemacs.org> writes:
Mats> ... and I was just thinking when will someone fix this. :-)
Yeah, me too, since I just broke the smoke test the other day myself!
Mats> Hyperbole hasn't been changed in a while, in the xemacs
Mats> packages, but I guess due to the dependencies to other
Mats> packages there can be some load problem.
That's right. What happens is that dependencies can be transitive.
Since all Lisp is in the same name space, and we have the autoload
feature, it's possible that under normal circumstances a certain
library is always loaded before another. However, in the package
build process we don't permit auto-autoloads IIRC, and explicitly load
auto-autoloads for explicit dependencies. (This is intended to keep
really confusing stuff like advice and APEL out of the package
builds.)
--
School of Systems and Information Engineering http://turnbull.sk.tsukuba.ac.jp
University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
Ask not how you can "do" free software business;
ask what your business can "do for" free software.
4:33 p.m.
New subject: [Q] hyperbole now requires ibuffer
QUERY
Jeff has now removed the ibuffer dependency from calendar. In the
meantime, Mats added an ibuffer dependency to hyperbole. Should we back
out the hyperbole change (since it now really doesn't depend on
ibuffer)?
--
Jerry James, Assistant Professor james(a)xemacs.org
Computer Science Department http://www.cs.usu.edu/~jerry/
Utah State University
6:20 p.m.
New subject: [Q] hyperbole now requires ibuffer
>>>> "Jerry" == Jerry James
<james(a)xemacs.org> writes:
Jerry> Jeff has now removed the ibuffer dependency from calendar.
Jerry> In the meantime, Mats added an ibuffer dependency to
Jerry> hyperbole. Should we back out the hyperbole change (since
Jerry> it now really doesn't depend on ibuffer)?
+1
Sorry, Mats!
--
School of Systems and Information Engineering http://turnbull.sk.tsukuba.ac.jp
University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
Ask not how you can "do" free software business;
ask what your business can "do for" free software.
2:51 a.m.
Vin Shelton writes:
Since Jeff's recent changes, without this patch, I cannot build
hyperbole. It appears the package smoketest is broken as well (from
http://labb.contactor.se/~matsl/smoketest/logs/2006-07-31-18:02_buildAll_...
:
How about instead, I remove the dependency for ibuffer? I only
included it because I wanted something that acted like Emacs'
fit-window-to-buffer. Since I've since added a bunch of
compatibility code, might as well add this one. Hyperbole builds ok
for me after I make this change.
I'll commit this shortly.
Jeff
ChangeLog addition:
2006-08-01 Jeff Miller <jeff.miller(a)xemacs.org>
* Makefile (REQUIRES): remove ibuffer for REQUIRES
* calendar.el: add cal-fit-window-to-buffer
* calendar.el (generate-calendar-window): use it
calendar source patch:
Diff command: cvs -q diff -uN
Files affected: calendar.el Makefile
Index: Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/Makefile,v
retrieving revision 1.31
diff -u -b -w -u -r1.31 Makefile
--- Makefile 2006/08/01 01:52:15 1.31
+++ Makefile 2006/08/02 01:42:32
＠＠ -22,7 +22,7 ＠＠
MAINTAINER = Jeff Miller <jeff.miller(a)xemacs.org>
PACKAGE = calendar
PKG_TYPE = regular
-REQUIRES = xemacs-base ibuffer
+REQUIRES = xemacs-base
CATEGORY = standard
include ../../Local.rules.inc
Index: calendar.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/calendar.el,v
retrieving revision 1.8
diff -u -b -w -u -r1.8 calendar.el
--- calendar.el 2006/07/31 02:15:23 1.8
+++ calendar.el 2006/08/02 01:42:33
＠＠ -130,6 +130,29 ＠＠
str))
)
+;; XEmacs change
+;; fit-window-to-buffer is only available in Emacs.
+;; shamelessly taken from ibuffer
+(unless (fboundp 'fit-window-to-buffer)
+ (defun cal-fit-window-to-buffer (&optional owin)
+ "Make window the right size to display its contents exactly."
+ (interactive)
+ (if owin
+ (delete-other-windows))
+ (when (> (length (window-list nil 'nomini)) 1)
+ (let* ((window (selected-window))
+ (buf (window-buffer window))
+ (height (window-displayed-height (selected-window)))
+ (new-height (with-current-buffer buf
+ (count-lines (point-min) (point-max))))
+ (diff (- new-height height)))
+ (unless (zerop diff)
+ (enlarge-window diff))
+ (let ((end (with-current-buffer buf (point-max))))
+ (while (and (> (length (window-list nil 'nomini)) 1)
+ (not (pos-visible-in-window-p end)))
+ (enlarge-window 1)))))))
+
;;; Code:
(eval-when-compile
＠＠ -138,8 +161,6 ＠＠
(defvar calendar-month-name-array)
(defvar calendar-starred-day))
-(require 'ibuffer)
-
(defun calendar-version ()
(interactive)
(message "Version 6, October 12, 1995"))
＠＠ -1856,7 +1877,7 ＠＠
(if (fboundp 'set-window-vscroll)
(set-window-vscroll nil 0))
;; Adjust the window to exactly fit the displayed calendar
- (ibuffer-shrink-to-fit ))
+ (cal-fit-window-to-buffer))
(sit-for 0)
(and mark-holidays-in-calendar
(mark-calendar-holidays)
--
Jeff Miller
jmiller(a)cablespeed.com
4:10 a.m.
New subject: [AC PATCH] hyperbole now requires ibuffer
This patch has been committed.
Jeff Miller writes:
Vin Shelton writes:
> Since Jeff's recent changes, without this patch, I cannot build
> hyperbole. It appears the package smoketest is broken as well (from
>
http://labb.contactor.se/~matsl/smoketest/logs/2006-07-31-18:02_buildAll_...
:
How about instead, I remove the dependency for ibuffer? I only
included it because I wanted something that acted like Emacs'
fit-window-to-buffer. Since I've since added a bunch of
compatibility code, might as well add this one. Hyperbole builds ok
for me after I make this change.
I'll commit this shortly.
Jeff
ChangeLog addition:
2006-08-01 Jeff Miller <jeff.miller(a)xemacs.org>
* Makefile (REQUIRES): remove ibuffer for REQUIRES
* calendar.el: add cal-fit-window-to-buffer
* calendar.el (generate-calendar-window): use it
calendar source patch:
Diff command: cvs -q diff -uN
Files affected: calendar.el Makefile
Index: Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/Makefile,v
retrieving revision 1.31
diff -u -b -w -u -r1.31 Makefile
--- Makefile 2006/08/01 01:52:15 1.31
+++ Makefile 2006/08/02 01:42:32
＠＠ -22,7 +22,7 ＠＠
MAINTAINER = Jeff Miller <jeff.miller(a)xemacs.org>
PACKAGE = calendar
PKG_TYPE = regular
-REQUIRES = xemacs-base ibuffer
+REQUIRES = xemacs-base
CATEGORY = standard
include ../../Local.rules.inc
Index: calendar.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/calendar.el,v
retrieving revision 1.8
diff -u -b -w -u -r1.8 calendar.el
--- calendar.el 2006/07/31 02:15:23 1.8
+++ calendar.el 2006/08/02 01:42:33
＠＠ -130,6 +130,29 ＠＠
str))
)
+;; XEmacs change
+;; fit-window-to-buffer is only available in Emacs.
+;; shamelessly taken from ibuffer
+(unless (fboundp 'fit-window-to-buffer)
+ (defun cal-fit-window-to-buffer (&optional owin)
+ "Make window the right size to display its contents exactly."
+ (interactive)
+ (if owin
+ (delete-other-windows))
+ (when (> (length (window-list nil 'nomini)) 1)
+ (let* ((window (selected-window))
+ (buf (window-buffer window))
+ (height (window-displayed-height (selected-window)))
+ (new-height (with-current-buffer buf
+ (count-lines (point-min) (point-max))))
+ (diff (- new-height height)))
+ (unless (zerop diff)
+ (enlarge-window diff))
+ (let ((end (with-current-buffer buf (point-max))))
+ (while (and (> (length (window-list nil 'nomini)) 1)
+ (not (pos-visible-in-window-p end)))
+ (enlarge-window 1)))))))
+
;;; Code:
(eval-when-compile
＠＠ -138,8 +161,6 ＠＠
(defvar calendar-month-name-array)
(defvar calendar-starred-day))
-(require 'ibuffer)
-
(defun calendar-version ()
(interactive)
(message "Version 6, October 12, 1995"))
＠＠ -1856,7 +1877,7 ＠＠
(if (fboundp 'set-window-vscroll)
(set-window-vscroll nil 0))
;; Adjust the window to exactly fit the displayed calendar
- (ibuffer-shrink-to-fit ))
+ (cal-fit-window-to-buffer))
(sit-for 0)
(and mark-holidays-in-calendar
(mark-calendar-holidays)
--
Jeff Miller
jmiller(a)cablespeed.com
--
Jeff Miller
jmiller(a)cablespeed.com
6474
days inactive
6477
days old
8 comments
6 participants
participants (6)
-
Jeff Miller -
Jerry James -
Stephen J. Turnbull -
The XEmacs Package Smoketest -
Ville Skyttä -
Vin Shelton