Re: byte-compile-file fails with latest cvs

[Nic Ferrier]

Richard Stallman <address@hidden> writes:

> Does this change fix it? 
>  
> *** compile.el.~1.249.~       Thu Jan 24 21:34:52 2002 
> --- compile.el        Sun Feb  3 09:26:23 2002 
<snipped patch/>

I tried applying this patch but it failed.

Here's what I did:


  cd {to patch lisp/progmodes directory}
  patch compile.el compile.diff

=>  patching file compile.el
    Hunk #1 FAILED at 66.
    Hunk #2 FAILED at 667.
    2 out of 2 hunks FAILED -- saving rejects to file compile.el.rej

The rejects are at the bottom of this message.

I tried with the -u switch (I reckon this is the most normal diff,
no?) but patch complained:

  patch: **** Only garbage was found in the patch input.

I'm using patch version 2.5.4.


I'm not sure why this isn't working.



Nic


Here's the rejects file.


***************
*** 66,71 ****
                 (integer :tag "First N lines")) 
    :group 'compilation) 
   
  (defcustom grep-command nil 
    "The default grep command for \\[grep]. 
  If the grep program used supports an option to always include file names 
--- 66,128 ----
                 (integer :tag "First N lines")) 
    :group 'compilation) 
   
+ ;;; This has to be here so it can be called 
+ ;;; by the following defcustoms. 
+ (defun grep-compute-defaults () 
+   (unless (or (not grep-use-null-device) (eq grep-use-null-device t)) 
+     (setq grep-use-null-device 
+         (with-temp-buffer 
+           (let ((hello-file (expand-file-name "HELLO" data-directory))) 
+             (not 
+              (and (equal (condition-case nil 
+                              (if grep-command 
+                                  ;; `grep-command' is already set, so 
+                                  ;; use that for testing. 
+                                  (call-process-shell-command 
+                                   grep-command nil t nil 
+                                   "^English" hello-file) 
+                                ;; otherwise use `grep-program' 
+                                (call-process grep-program nil t nil 
+                                              "-nH" "^English" hello-file)) 
+                            (error nil)) 
+                          0) 
+                   (progn 
+                     (goto-char (point-min)) 
+                     (looking-at 
+                      (concat (regexp-quote hello-file) 
+                              ":[0-9]+:English"))))))))) 
+   (unless grep-command 
+     (setq grep-command 
+         (let ((required-options (if grep-use-null-device "-n" "-nH"))) 
+           (if (equal (condition-case nil ; in case "grep" isn't in exec-path 
+                          (call-process grep-program nil nil nil 
+                                        "-e" "foo" null-device) 
+                        (error nil)) 
+                      1) 
+               (format "%s %s -e " grep-program required-options) 
+             (format "%s %s " grep-program required-options))))) 
+   (unless grep-find-use-xargs 
+     (setq grep-find-use-xargs 
+         (if (and 
+                (equal (call-process "find" nil nil nil 
+                                     null-device "-print0") 
+                       0) 
+                (equal (call-process "xargs" nil nil nil 
+                                     "-0" "-e" "echo") 
+                    0)) 
+             'gnu))) 
+   (unless grep-find-command 
+     (setq grep-find-command 
+         (cond ((eq grep-find-use-xargs 'gnu) 
+                (format "%s . -type f -print0 | xargs -0 -e %s" 
+                        find-program grep-command)) 
+               (grep-find-use-xargs 
+                (format "%s . -type f -print | xargs %s" 
+                          find-program grep-command)) 
+               (t (cons (format "%s . -type f -exec %s {} %s \\;" 
+                                find-program grep-command null-device) 
+                        (+ 22 (length grep-command)))))))) 
+  
  (defcustom grep-command nil 
    "The default grep command for \\[grep]. 
  If the grep program used supports an option to always include file names 
***************
*** 610,670 ****
                   (t 
                    (cons msg code))) 
           (cons msg code))))) 
-  
- (defun grep-compute-defaults () 
-   (unless (or (not grep-use-null-device) (eq grep-use-null-device t)) 
-     (setq grep-use-null-device 
-         (with-temp-buffer 
-           (let ((hello-file (expand-file-name "HELLO" data-directory))) 
-             (not 
-              (and (equal (condition-case nil 
-                              (if grep-command 
-                                  ;; `grep-command' is already set, so 
-                                  ;; use that for testing. 
-                                  (call-process-shell-command 
-                                   grep-command nil t nil 
-                                   "^English" hello-file) 
-                                ;; otherwise use `grep-program' 
-                                (call-process grep-program nil t nil 
-                                              "-nH" "^English" hello-file)) 
-                            (error nil)) 
-                          0) 
-                   (progn 
-                     (goto-char (point-min)) 
-                     (looking-at 
-                      (concat (regexp-quote hello-file) 
-                              ":[0-9]+:English"))))))))) 
-   (unless grep-command 
-     (setq grep-command 
-         (let ((required-options (if grep-use-null-device "-n" "-nH"))) 
-           (if (equal (condition-case nil ; in case "grep" isn't in exec-path 
-                          (call-process grep-program nil nil nil 
-                                        "-e" "foo" null-device) 
-                        (error nil)) 
-                      1) 
-               (format "%s %s -e " grep-program required-options) 
-             (format "%s %s " grep-program required-options))))) 
-   (unless grep-find-use-xargs 
-     (setq grep-find-use-xargs 
-         (if (and 
-                (equal (call-process "find" nil nil nil 
-                                     null-device "-print0") 
-                       0) 
-                (equal (call-process "xargs" nil nil nil 
-                                     "-0" "-e" "echo") 
-                    0)) 
-             'gnu))) 
-   (unless grep-find-command 
-     (setq grep-find-command 
-         (cond ((eq grep-find-use-xargs 'gnu) 
-                (format "%s . -type f -print0 | xargs -0 -e %s" 
-                        find-program grep-command)) 
-               (grep-find-use-xargs 
-                (format "%s . -type f -print | xargs %s" 
-                          find-program grep-command)) 
-               (t (cons (format "%s . -type f -exec %s {} %s \\;" 
-                                find-program grep-command null-device) 
-                        (+ 22 (length grep-command)))))))) 
   
  ;;;###autoload 
  (defun grep (command-args) 
--- 667,672 ----
                   (t 
                    (cons msg code))) 
           (cons msg code))))) 
   
  ;;;###autoload 
  (defun grep (command-args)