mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Quoting fixes in lisp/textmodes

Browse source 
* lisp/textmodes/bibtex.el (bibtex-validate)
(bibtex-validate-globally, bibtex-search-entries):
* lisp/textmodes/ispell.el (ispell-command-loop):
* lisp/textmodes/page-ext.el (search-pages, pages-directory):
* lisp/textmodes/texinfmt.el (texinfmt-version)
(texinfo-format-region, texinfo-format-buffer-1):
* lisp/textmodes/two-column.el (2C-split):
Respect text quoting style in doc strings and diagnostics.
* lisp/textmodes/conf-mode.el (conf-mode-map, conf-quote-normal):
* lisp/textmodes/sgml-mode.el (sgml-specials, sgml-mode):
Escape apostrophes in doc strings.
This commit is contained in:
Paul Eggert 2015-08-30 22:53:21 -07:00
parent b533552292
commit 2cac2e2e10
7 changed files with 60 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

39
lisp/textmodes/bibtex.el
View file

@ -4232,7 +4232,7 @@ Return t if test was successful, nil otherwise."
(cond ((not previous))
((member key key-list)
(push (cons (bibtex-current-line)
(format "Duplicate key `%s'" key))
(format-message "Duplicate key `%s'" key))
error-list))
((and bibtex-maintain-sorted-entries
(not (bibtex-lessp previous current)))
@ -4255,8 +4255,9 @@ Return t if test was successful, nil otherwise."
(cdr (assoc-string (car key) bibtex-reference-keys)))
(bibtex-search-entry (car key))
(push (cons (bibtex-current-line)
(format "Duplicate key `%s' in %s" (car key)
(abbreviate-file-name (buffer-file-name buffer))))
(format-message
"Duplicate key `%s' in %s" (car key)
(abbreviate-file-name (buffer-file-name buffer))))
error-list))))
(when test-thoroughly
@ -4306,14 +4307,16 @@ Return t if test was successful, nil otherwise."
(if (setq idx (nth 3 field))
(bibtex-vec-push alt-expect idx (car field))
(push (cons beg-line
(format "Required field `%s' missing"
(car field)))
(format-message
"Required field `%s' missing"
(car field)))
error-list)))
(dotimes (idx num-alt)
(unless (aref alt-fields idx)
(push (cons beg-line
(format "Alternative fields `%s' missing"
(aref alt-expect idx)))
(format-message
"Alternative fields `%s' missing"
(aref alt-expect idx)))
error-list))))))))
(bibtex-progress-message 'done)))))
@ -4327,7 +4330,8 @@ Return t if test was successful, nil otherwise."
(unless (eq major-mode 'compilation-mode) (compilation-mode))
(let ((inhibit-read-only t))
(delete-region (point-min) (point-max))
(insert "BibTeX mode command `bibtex-validate'\n"
(insert (substitute-command-keys
"BibTeX mode command `bibtex-validate'\n")
(if syntax-error
"Maybe undetected errors due to syntax errors. \
Correct and validate again.\n"
@ -4362,9 +4366,10 @@ Return t if test was successful, nil otherwise."
(if (or (and strings (bibtex-string= entry-type "string"))
(assoc-string entry-type bibtex-entry-alist t))
(if (member key key-list)
(push (format "%s:%d: Duplicate key `%s'\n"
(buffer-file-name)
(bibtex-current-line) key)
(push (format-message
"%s:%d: Duplicate key `%s'\n"
(buffer-file-name)
(bibtex-current-line) key)
error-list)
(push key key-list))))
(push (cons buffer key-list) buffer-key-list)))))
@ -4377,9 +4382,10 @@ Return t if test was successful, nil otherwise."
(dolist (key (cdr (assq buffer buffer-key-list)))
(when (assoc-string key current-keys)
(bibtex-search-entry key)
(push (format "%s:%d: Duplicate key `%s' in %s\n"
(buffer-file-name) (bibtex-current-line) key
(abbreviate-file-name (buffer-file-name buffer)))
(push (format-message
"%s:%d: Duplicate key `%s' in %s\n"
(buffer-file-name) (bibtex-current-line) key
(abbreviate-file-name (buffer-file-name buffer)))
error-list))))))
;; Process error list
@ -4389,7 +4395,8 @@ Return t if test was successful, nil otherwise."
(unless (eq major-mode 'compilation-mode) (compilation-mode))
(let ((inhibit-read-only t))
(delete-region (point-min) (point-max))
(insert "BibTeX mode command `bibtex-validate-globally'\n\n")
(insert (substitute-command-keys
"BibTeX mode command `bibtex-validate-globally'\n\n"))
(dolist (err (sort error-list 'string-lessp)) (insert err))
(set-buffer-modified-p nil))
(goto-char (point-min))
@ -5280,7 +5287,7 @@ where FILE is the BibTeX file of ENTRY."
(bibtex-display-entries entries)
(message "No BibTeX entries %smatching `%s'"
(if (string= "" field) ""
(format "with field `%s' " field))
(format-message "with field `%s' " field))
regexp)))
entries))