aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2009-10-17 03:15:13 +0000
committerGlenn Morris2009-10-17 03:15:13 +0000
commitcec05144408bf0307d90263077f704cb5d832ed0 (patch)
treeb7f5c78bb1975ff716f5e671f6b42aba003ae9a0
parent2550e4b1433e9a1230afe383d1fd375635c7b868 (diff)
downloademacs-cec05144408bf0307d90263077f704cb5d832ed0.tar.gz
emacs-cec05144408bf0307d90263077f704cb5d832ed0.zip
(gs-load-image): Replace obsolete forms of sit-for, sleep-for.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/gs.el8
2 files changed, 6 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 44c4853f061..d7000437615 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12009-10-17 Glenn Morris <rgm@gnu.org> 12009-10-17 Glenn Morris <rgm@gnu.org>
2 2
3 * gs.el (gs-load-image): Replace obsolete forms of sit-for, sleep-for.
4
3 * dired.el (dired-ls-F-marks-symlinks, dired-keep-marker-rename) 5 * dired.el (dired-ls-F-marks-symlinks, dired-keep-marker-rename)
4 (dired-keep-marker-copy, dired-keep-marker-hardlink) 6 (dired-keep-marker-copy, dired-keep-marker-hardlink)
5 (dired-keep-marker-symlink, dired-dwim-target) 7 (dired-keep-marker-symlink, dired-dwim-target)
diff --git a/lisp/gs.el b/lisp/gs.el
index 69405d75e78..7461cd563ab 100644
--- a/lisp/gs.el
+++ b/lisp/gs.el
@@ -1,7 +1,7 @@
1;;; gs.el --- interface to Ghostscript 1;;; gs.el --- interface to Ghostscript
2 2
3;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 3;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
4;; 2008, 2009 Free Software Foundation, Inc. 4;; 2009 Free Software Foundation, Inc.
5 5
6;; Maintainer: FSF 6;; Maintainer: FSF
7;; Keywords: internal 7;; Keywords: internal
@@ -180,8 +180,8 @@ the form \"WINDOW-ID PIXMAP-ID\". Value is non-nil if successful."
180 ;; out even more sluggish. 180 ;; out even more sluggish.
181 ;; (get-buffer-process "*GS*") 181 ;; (get-buffer-process "*GS*")
182 (not (zerop timeout))) 182 (not (zerop timeout)))
183 (unless (sit-for 0 100 t) 183 (unless (sit-for 0.1 t)
184 (sleep-for 0 50)) 184 (sleep-for 0.05))
185 (setq timeout (1- timeout))) 185 (setq timeout (1- timeout)))
186 186
187 ;; No use waiting longer. We might want to try killing off 187 ;; No use waiting longer. We might want to try killing off