procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix unbound mm-uu-entry in mm-uu

Browse source 
* lisp/gnus/mm-uu.el (mm-uu-dissect): Rename entry to mm-uu-entry.
This commit is contained in:
Andreas Schwab 2018-02-10 23:55:48 +01:00
parent cb2487b173
commit d924953e05
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lisp/gnus/mm-uu.el
View file

@ -624,7 +624,7 @@ MIME-TYPE specifies a MIME type and parameters, which defaults to the
value of `mm-uu-text-plain-type'." value of `mm-uu-text-plain-type'."
(let ((case-fold-search t) (let ((case-fold-search t)
(mm-uu-text-plain-type (or mime-type mm-uu-text-plain-type)) (mm-uu-text-plain-type (or mime-type mm-uu-text-plain-type))
text-start start-point end-point file-name result entry func) text-start start-point end-point file-name result mm-uu-entry func)
(save-excursion (save-excursion
(goto-char (point-min)) (goto-char (point-min))
(cond (cond
@ -637,26 +637,26 @@ value of `mm-uu-text-plain-type'."
(setq text-start (point)) (setq text-start (point))
(while (re-search-forward mm-uu-beginning-regexp nil t) (while (re-search-forward mm-uu-beginning-regexp nil t)
(setq start-point (match-beginning 0) (setq start-point (match-beginning 0)
entry nil) mm-uu-entry nil)
(let ((alist mm-uu-type-alist) (let ((alist mm-uu-type-alist)
(beginning-regexp (match-string 0))) (beginning-regexp (match-string 0)))
(while (not entry) (while (not mm-uu-entry)
(if (string-match (mm-uu-beginning-regexp (car alist)) (if (string-match (mm-uu-beginning-regexp (car alist))
beginning-regexp) beginning-regexp)
(setq entry (car alist)) (setq mm-uu-entry (car alist))
(pop alist)))) (pop alist))))
(if (setq func (mm-uu-function-1 entry)) (if (setq func (mm-uu-function-1 mm-uu-entry))
(funcall func)) (funcall func))
(forward-line);; in case of failure (forward-line);; in case of failure
(when (and (not (mm-uu-configure-p (mm-uu-type entry) 'disabled)) (when (and (not (mm-uu-configure-p (mm-uu-type mm-uu-entry) 'disabled))
(let ((end-regexp (mm-uu-end-regexp entry))) (let ((end-regexp (mm-uu-end-regexp mm-uu-entry)))
(if (not end-regexp) (if (not end-regexp)
(or (setq end-point (point-max)) t) (or (setq end-point (point-max)) t)
(prog1 (prog1
(re-search-forward end-regexp nil t) (re-search-forward end-regexp nil t)
(forward-line) (forward-line)
(setq end-point (point))))) (setq end-point (point)))))
(or (not (setq func (mm-uu-function-2 entry))) (or (not (setq func (mm-uu-function-2 mm-uu-entry)))
(funcall func))) (funcall func)))
(if (and (> start-point text-start) (if (and (> start-point text-start)
(progn (progn
@ -675,7 +675,7 @@ value of `mm-uu-text-plain-type'."
mm-uu-text-plain-type) mm-uu-text-plain-type)
result)) result))
(push (push
(funcall (mm-uu-function-extract entry)) (funcall (mm-uu-function-extract mm-uu-entry))
result) result)
(goto-char (setq text-start end-point)))) (goto-char (setq text-start end-point))))
(when result (when result