HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert consecutive FSF copyright years to ranges.
[bpt/emacs.git]
/
lisp
/
textmodes
/
bibtex.el
diff --git
a/lisp/textmodes/bibtex.el
b/lisp/textmodes/bibtex.el
index
c002426
..
484b567
100644
(file)
--- a/
lisp/textmodes/bibtex.el
+++ b/
lisp/textmodes/bibtex.el
@@
-1,7
+1,7
@@
;;; bibtex.el --- BibTeX mode for GNU Emacs
;;; bibtex.el --- BibTeX mode for GNU Emacs
-;; Copyright (C) 1992, 1994
, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
-;;
2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1994
-1999, 2001-2011
+;; Free Software Foundation, Inc.
;; Author: Stefan Schoef <schoef@offis.uni-oldenburg.de>
;; Bengt Martensson <bengt@mathematik.uni-Bremen.de>
;; Author: Stefan Schoef <schoef@offis.uni-oldenburg.de>
;; Bengt Martensson <bengt@mathematik.uni-Bremen.de>
@@
-2094,7
+2094,7
@@
Formats current entry according to variable `bibtex-entry-format'."
;; if match not at left subfield boundary...
(if (< (1+ (nth 1 bounds)) (match-beginning 0))
(insert (bibtex-field-right-delimiter) " # ")
;; if match not at left subfield boundary...
(if (< (1+ (nth 1 bounds)) (match-beginning 0))
(insert (bibtex-field-right-delimiter) " # ")
- (delete-
backward-char
1))))))))
+ (delete-
char -
1))))))))
;; use book title of crossref'd entry
(if (and (memq 'inherit-booktitle format)
;; use book title of crossref'd entry
(if (and (memq 'inherit-booktitle format)
@@
-3027,12
+3027,14
@@
if that value is non-nil.
;; brace-delimited ones
)
nil
;; brace-delimited ones
)
nil
- (font-lock-syntactic-keywords . bibtex-font-lock-syntactic-keywords)
(font-lock-extra-managed-props . (category))
(font-lock-mark-block-function
. (lambda ()
(set-mark (bibtex-end-of-entry))
(bibtex-beginning-of-entry)))))
(font-lock-extra-managed-props . (category))
(font-lock-mark-block-function
. (lambda ()
(set-mark (bibtex-end-of-entry))
(bibtex-beginning-of-entry)))))
+ (set (make-local-variable 'syntax-propertize-function)
+ (syntax-propertize-via-font-lock
+ bibtex-font-lock-syntactic-keywords))
(setq imenu-generic-expression
(list (list nil bibtex-entry-head bibtex-key-in-head))
imenu-case-fold-search t)
(setq imenu-generic-expression
(list (list nil bibtex-entry-head bibtex-key-in-head))
imenu-case-fold-search t)
@@
-3833,16
+3835,16
@@
Return t if test was successful, nil otherwise."
(with-current-buffer (get-buffer-create err-buf)
(setq default-directory dir)
(unless (eq major-mode 'compilation-mode) (compilation-mode))
(with-current-buffer (get-buffer-create err-buf)
(setq default-directory dir)
(unless (eq major-mode 'compilation-mode) (compilation-mode))
- (
toggle-read-only -1
)
- (delete-region (point-min) (point-max))
- (insert "BibTeX mode command `bibtex-validate'\n"
- (if syntax-error
- "Maybe undetected errors due to syntax errors. Correct and validate again.\n"
- "\n"))
-
(dolist (err error-list
)
- (
insert (format "%s:%d: %s\n" file (car err) (cdr err)))
)
-
(set-buffer-modified-p nil
)
-
(toggle-read-only 1
)
+ (
let ((inhibit-read-only t)
)
+
(delete-region (point-min) (point-max))
+
(insert "BibTeX mode command `bibtex-validate'\n"
+
(if syntax-error
+ "Maybe undetected errors due to syntax errors. \
+Correct and validate again.\n"
+
"\n")
)
+ (
dolist (err error-list
)
+
(insert (format "%s:%d: %s\n" file (car err) (cdr err)))
)
+
(set-buffer-modified-p nil)
)
(goto-char (point-min))
(forward-line 2)) ; first error message
(display-buffer err-buf)
(goto-char (point-min))
(forward-line 2)) ; first error message
(display-buffer err-buf)
@@
-3894,12
+3896,11
@@
Return t if test was successful, nil otherwise."
(let ((err-buf "*BibTeX validation errors*"))
(with-current-buffer (get-buffer-create err-buf)
(unless (eq major-mode 'compilation-mode) (compilation-mode))
(let ((err-buf "*BibTeX validation errors*"))
(with-current-buffer (get-buffer-create err-buf)
(unless (eq major-mode 'compilation-mode) (compilation-mode))
- (toggle-read-only -1)
- (delete-region (point-min) (point-max))
- (insert "BibTeX mode command `bibtex-validate-globally'\n\n")
- (dolist (err (sort error-list 'string-lessp)) (insert err))
- (set-buffer-modified-p nil)
- (toggle-read-only 1)
+ (let ((inhibit-read-only t))
+ (delete-region (point-min) (point-max))
+ (insert "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))
(forward-line 2)) ; first error message
(display-buffer err-buf)
(goto-char (point-min))
(forward-line 2)) ; first error message
(display-buffer err-buf)
@@
-4776,5
+4777,4
@@
Return the URL or nil if none can be generated."
(provide 'bibtex)
(provide 'bibtex)
-;; arch-tag: ee2be3af-caad-427f-b42a-d20fad630d04
;;; bibtex.el ends here
;;; bibtex.el ends here