1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-24 07:20:37 +00:00

(uudecode-insert-char): Fix bogus feature test.

(uudecode-decode-region-external): Doc fix.  Use with-temp-buffer
and make-temp-file.
(uudecode-decode-region): Doc fix.
This commit is contained in:
Dave Love 2000-11-17 12:59:35 +00:00
parent 66321b2fe2
commit 96403ac139
2 changed files with 24 additions and 22 deletions

View File

@ -1,8 +1,15 @@
2000-11-17 Dave Love <fx@gnu.org>
* uudecode.el (uudecode-insert-char): Fix bogus feature test.
(uudecode-decode-region-external): Doc fix. Use with-temp-buffer
and make-temp-file.
(uudecode-decode-region): Doc fix.
2000-11-14 Dave Love <fx@gnu.org> 2000-11-14 Dave Love <fx@gnu.org>
* cu-exit.pbm, exit-summ.pbm, followup.pbm, fuwo.pbm: * cu-exit.pbm, exit-summ.pbm, followup.pbm, fuwo.pbm:
* mail-reply.pbm, next-ur.pbm, post.pbm, prev-ur.pbm: * mail-reply.pbm, next-ur.pbm, post.pbm, prev-ur.pbm:
* reply-wo.pbm, reply.pbm rot13.pbm, save-aif.pbm, save-art.pbm: * reply-wo.pbm, reply.pbm, rot13.pbm, save-aif.pbm, save-art.pbm:
New files, derived from the XPMs. New files, derived from the XPMs.
2000-11-12 Dave Love <fx@gnu.org> 2000-11-12 Dave Love <fx@gnu.org>

View File

@ -27,10 +27,10 @@
;; Lots of codes are stolen from mm-decode.el, gnus-uu.el and ;; Lots of codes are stolen from mm-decode.el, gnus-uu.el and
;; base64.el ;; base64.el
;; This looks as though it could be made rather more efficient. ;; This looks as though it could be made rather more efficient for
;; Encoding could use a lookup table and decoding should presumably ;; internal working. Encoding could use a lookup table and decoding
;; use a vector or list buffer for partial results rather than ;; should presumably use a vector or list buffer for partial results
;; with-current-buffer. -- fx ;; rather than with-current-buffer. -- fx
;;; Code: ;;; Code:
@ -42,7 +42,7 @@
'char-int 'char-int
'identity)) 'identity))
(if (fboundp 'insert-char) (if (featurep 'xemacs)
(defalias 'uudecode-insert-char 'insert-char) (defalias 'uudecode-insert-char 'insert-char)
(defun uudecode-insert-char (char &optional count ignored buffer) (defun uudecode-insert-char (char &optional count ignored buffer)
(if (or (null buffer) (eq buffer (current-buffer))) (if (or (null buffer) (eq buffer (current-buffer)))
@ -80,11 +80,11 @@ input and write the converted data to its standard output."
;;;###autoload ;;;###autoload
(defun uudecode-decode-region-external (start end &optional file-name) (defun uudecode-decode-region-external (start end &optional file-name)
"Uudecode region between START and END with external decoder. "Uudecode region between START and END using external program.
If FILE-NAME is non-nil, save the result to FILE-NAME. The program
If FILE-NAME is non-nil, save the result to FILE-NAME." used is specified by `uudecode-decoder-program'."
(interactive "r\nP") (interactive "r\nP")
(let ((cbuf (current-buffer)) tempfile firstline work-buffer status) (let ((cbuf (current-buffer)) tempfile firstline status)
(save-excursion (save-excursion
(goto-char start) (goto-char start)
(when (re-search-forward uudecode-begin-line nil t) (when (re-search-forward uudecode-begin-line nil t)
@ -98,16 +98,13 @@ If FILE-NAME is non-nil, save the result to FILE-NAME."
(match-string 1))))) (match-string 1)))))
(setq tempfile (if file-name (setq tempfile (if file-name
(expand-file-name file-name) (expand-file-name file-name)
(make-temp-name (let ((temporary-file-directory
;; /tmp/uu... uudecode-temporary-file-directory))
(expand-file-name (make-temp-file "uu"))))
"uu" uudecode-temporary-file-directory)))) (let ((cdir default-directory)
(let ((cdir default-directory) default-process-coding-system) default-process-coding-system)
(unwind-protect (unwind-protect
(progn (with-temp-buffer
(set-buffer (setq work-buffer
(generate-new-buffer " *uudecode-work*")))
(buffer-disable-undo work-buffer)
(insert "begin 600 " (file-name-nondirectory tempfile) "\n") (insert "begin 600 " (file-name-nondirectory tempfile) "\n")
(insert-buffer-substring cbuf firstline end) (insert-buffer-substring cbuf firstline end)
(cd (file-name-directory tempfile)) (cd (file-name-directory tempfile))
@ -127,13 +124,11 @@ If FILE-NAME is non-nil, save the result to FILE-NAME."
(let (format-alist) (let (format-alist)
(insert-file-contents-literally tempfile))) (insert-file-contents-literally tempfile)))
(message "Can not uudecode"))) (message "Can not uudecode")))
(and work-buffer (kill-buffer work-buffer))
(ignore-errors (or file-name (delete-file tempfile)))))) (ignore-errors (or file-name (delete-file tempfile))))))
;;;###autoload ;;;###autoload
(defun uudecode-decode-region (start end &optional file-name) (defun uudecode-decode-region (start end &optional file-name)
"Uudecode region between START and END. "Uudecode region between START and END without using an external program.
If FILE-NAME is non-nil, save the result to FILE-NAME." If FILE-NAME is non-nil, save the result to FILE-NAME."
(interactive "r\nP") (interactive "r\nP")
(let ((work-buffer nil) (let ((work-buffer nil)