changeset 83002:e654e1383970

Merged in changes from CVS HEAD Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-16 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-42
author Karoly Lorentey <lorentey@elte.hu>
date Sat, 03 Jan 2004 16:53:54 +0000
parents 67a56c2e50c6 (current diff) 82d0164fa384 (diff)
children 19208c3cbcc9
files lisp/ChangeLog lisp/progmodes/idlwave.el
diffstat 13 files changed, 66 insertions(+), 47 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Sat Jan 03 16:51:56 2004 +0000
+++ b/lisp/ChangeLog	Sat Jan 03 16:53:54 2004 +0000
@@ -1,3 +1,19 @@
+2004-01-03  Jesper Harder  <harder@ifa.au.dk>  (tiny change)
+
+	* progmodes/idlwave.el (idlwave-make-tags): 
+	* textmodes/flyspell.el (flyspell-large-region):.
+	* progmodes/make-mode.el (makefile-query-by-make-minus-q):
+	* emulation/viper-util.el (viper-glob-unix-files):
+	* emacs-lisp/shadow.el (shadow-same-file-or-nonexistent):
+	* man.el (Man-init-defvars):
+	* jka-compr.el (jka-compr-call-process):
+	* files.el (get-free-disk-space,insert-directory):
+	* ediff-ptch.el (ediff-test-patch-utility):
+	* ediff-diff.el (ediff-test-utility):
+	* dired-aux.el (dired-check-process):
+	* mail/sendmail.el (sendmail-send-it): Don't use = or zerop to
+	test the return value of call-process, because it can be a string.
+
 2003-12-31  John Paul Wallington  <jpw@gnu.org>
 
 	* bindings.el (completion-ignored-extensions): Add .pfsl.
--- a/lisp/dired-aux.el	Sat Jan 03 16:51:56 2004 +0000
+++ b/lisp/dired-aux.el	Sat Jan 03 16:53:54 2004 +0000
@@ -561,8 +561,8 @@
       (set-buffer err-buffer)
       (erase-buffer)
       (setq default-directory dir	; caller's default-directory
-	    err (/= 0
-		 (apply (function dired-call-process) program nil arguments)))
+	    err (not (eq 0
+		 (apply (function dired-call-process) program nil arguments))))
       (if err
 	  (progn
 	    (dired-log (concat program " " (prin1-to-string arguments) "\n"))
--- a/lisp/ediff-diff.el	Sat Jan 03 16:51:56 2004 +0000
+++ b/lisp/ediff-diff.el	Sat Jan 03 16:53:54 2004 +0000
@@ -64,8 +64,8 @@
 ;; The following functions needed for setting diff/diff3 options
 ;; test if diff supports the --binary option
 (defsubst ediff-test-utility (diff-util option &optional files)
-  (zerop (apply 'call-process
-		(append (list diff-util nil nil nil option) files))))
+  (eq 0 (apply 'call-process
+	       (append (list diff-util nil nil nil option) files))))
 
 (defun ediff-diff-mandatory-option (diff-util)
   (let ((file (if (boundp 'null-device) null-device "/dev/null")))
--- a/lisp/ediff-ptch.el	Sat Jan 03 16:51:56 2004 +0000
+++ b/lisp/ediff-ptch.el	Sat Jan 03 16:53:54 2004 +0000
@@ -86,10 +86,10 @@
 
 (defun ediff-test-patch-utility ()
   (condition-case nil
-      (cond ((zerop (call-process ediff-patch-program nil nil nil "-z." "-b"))
+      (cond ((eq 0 (call-process ediff-patch-program nil nil nil "-z." "-b"))
 	     ;; GNU `patch' v. >= 2.2
 	     'gnu)
-	    ((zerop (call-process ediff-patch-program nil nil nil "-b"))
+	    ((eq 0 (call-process ediff-patch-program nil nil nil "-b"))
 	     'posix)
 	    (t 'traditional))
     (file-error nil)))
--- a/lisp/emacs-lisp/shadow.el	Sat Jan 03 16:51:56 2004 +0000
+++ b/lisp/emacs-lisp/shadow.el	Sat Jan 03 16:53:54 2004 +0000
@@ -161,7 +161,7 @@
 		 ;; sizes.
 		 (and (= (nth 7 (file-attributes f1))
 			 (nth 7 (file-attributes f2)))
-		      (zerop (call-process "cmp" nil nil nil "-s" f1 f2))))))))
+		      (eq 0 (call-process "cmp" nil nil nil "-s" f1 f2))))))))
 
 ;;;###autoload
 (defun list-load-path-shadows ()
--- a/lisp/emulation/viper-util.el	Sat Jan 03 16:51:56 2004 +0000
+++ b/lisp/emulation/viper-util.el	Sat Jan 03 16:53:54 2004 +0000
@@ -394,17 +394,17 @@
 			    command)))
       (goto-char (point-min))
       ;; Issue an error, if no match.
-      (if (> status 0)
-	  (save-excursion
-	    (skip-chars-forward " \t\n\j")
-	    (if (looking-at "ls:")
-		(viper-forward-Word 1))
-	    (error "%s: %s"
-		   (if (stringp  gshell)
-		       gshell
-		     "shell")
-		   (buffer-substring (point) (viper-line-pos 'end)))
-	    ))
+      (unless (eq 0 status)
+	(save-excursion
+	  (skip-chars-forward " \t\n\j")
+	  (if (looking-at "ls:")
+	      (viper-forward-Word 1))
+	  (error "%s: %s"
+		 (if (stringp  gshell)
+		     gshell
+		   "shell")
+		 (buffer-substring (point) (viper-line-pos 'end)))
+	  ))
       (goto-char (point-min))
       (viper-get-filenames-from-buffer 'one-per-line))
     ))
--- a/lisp/files.el	Sat Jan 03 16:51:56 2004 +0000
+++ b/lisp/files.el	Sat Jan 03 16:53:54 2004 +0000
@@ -4137,10 +4137,10 @@
     (save-match-data
       (with-temp-buffer
 	(when (and directory-free-space-program
-		   (zerop (call-process directory-free-space-program
-					nil t nil
-					directory-free-space-args
-					dir)))
+		   (eq 0 (call-process directory-free-space-program
+				       nil t nil
+				       directory-free-space-args
+				       dir)))
 	  ;; Usual format is a header line followed by a line of
 	  ;; numbers.
 	  (goto-char (point-min))
@@ -4260,21 +4260,21 @@
 				 file))))))))
 
 	  ;; If `insert-directory-program' failed, signal an error.
-	  (if (/= result 0)
-	      ;; On non-Posix systems, we cannot open a directory, so
-	      ;; don't even try, because that will always result in
-	      ;; the ubiquitous "Access denied".  Instead, show the
-	      ;; command line so the user can try to guess what went wrong.
-	      (if (and (file-directory-p file)
-		       (memq system-type '(ms-dos windows-nt)))
-		  (error
-		   "Reading directory: \"%s %s -- %s\" exited with status %s"
-		   insert-directory-program
-		   (if (listp switches) (concat switches) switches)
-		   file result)
-		;; Unix.  Access the file to get a suitable error.
-		(access-file file "Reading directory")
-		(error "Listing directory failed but `access-file' worked")))
+	  (unless (eq 0 result)
+	    ;; On non-Posix systems, we cannot open a directory, so
+	    ;; don't even try, because that will always result in
+	    ;; the ubiquitous "Access denied".  Instead, show the
+	    ;; command line so the user can try to guess what went wrong.
+	    (if (and (file-directory-p file)
+		     (memq system-type '(ms-dos windows-nt)))
+		(error
+		 "Reading directory: \"%s %s -- %s\" exited with status %s"
+		 insert-directory-program
+		 (if (listp switches) (concat switches) switches)
+		 file result)
+	      ;; Unix.  Access the file to get a suitable error.
+	      (access-file file "Reading directory")
+	      (error "Listing directory failed but `access-file' worked")))
 
 	  (when (string-match "--dired\\>" switches)
 	    (forward-line -2)
--- a/lisp/jka-compr.el	Sat Jan 03 16:51:56 2004 +0000
+++ b/lisp/jka-compr.el	Sat Jan 03 16:53:54 2004 +0000
@@ -356,7 +356,7 @@
 
 	  (jka-compr-delete-temp-file err-file)))
 
-    (or (zerop
+    (or (eq 0
 	 (apply 'call-process
 		prog
 		infile
--- a/lisp/mail/sendmail.el	Sat Jan 03 16:51:56 2004 +0000
+++ b/lisp/mail/sendmail.el	Sat Jan 03 16:53:54 2004 +0000
@@ -1029,7 +1029,7 @@
 			      )
 		      )
 		     (exit-value (apply 'call-process-region args)))
-		(or (null exit-value) (zerop exit-value)
+		(or (null exit-value) (eq 0 exit-value)
 		    (error "Sending...failed with exit value %d" exit-value)))
 	    (or fcc-was-found
 		(error "No recipients")))
--- a/lisp/man.el	Sat Jan 03 16:51:56 2004 +0000
+++ b/lisp/man.el	Sat Jan 03 16:53:54 2004 +0000
@@ -425,9 +425,9 @@
 	  (cond
 	   (Man-fontify-manpage-flag
 	    nil)
-	   ((= 0 (call-process Man-sed-command nil nil nil Man-sysv-sed-script))
+	   ((eq 0 (call-process Man-sed-command nil nil nil Man-sysv-sed-script))
 	    Man-sysv-sed-script)
-	   ((= 0 (call-process Man-sed-command nil nil nil Man-berkeley-sed-script))
+	   ((eq 0 (call-process Man-sed-command nil nil nil Man-berkeley-sed-script))
 	    Man-berkeley-sed-script)
 	   (t
 	    nil))))
--- a/lisp/progmodes/idlwave.el	Sat Jan 03 16:51:56 2004 +0000
+++ b/lisp/progmodes/idlwave.el	Sat Jan 03 16:53:54 2004 +0000
@@ -5,7 +5,7 @@
 ;;         Chris Chase <chase@att.com>
 ;; Maintainer: J.D. Smith <jdsmith@as.arizona.edu>
 ;; Version: 4.15
-;; Date: $Date: 2003/09/01 15:45:35 $
+;; Date: $Date: 2004/01/03 12:09:15 $
 ;; Keywords: languages
 
 ;; This file is part of GNU Emacs.
@@ -3889,9 +3889,12 @@
 		  (progn
 		    (message (concat "Tagging " item "..."))
 		    (setq errbuf (get-buffer-create "*idltags-error*"))
-		    (setq status (+ status
-				    (call-process "sh" nil errbuf nil "-c"
-						  (concat cmd append item))))
+		    (setq status
+			  (+ status
+			     (if (eq 0 (call-process "sh" nil errbuf nil "-c"
+						     (concat cmd append item)))
+				 0
+			       1)))
 		    ;;
 		    ;; Append additional tags
 		    (setq append " --append ")
--- a/lisp/progmodes/make-mode.el	Sat Jan 03 16:51:56 2004 +0000
+++ b/lisp/progmodes/make-mode.el	Sat Jan 03 16:53:54 2004 +0000
@@ -1374,7 +1374,7 @@
   (delete-file filename))		; remove the tmpfile
 
 (defun makefile-query-by-make-minus-q (target &optional filename)
-  (not (zerop
+  (not (eq 0
 	(call-process makefile-brave-make nil nil nil
 		      "-f" filename "-q" target))))
 
--- a/lisp/textmodes/flyspell.el	Sat Jan 03 16:51:56 2004 +0000
+++ b/lisp/textmodes/flyspell.el	Sat Jan 03 16:53:54 2004 +0000
@@ -1351,7 +1351,7 @@
 					       ispell-personal-dictionary)))))
 		      (setq args (append args ispell-extra-args))
 		      args))))
-      (if (= c 0)
+      (if (eq c 0)
 	  (flyspell-external-point-words)
 	(error "Can't check region...")))))