I will be committing this shortly
ChangeLog addition:
2008-09-27 Jeff Miller <jmiller(a)cablespeed.com>
* appt.el (appt-delete): use substring, not substring-no-properties
* cal-compat.el (cal-fit-window-to-buffer): forgot to call
fit-window-to-buffer in case where fit-window-to-buffer is
available. It is in 21.5.28 now.
calendar source patch:
Diff command: cvs -q diff -u
Files affected: cal-compat.el appt.el
Index: appt.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/appt.el,v
retrieving revision 1.13
diff -u -u -r1.13 appt.el
--- appt.el 2007/04/16 02:12:24 1.13
+++ appt.el 2008/09/27 20:25:24
@@ -739,7 +739,8 @@
;; in the string, as well as put
;; doublequotes around it.
(prin1-to-string
- (substring-no-properties
+ ;; XEmacs change, we don't have substring-no-properties
+ (substring
(car (cdr element)) 0))
" from list? "))
(test-input (y-or-n-p prompt-string)))
Index: cal-compat.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/cal-compat.el,v
retrieving revision 1.2
diff -u -u -r1.2 cal-compat.el
--- cal-compat.el 2006/11/19 00:31:23 1.2
+++ cal-compat.el 2008/09/27 20:25:24
@@ -152,25 +152,26 @@
;; fit-window-to-buffer is only available in Emacs.
;; shamelessly taken from ibuffer
;;;###autoload
-(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))
+(defun cal-fit-window-to-buffer (&optional owin)
+ "Make window the right size to display its contents exactly."
+ (interactive)
+ (if (fboundp 'fit-window-to-buffer)
+ (fit-window-to-buffer)
+ (progn (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)))))))
+ (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))))))))
;; XEmacs change. Mimic remove-overlays from Emacs, but for extents
;;;###autoload
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches