Mercurial > hg > xemacs-beta
comparison lisp/make-docfile.el @ 5098:e402e3506a53
Use #'subseq, not #'substring, in native-windows-specific code, make-docfile.el
2010-03-04 Aidan Kehoe <kehoea@parhasard.net>
* make-docfile.el (process-args):
Use #'subseq here, not #'substring, fixing the native Windows
build. Thank you for the error report, Vin!
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Thu, 04 Mar 2010 16:47:16 +0000 |
| parents | 788c38f20376 |
| children | 308d34e9f07d |
comparison
equal
deleted
inserted
replaced
| 5097:4a6b680a9577 | 5098:e402e3506a53 |
|---|---|
| 90 (if (string-match "^@" arg) | 90 (if (string-match "^@" arg) |
| 91 ;; MS Windows response file | 91 ;; MS Windows response file |
| 92 ;; no generate-new-buffer so use its implementation. | 92 ;; no generate-new-buffer so use its implementation. |
| 93 (let ((buf (get-buffer-create (generate-new-buffer-name "foo")))) | 93 (let ((buf (get-buffer-create (generate-new-buffer-name "foo")))) |
| 94 (set-buffer buf) | 94 (set-buffer buf) |
| 95 (insert-file-contents-internal (substring arg 1)) | 95 (insert-file-contents-internal (subseq arg 1)) |
| 96 ;; now majorly grind up the response file. | 96 ;; now majorly grind up the response file. |
| 97 ;; backslashes get doubled, quotes around strings, | 97 ;; backslashes get doubled, quotes around strings, |
| 98 ;; get rid of pesky CR's and NL's, and put parens around | 98 ;; get rid of pesky CR's and NL's, and put parens around |
| 99 ;; the whole thing so we have a valid list of strings. | 99 ;; the whole thing so we have a valid list of strings. |
| 100 (goto-char (point-max)) | 100 (goto-char (point-max)) |
| 121 (when (string-match "\\(.*\\)\\.obj$" arg) | 121 (when (string-match "\\(.*\\)\\.obj$" arg) |
| 122 (setq arg (expand-file-name | 122 (setq arg (expand-file-name |
| 123 (concat | 123 (concat |
| 124 (file-name-nondirectory | 124 (file-name-nondirectory |
| 125 ;; no match-string so use its implementation. | 125 ;; no match-string so use its implementation. |
| 126 (substring arg (match-beginning 1) | 126 (subseq arg (match-beginning 1) (match-end 1))) |
| 127 (match-end 1))) | |
| 128 ".c") | 127 ".c") |
| 129 source-src))) | 128 source-src))) |
| 130 (if (and (null docfile-out-of-date) | 129 (if (and (null docfile-out-of-date) |
| 131 (file-newer-than-file-p arg docfile)) | 130 (file-newer-than-file-p arg docfile)) |
| 132 (setq docfile-out-of-date t)) | 131 (setq docfile-out-of-date t)) |