Commit 46b54e5b authored by Lars Ingebrigtsen's avatar Lars Ingebrigtsen
Browse files

Improve quail-update-leim-list-file error messaging

* lisp/international/quail.el (quail-update-leim-list-file): Give
a better error message.
parent 8fd97b1d
Pipeline #9493 passed with stages
in 8 minutes and 46 seconds
......@@ -3066,28 +3066,31 @@ of each directory."
;; Don't get fooled by commented-out code.
(while (re-search-forward "^[ \t]*(quail-define-package" nil t)
(goto-char (match-beginning 0))
(condition-case nil
(let ((form (read (current-buffer))))
(with-current-buffer list-buf
(insert
(format "(register-input-method
(let (form)
(condition-case err
(progn
(setq form (read (current-buffer)))
(with-current-buffer list-buf
(insert
(format "(register-input-method
%S %S '%s
%S %S
%S)\n"
(nth 1 form) ; PACKAGE-NAME
(nth 2 form) ; LANGUAGE
'quail-use-package ; ACTIVATE-FUNC
(nth 3 form) ; PACKAGE-TITLE
(progn ; PACKAGE-DESCRIPTION (one line)
(string-match ".*" (nth 5 form))
(match-string 0 (nth 5 form)))
(file-relative-name ; PACKAGE-FILENAME
(file-name-sans-extension (car pkg-list))
(car dirnames))))))
(error
;; Ignore the remaining contents of this file.
(goto-char (point-max))
(message "Some part of \"%s\" is broken" (car pkg-list))))))
(nth 1 form) ; PACKAGE-NAME
(nth 2 form) ; LANGUAGE
'quail-use-package ; ACTIVATE-FUNC
(nth 3 form) ; PACKAGE-TITLE
(progn ; PACKAGE-DESCRIPTION (one line)
(string-match ".*" (nth 5 form))
(match-string 0 (nth 5 form)))
(file-relative-name ; PACKAGE-FILENAME
(file-name-sans-extension (car pkg-list))
(car dirnames))))))
(error
;; Ignore the remaining contents of this file.
(goto-char (point-max))
(message "Some part of \"%s\" is broken: %s in %s"
(car pkg-list) err form))))))
(setq pkg-list (cdr pkg-list)))
(setq quail-dirs (cdr quail-dirs) dirnames (cdr dirnames))))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment