diff options
| author | Paul Eggert | 2011-11-19 01:18:31 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-11-19 01:18:31 -0800 |
| commit | 5396468298b0122469e0b41da8f49860d99a2b51 (patch) | |
| tree | 4bd0a6db55e2c374402f88299b6347146719566f /lisp/textmodes | |
| parent | 7430c2a1791cc9fdd51b588998d26315489ac0d8 (diff) | |
| download | emacs-5396468298b0122469e0b41da8f49860d99a2b51.tar.gz emacs-5396468298b0122469e0b41da8f49860d99a2b51.zip | |
Spelling fixes.
Diffstat (limited to 'lisp/textmodes')
| -rw-r--r-- | lisp/textmodes/reftex-cite.el | 56 | ||||
| -rw-r--r-- | lisp/textmodes/sgml-mode.el | 2 |
2 files changed, 29 insertions, 29 deletions
diff --git a/lisp/textmodes/reftex-cite.el b/lisp/textmodes/reftex-cite.el index 78d80da41ac..eb0e734080e 100644 --- a/lisp/textmodes/reftex-cite.el +++ b/lisp/textmodes/reftex-cite.el | |||
| @@ -69,7 +69,7 @@ | |||
| 69 | (unless (eq (get 'reftex-default-bibliography :reftex-raw) | 69 | (unless (eq (get 'reftex-default-bibliography :reftex-raw) |
| 70 | reftex-default-bibliography) | 70 | reftex-default-bibliography) |
| 71 | (put 'reftex-default-bibliography :reftex-expanded | 71 | (put 'reftex-default-bibliography :reftex-expanded |
| 72 | (reftex-locate-bibliography-files | 72 | (reftex-locate-bibliography-files |
| 73 | default-directory reftex-default-bibliography)) | 73 | default-directory reftex-default-bibliography)) |
| 74 | (put 'reftex-default-bibliography :reftex-raw | 74 | (put 'reftex-default-bibliography :reftex-raw |
| 75 | reftex-default-bibliography)) | 75 | reftex-default-bibliography)) |
| @@ -128,7 +128,7 @@ | |||
| 128 | ;; If RETURN is non-nil, just return the entry and restore point. | 128 | ;; If RETURN is non-nil, just return the entry and restore point. |
| 129 | 129 | ||
| 130 | (let* ((re | 130 | (let* ((re |
| 131 | (if item | 131 | (if item |
| 132 | (concat "\\\\bibitem\\(\\[[^]]*\\]\\)?{" (regexp-quote key) "}") | 132 | (concat "\\\\bibitem\\(\\[[^]]*\\]\\)?{" (regexp-quote key) "}") |
| 133 | (concat "@[a-zA-Z]+[ \t\n\r]*[{(][ \t\n\r]*" (regexp-quote key) | 133 | (concat "@[a-zA-Z]+[ \t\n\r]*[{(][ \t\n\r]*" (regexp-quote key) |
| 134 | "[, \t\r\n}]"))) | 134 | "[, \t\r\n}]"))) |
| @@ -152,7 +152,7 @@ | |||
| 152 | (when return | 152 | (when return |
| 153 | ;; Just return the relevant entry | 153 | ;; Just return the relevant entry |
| 154 | (if item (goto-char (match-end 0))) | 154 | (if item (goto-char (match-end 0))) |
| 155 | (setq return (buffer-substring | 155 | (setq return (buffer-substring |
| 156 | (point) (reftex-end-of-bib-entry item))) | 156 | (point) (reftex-end-of-bib-entry item))) |
| 157 | (goto-char oldpos) ;; restore point. | 157 | (goto-char oldpos) ;; restore point. |
| 158 | (set-buffer buffer-conf) | 158 | (set-buffer buffer-conf) |
| @@ -169,9 +169,9 @@ | |||
| 169 | (error "No BibTeX entry with citation key %s" key))))) | 169 | (error "No BibTeX entry with citation key %s" key))))) |
| 170 | 170 | ||
| 171 | (defun reftex-end-of-bib-entry (item) | 171 | (defun reftex-end-of-bib-entry (item) |
| 172 | (save-excursion | 172 | (save-excursion |
| 173 | (condition-case nil | 173 | (condition-case nil |
| 174 | (if item | 174 | (if item |
| 175 | (progn (end-of-line) | 175 | (progn (end-of-line) |
| 176 | (re-search-forward | 176 | (re-search-forward |
| 177 | "\\\\bibitem\\|\\end{thebibliography}") | 177 | "\\\\bibitem\\|\\end{thebibliography}") |
| @@ -192,16 +192,16 @@ | |||
| 192 | 192 | ||
| 193 | ;; Read a regexp, completing on known citation keys. | 193 | ;; Read a regexp, completing on known citation keys. |
| 194 | (setq default (regexp-quote (reftex-get-bibkey-default))) | 194 | (setq default (regexp-quote (reftex-get-bibkey-default))) |
| 195 | (setq re-list | 195 | (setq re-list |
| 196 | (split-string | 196 | (split-string |
| 197 | (completing-read | 197 | (completing-read |
| 198 | (concat | 198 | (concat |
| 199 | "Regex { && Regex...}: " | 199 | "Regex { && Regex...}: " |
| 200 | "[" default "]: ") | 200 | "[" default "]: ") |
| 201 | (if reftex-mode | 201 | (if reftex-mode |
| 202 | (if (fboundp 'LaTeX-bibitem-list) | 202 | (if (fboundp 'LaTeX-bibitem-list) |
| 203 | (LaTeX-bibitem-list) | 203 | (LaTeX-bibitem-list) |
| 204 | (cdr (assoc 'bibview-cache | 204 | (cdr (assoc 'bibview-cache |
| 205 | (symbol-value reftex-docstruct-symbol)))) | 205 | (symbol-value reftex-docstruct-symbol)))) |
| 206 | nil) | 206 | nil) |
| 207 | nil nil nil 'reftex-cite-regexp-hist) | 207 | nil nil nil 'reftex-cite-regexp-hist) |
| @@ -248,7 +248,7 @@ | |||
| 248 | (error (goto-char key-point) | 248 | (error (goto-char key-point) |
| 249 | (throw 'search-again nil))) | 249 | (throw 'search-again nil))) |
| 250 | (setq end-point (point)) | 250 | (setq end-point (point)) |
| 251 | 251 | ||
| 252 | ;; Ignore @string, @comment and @c entries or things | 252 | ;; Ignore @string, @comment and @c entries or things |
| 253 | ;; outside entries | 253 | ;; outside entries |
| 254 | (when (or (string= (downcase (match-string 2)) "string") | 254 | (when (or (string= (downcase (match-string 2)) "string") |
| @@ -257,12 +257,12 @@ | |||
| 257 | (< (point) key-point)) ; this means match not in {} | 257 | (< (point) key-point)) ; this means match not in {} |
| 258 | (goto-char key-point) | 258 | (goto-char key-point) |
| 259 | (throw 'search-again nil)) | 259 | (throw 'search-again nil)) |
| 260 | 260 | ||
| 261 | ;; Well, we have got a match | 261 | ;; Well, we have got a match |
| 262 | ;;(setq entry (concat | 262 | ;;(setq entry (concat |
| 263 | ;; (buffer-substring start-point (point)) "\n")) | 263 | ;; (buffer-substring start-point (point)) "\n")) |
| 264 | (setq entry (buffer-substring start-point (point))) | 264 | (setq entry (buffer-substring start-point (point))) |
| 265 | 265 | ||
| 266 | ;; Check if other regexp match as well | 266 | ;; Check if other regexp match as well |
| 267 | (setq re-list rest-re) | 267 | (setq re-list rest-re) |
| 268 | (while re-list | 268 | (while re-list |
| @@ -270,24 +270,24 @@ | |||
| 270 | ;; nope - move on | 270 | ;; nope - move on |
| 271 | (throw 'search-again nil)) | 271 | (throw 'search-again nil)) |
| 272 | (pop re-list)) | 272 | (pop re-list)) |
| 273 | 273 | ||
| 274 | (setq alist (reftex-parse-bibtex-entry | 274 | (setq alist (reftex-parse-bibtex-entry |
| 275 | nil start-point end-point)) | 275 | nil start-point end-point)) |
| 276 | (push (cons "&entry" entry) alist) | 276 | (push (cons "&entry" entry) alist) |
| 277 | 277 | ||
| 278 | ;; check for crossref entries | 278 | ;; check for crossref entries |
| 279 | (if (assoc "crossref" alist) | 279 | (if (assoc "crossref" alist) |
| 280 | (setq alist | 280 | (setq alist |
| 281 | (append | 281 | (append |
| 282 | alist (reftex-get-crossref-alist alist)))) | 282 | alist (reftex-get-crossref-alist alist)))) |
| 283 | 283 | ||
| 284 | ;; format the entry | 284 | ;; format the entry |
| 285 | (push (cons "&formatted" (reftex-format-bib-entry alist)) | 285 | (push (cons "&formatted" (reftex-format-bib-entry alist)) |
| 286 | alist) | 286 | alist) |
| 287 | 287 | ||
| 288 | ;; make key the first element | 288 | ;; make key the first element |
| 289 | (push (reftex-get-bib-field "&key" alist) alist) | 289 | (push (reftex-get-bib-field "&key" alist) alist) |
| 290 | 290 | ||
| 291 | ;; add it to the list | 291 | ;; add it to the list |
| 292 | (push alist found-list))))) | 292 | (push alist found-list))))) |
| 293 | (reftex-kill-temporary-buffers)))) | 293 | (reftex-kill-temporary-buffers)))) |
| @@ -350,7 +350,7 @@ | |||
| 350 | (unless files | 350 | (unless files |
| 351 | (error "Need file name to find thebibliography environment")) | 351 | (error "Need file name to find thebibliography environment")) |
| 352 | (while (setq file (pop files)) | 352 | (while (setq file (pop files)) |
| 353 | (setq buf (reftex-get-file-buffer-force | 353 | (setq buf (reftex-get-file-buffer-force |
| 354 | file (not reftex-keep-temporary-buffers))) | 354 | file (not reftex-keep-temporary-buffers))) |
| 355 | (unless buf | 355 | (unless buf |
| 356 | (error "No such file %s" file)) | 356 | (error "No such file %s" file)) |
| @@ -386,16 +386,16 @@ | |||
| 386 | 386 | ||
| 387 | ;; Read a regexp, completing on known citation keys. | 387 | ;; Read a regexp, completing on known citation keys. |
| 388 | (setq default (regexp-quote (reftex-get-bibkey-default))) | 388 | (setq default (regexp-quote (reftex-get-bibkey-default))) |
| 389 | (setq re-list | 389 | (setq re-list |
| 390 | (split-string | 390 | (split-string |
| 391 | (completing-read | 391 | (completing-read |
| 392 | (concat | 392 | (concat |
| 393 | "Regex { && Regex...}: " | 393 | "Regex { && Regex...}: " |
| 394 | "[" default "]: ") | 394 | "[" default "]: ") |
| 395 | (if reftex-mode | 395 | (if reftex-mode |
| 396 | (if (fboundp 'LaTeX-bibitem-list) | 396 | (if (fboundp 'LaTeX-bibitem-list) |
| 397 | (LaTeX-bibitem-list) | 397 | (LaTeX-bibitem-list) |
| 398 | (cdr (assoc 'bibview-cache | 398 | (cdr (assoc 'bibview-cache |
| 399 | (symbol-value reftex-docstruct-symbol)))) | 399 | (symbol-value reftex-docstruct-symbol)))) |
| 400 | nil) | 400 | nil) |
| 401 | nil nil nil 'reftex-cite-regexp-hist) | 401 | nil nil nil 'reftex-cite-regexp-hist) |
| @@ -408,14 +408,14 @@ | |||
| 408 | (error "Empty regular expression")) | 408 | (error "Empty regular expression")) |
| 409 | 409 | ||
| 410 | (while (and (setq re (pop re-list)) entries) | 410 | (while (and (setq re (pop re-list)) entries) |
| 411 | (setq entries | 411 | (setq entries |
| 412 | (delq nil (mapcar | 412 | (delq nil (mapcar |
| 413 | (lambda (x) | 413 | (lambda (x) |
| 414 | (if (string-match re (cdr (assoc "&entry" x))) | 414 | (if (string-match re (cdr (assoc "&entry" x))) |
| 415 | x nil)) | 415 | x nil)) |
| 416 | entries)))) | 416 | entries)))) |
| 417 | (setq entries | 417 | (setq entries |
| 418 | (mapcar | 418 | (mapcar |
| 419 | (lambda (x) | 419 | (lambda (x) |
| 420 | (push (cons "&formatted" (reftex-format-bibitem x)) x) | 420 | (push (cons "&formatted" (reftex-format-bibitem x)) x) |
| 421 | (push (reftex-get-bib-field "&key" x) x) | 421 | (push (reftex-get-bib-field "&key" x) x) |
| @@ -655,12 +655,12 @@ While entering the regexp, completion on knows citation keys is possible. | |||
| 655 | 655 | ||
| 656 | (when (eq (car selected-entries) 'concat) | 656 | (when (eq (car selected-entries) 'concat) |
| 657 | ;; All keys go into a single command - we need to trick a little | 657 | ;; All keys go into a single command - we need to trick a little |
| 658 | ;; FIXME: Unfortunately, this meens that commenting does not work right. | 658 | ;; FIXME: Unfortunately, this means that commenting does not work right. |
| 659 | (pop selected-entries) | 659 | (pop selected-entries) |
| 660 | (let ((concat-keys (mapconcat 'car selected-entries ","))) | 660 | (let ((concat-keys (mapconcat 'car selected-entries ","))) |
| 661 | (setq insert-entries | 661 | (setq insert-entries |
| 662 | (list (list concat-keys (cons "&key" concat-keys)))))) | 662 | (list (list concat-keys (cons "&key" concat-keys)))))) |
| 663 | 663 | ||
| 664 | (unless no-insert | 664 | (unless no-insert |
| 665 | 665 | ||
| 666 | ;; We shall insert this into the buffer... | 666 | ;; We shall insert this into the buffer... |
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el index fa958632799..f9e3283b783 100644 --- a/lisp/textmodes/sgml-mode.el +++ b/lisp/textmodes/sgml-mode.el | |||
| @@ -847,7 +847,7 @@ and disable it otherwise. If called from Lisp, enable the mode | |||
| 847 | if ARG is omitted or nil. | 847 | if ARG is omitted or nil. |
| 848 | 848 | ||
| 849 | SGML Electric Tag Pair mode is a buffer-local minor mode for use | 849 | SGML Electric Tag Pair mode is a buffer-local minor mode for use |
| 850 | with `sgml-mode' and related maor modes. When enabled, editing | 850 | with `sgml-mode' and related major modes. When enabled, editing |
| 851 | an opening markup tag automatically updates the closing tag." | 851 | an opening markup tag automatically updates the closing tag." |
| 852 | :lighter "/e" | 852 | :lighter "/e" |
| 853 | (if sgml-electric-tag-pair-mode | 853 | (if sgml-electric-tag-pair-mode |