Anonymous avatar Anonymous committed 40d4584

* appt.el (appt-delete): use substring, not substring-no-properties
* cal-compat.el (cal-fit-window-to-buffer): forgot to call
cal-fit-window-to-buffer in case where fit-window-to-buffer is
available. It is in 21.5.28 now.

Comments (0)

Files changed (3)

+2008-09-27  Jeff Miller  <jmiller@cablespeed.com>
+
+	* appt.el (appt-delete): use substring, not substring-no-properties
+	* cal-compat.el (cal-fit-window-to-buffer): forgot to call
+	cal-fit-window-to-buffer in case where fit-window-to-buffer is
+	available. It is in 21.5.28 now.
+
 2008-07-14  Norbert Koch  <viteno@xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 1.37 released.
 				    ;; 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)))
 ;; 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
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.