branch: externals/auctex
commit 41f229d47d9b276c7ea9141199dfdade19c6dd10
Author: Ikumi Keita <ik...@ikumi.que.jp>
Commit: Ikumi Keita <ik...@ikumi.que.jp>
Conform to elisp coding conventions.
* latex.el (LaTeX-section-heading, LaTeX-environment)
(TeX-arg-document, LaTeX-arg-usepackage-read-packages-with-options)
(TeX-arg-bibstyle, TeX-arg-bibliography, TeX-arg-verb)
(LaTeX-fill-region): Taylor minibuffer prompt string. Add or taylor
"done" messages.
* tex-buf.el (TeX-command-query, TeX-printer-query): Ditto.
* tex.el (TeX-master-file-ask, TeX-master-file, TeX-update-style)
(TeX-auto-list-information, TeX-auto-generate): Ditto.
---
latex.el | 29 +++++++++++++++++------------
tex-buf.el | 9 ++++-----
tex.el | 11 ++++++-----
3 files changed, 27 insertions(+), 22 deletions(-)
diff --git a/latex.el b/latex.el
index c579f42..8dc9fa3 100644
--- a/latex.el
+++ b/latex.el
@@ -440,7 +440,7 @@ no label is inserted."
Insert this hook into `LaTeX-section-hook' to allow the user to change
the name of the sectioning command inserted with `\\[LaTeX-section]'."
(let ((string (completing-read
- (concat "Level: (default " name ") ")
+ (concat "Level (default " name "): ")
LaTeX-section-list
nil nil nil nil name)))
;; Update name
@@ -563,8 +563,8 @@ It may be customized with the following variables:
(string-equal (LaTeX-current-environment) "document"))
LaTeX-default-document-environment)
(t LaTeX-default-environment)))
- (environment (completing-read (concat "Environment type: (default "
- default ") ")
+ (environment (completing-read (concat "Environment type (default "
+ default "): ")
(LaTeX-environment-list-filtered) nil nil
nil 'LaTeX-environment-history default)))
;; Use `environment' as default for the next time only if it is different
@@ -2242,12 +2242,13 @@ OPTIONAL and IGNORE are ignored."
(if (if (eq TeX-arg-input-file-search 'ask)
(not (y-or-n-p "Find class yourself? "))
TeX-arg-input-file-search)
- (progn
+ (prog2
(message "Searching for LaTeX classes...")
- (TeX-search-files-by-type 'texinputs 'global t t))
+ (TeX-search-files-by-type 'texinputs 'global t t)
+ (message "Searching for LaTeX classes...done"))
LaTeX-style-list)))
(setq style (completing-read
- (concat "Document class: (default " LaTeX-default-style ") ")
+ (concat "Document class (default " LaTeX-default-style "): ")
LaTeX-global-class-files nil nil nil nil LaTeX-default-style))
;; Clean up hook before use.
(setq TeX-after-document-hook nil)
@@ -2304,7 +2305,8 @@ of the options, nil otherwise."
(message "Searching for LaTeX packages...")
(setq TeX-global-input-files
(mapcar 'list (TeX-search-files-by-type
- 'texinputs 'global t t))))))
+ 'texinputs 'global t t)))
+ (message "Searching for LaTeX packages...done"))))
(setq packages (TeX-completing-read-multiple
"Packages: " TeX-global-input-files))
;; Clean up hook before use in `LaTeX-arg-usepackage-insert'.
@@ -2436,7 +2438,8 @@ files."
(message "Searching for files...")
(setq TeX-global-input-files
(mapcar 'list (TeX-search-files-by-type
- 'texinputs 'global t t))))
+ 'texinputs 'global t t)))
+ (message "Searching for files...done"))
(setq file (completing-read
(TeX-argument-prompt optional prompt "File")
(TeX-delete-dups-by-car
@@ -2475,6 +2478,7 @@ string."
(or BibTeX-global-style-files
(setq BibTeX-global-style-files
(mapcar 'list (TeX-search-files-by-type 'bstinputs 'global t t))))
+ (message "Searching for BibTeX styles...done")
(TeX-argument-insert
(completing-read (TeX-argument-prompt optional prompt "BibTeX style")
(append (mapcar 'list (TeX-search-files-by-type
@@ -2503,6 +2507,7 @@ string."
(or BibTeX-global-files
(setq BibTeX-global-files
(mapcar 'list (TeX-search-files-by-type 'bibinputs 'global t t))))
+ (message "Searching for BibTeX files...done")
(let ((styles (multi-prompt
"," t
(TeX-argument-prompt optional prompt "BibTeX files")
@@ -2598,8 +2603,8 @@ the list of defined pagestyles."
If OPTIONAL is non-nil, insert the resulting value as an optional
argument, otherwise as a mandatory one. IGNORE is ignored."
(let ((del (read-quoted-char
- (concat "Delimiter: (default "
- (char-to-string LaTeX-default-verb-delimiter) ") "))))
+ (concat "Delimiter (default "
+ (char-to-string LaTeX-default-verb-delimiter) "): "))))
(when (<= del ?\ ) (setq del LaTeX-default-verb-delimiter))
(if (TeX-active-mark)
(progn
@@ -4367,7 +4372,7 @@ formatting."
(setq from (point))
(catch 'end-of-buffer
(while (and (< (point) to))
- (message "Formatting%s ... %d%%"
+ (message "Formatting%s...%d%%"
(or what "")
(/ (* 100 (- (point) from)) (- to from)))
(save-excursion (LaTeX-fill-paragraph justify))
@@ -4384,7 +4389,7 @@ formatting."
TeX-comment-start-regexp "+[ \t]*$\\)")))
(forward-line 1))))
(set-marker to nil)))
- (message "Finished"))
+ (message "Formatting%s...done" (or what "")))
(defun LaTeX-find-matching-end ()
"Move point to the \\end of the current environment.
diff --git a/tex-buf.el b/tex-buf.el
index fa8f409..f64fa2d 100644
--- a/tex-buf.el
+++ b/tex-buf.el
@@ -827,7 +827,7 @@ omitted) and `TeX-region-file'."
(completion-ignore-case t)
(answer (or TeX-command-force
(completing-read
- (concat "Command: (default " default ") ")
+ (concat "Command (default " default "): ")
(TeX-mode-specific-command-list major-mode) nil t
nil 'TeX-command-history default))))
;; If the answer is "latex" it will not be expanded to "LaTeX"
@@ -855,10 +855,9 @@ QUEUE is non-nil when we are checking for the printer
queue."
(setq printer (if TeX-printer-list
(let ((completion-ignore-case t))
(completing-read
- (concat "Printer: "
- (and TeX-printer-default
- (concat "(default "
- TeX-printer-default ")
")))
+ (format "Printer%s: "
+ (if TeX-printer-default
+ (format " (default %s)"
TeX-printer-default) ""))
TeX-printer-list))
""))
(setq printer (or (car-safe (TeX-assoc printer TeX-printer-list))
diff --git a/tex.el b/tex.el
index 3932379..972110b 100644
--- a/tex.el
+++ b/tex.el
@@ -2441,7 +2441,7 @@ this variable to \"<none>\"."
(let* ((default (TeX-dwim-master))
(name (or (and (eq 'dwim TeX-master) default)
(condition-case nil
- (read-file-name (format "Master file: (default %s) "
+ (read-file-name (format "Master file (default %s): "
(or default "this file"))
nil default)
(quit "<quit>")))))
@@ -2499,7 +2499,7 @@ name of master file if it cannot be determined otherwise."
(setq TeX-master
(let* ((default (TeX-dwim-master))
(name (read-file-name
- (format "Master file: (default %s) "
+ (format "Master file (default %s): "
(or default "this file"))
nil default)))
(cond ((string= name default)
@@ -3088,7 +3088,7 @@ FORCE is not nil."
TeX-style-hook-list))))
(TeX-auto-apply))
(run-hooks 'TeX-update-style-hook)
- (message "Applying style hooks... done")))
+ (message "Applying style hooks...done")))
(defvar TeX-remove-style-hook nil
"List of hooks to call when we remove the style specific information.")
@@ -3903,6 +3903,7 @@ The algorithm is as follows:
(set local
(sort (mapcar 'TeX-listify (apply 'append (symbol-value local)))
'TeX-car-string-lessp))
+ (message "Sorting %s...done" name)
;; Make it unique
(message "Removing duplicates...")
(let ((entry (symbol-value local)))
@@ -3916,7 +3917,7 @@ The algorithm is as follows:
(if (> (length next) (length this))
(setcdr this (cdr next)))
(setcdr entry (cdr (cdr entry)))))))
- (message "Removing duplicates... done"))
+ (message "Removing duplicates...done"))
(symbol-value local)))
(defmacro TeX-auto-add-type (name prefix &optional plural)
@@ -4098,7 +4099,7 @@ If TEX is a directory, generate style files for all files
in the directory."
t)
".el"))
(kill-buffer (current-buffer))
- (message "Parsing %s... done" tex)))))
+ (message "Parsing %s...done" tex)))))
;;;###autoload
(defun TeX-auto-generate-global ()
