[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[AUCTeX-diffs] GNU AUCTeX branch, master, updated. 5696f07ad37bb3cf5250f
|
From: |
Ikumi Keita |
|
Subject: |
[AUCTeX-diffs] GNU AUCTeX branch, master, updated. 5696f07ad37bb3cf5250fe7c2e0a2471933fe041 |
|
Date: |
Sat, 27 Mar 2021 06:45:00 -0400 (EDT) |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU AUCTeX".
The branch, master has been updated
via 5696f07ad37bb3cf5250fe7c2e0a2471933fe041 (commit)
via 91ac45a2cba87db0ee0ffac4ff9381e5f3774bfa (commit)
via c35f0d14c80be28dba4436704ed7092fd47886b8 (commit)
via 36369f65be599ce00b5e6e8eba7c73cf834120dd (commit)
via 70495129676f7fa123a87bf8c42334849378f2aa (commit)
from 0ce30c166fed899b269957a0006d011457787eb7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5696f07ad37bb3cf5250fe7c2e0a2471933fe041
Author: Ikumi Keita <ikumi@ikumi.que.jp>
Date: Fri Mar 26 01:58:50 2021 +0900
Reduce byte compiler warning
* tex.el (): Move `(eval-when-compile (require 'dbus))' before
`declare-function's of dbus related functions because otherwise they
seem ineffective.
Both NOERROR optional argument for `(require 'dbus)' and `(featurep
'dbusbind)' test are removed deliberately because
(1) Now all supported emacsen have dbus.el.
(2) Even if emacs is built with configure option "--without-dbus", it
doesn't cause error to load dbus.el just to get macro definition
of `dbus-ignore-errors'.
This way, it works fine even when
(a) Emacs used for byte-compiling lacks D-Bus support.
(b) Emacs at run time has D-Bus support.
without relying on `TeX--if-macro-fboundp'.
(): Remove `declare-function' for `dbus-ignore-errors' because it's
now guaranteed that the macro is expanded away at byte compile time.
(): Remove `defvar' for `dbus-debug' because `dbus.el' provides a
suitable defvar.
diff --git a/tex.el b/tex.el
index 0ede5dd..4aa55c0 100644
--- a/tex.el
+++ b/tex.el
@@ -38,10 +38,11 @@
(eval-when-compile
(require 'cl-lib))
(require 'texmathp)
+;; Require dbus at compile time to get macro definition of
+;; `dbus-ignore-errors'.
+(eval-when-compile (require 'dbus))
;; Silence the compiler for functions:
-(declare-function dbus-ignore-errors "ext:dbus"
- (&rest body))
(declare-function dbus-get-unique-name "ext:dbusbind.c"
(bus))
(declare-function dbus-ping "ext:dbus"
@@ -98,7 +99,6 @@
;; Others:
(defvar tex--prettify-symbols-alist) ; tex-mode.el
(defvar Info-file-list-for-emacs) ; info.el
-(defvar dbus-debug) ; dbus.el
(defvar ispell-parser) ; ispell.el
(defgroup TeX-file nil
@@ -1115,10 +1115,6 @@ The following built-in predicates are available:
;; program and the desktop environment, that will be used to set up
;; DBUS communication.
-;; Require dbus at compile time to prevent errors due to `dbus-ignore-errors'
-;; not being defined.
-(eval-when-compile (and (featurep 'dbusbind)
- (require 'dbus nil :no-error)))
(defun TeX-evince-dbus-p (de app &rest options)
"Return non-nil, if an evince-compatible reader is accessible via DBUS.
Additional OPTIONS may be given to extend the check. If none are
commit 91ac45a2cba87db0ee0ffac4ff9381e5f3774bfa
Author: Ikumi Keita <ikumi@ikumi.que.jp>
Date: Thu Mar 25 23:20:08 2021 +0900
Reduce byte compiler warning
* tex.el (VirTeX-common-initialization,toplevel): Don't set obsolete
ispell variables `ispell-tex-p' and `ispell-tex-major-modes'. Neither
appears in NEWS.* nor source of emacs 24.3.
(TeX-run-ispell): Don't call obsolete functions `spell-buffer' and
`spell-region'.
(): Discard `declare-function' for `spell-buffer'.
Add `defvar' for `ispell-parser' to silence byte compiler.
diff --git a/tex.el b/tex.el
index 38fbd63..0ede5dd 100644
--- a/tex.el
+++ b/tex.el
@@ -56,9 +56,6 @@
nil)
(declare-function tex--prettify-symbols-compose-p "ext:tex-mode"
(start end match))
-;; spell-buffer was removed in 2008 in favor of ispell
-(declare-function spell-buffer "ext:text-mode"
- t)
;; Silence the compiler for variables:
;; tex.el: Variables defined somewhere in this file:
@@ -102,6 +99,7 @@
(defvar tex--prettify-symbols-alist) ; tex-mode.el
(defvar Info-file-list-for-emacs) ; info.el
(defvar dbus-debug) ; dbus.el
+(defvar ispell-parser) ; ispell.el
(defgroup TeX-file nil
"Files used by AUCTeX."
@@ -3743,7 +3741,6 @@ The algorithm is as follows:
;; Ispell support
(set (make-local-variable 'ispell-parser) 'tex)
- (set (make-local-variable 'ispell-tex-p) t)
;; Redefine some standard variables
(make-local-variable 'paragraph-start)
@@ -6474,17 +6471,10 @@ NAME may be a package, a command, or a document."
(defun TeX-run-ispell (_command _string file)
"Run ispell on current TeX buffer."
- (cond ((and (string-equal file (TeX-region-file))
- (fboundp 'ispell-region))
+ (cond ((string-equal file (TeX-region-file))
(call-interactively #'ispell-region))
- ((string-equal file (TeX-region-file))
- (call-interactively #'spell-region))
- ((fboundp 'ispell-buffer)
- (ispell-buffer))
- ((fboundp 'ispell)
- (ispell))
(t
- (spell-buffer))))
+ (ispell-buffer))))
(defun TeX-ispell-document (name)
"Run ispell on all open files belonging to the current document."
@@ -6518,12 +6508,6 @@ NAME may be a package, a command, or a document."
(save-excursion (switch-to-buffer buffer) (ispell-buffer))
t)))))
-;; Some versions of ispell 3 use this.
-(defvar ispell-tex-major-modes nil)
-(setq ispell-tex-major-modes
- (append '(plain-tex-mode ams-tex-mode latex-mode doctex-mode)
- ispell-tex-major-modes))
-
(defcustom TeX-ispell-extend-skip-list t
"Whether to extend regions selected for skipping during spell checking."
:group 'TeX-misc
commit c35f0d14c80be28dba4436704ed7092fd47886b8
Author: Ikumi Keita <ikumi@ikumi.que.jp>
Date: Thu Mar 25 22:52:57 2021 +0900
Use #' instead of ' to quote function where possible
* latex.el (LaTeX-babel-insert-hyphen):
* multi-prompt.el (multi-prompt-delete)
(multi-prompt-next-must-match):
* style/biblatex.el ("biblatex"):
* style/newfloat.el ("newfloat"):
* style/ntheorem.el ("ntheorem"):
* style/wrapfig.el ("wrapfig"):
* tex.el (TeX-electric-macro, TeX-insert-punctuation)
(TeX-run-ispell):
Use #' instead of ' to quote function where possible.
diff --git a/latex.el b/latex.el
index 6b46848..643021d 100644
--- a/latex.el
+++ b/latex.el
@@ -5968,7 +5968,7 @@ If prefix argument FORCE is non-nil, always insert a
regular hyphen."
font-lock-comment-face)))
(texmathp)
(TeX-in-comment))
- (call-interactively 'self-insert-command)
+ (call-interactively #'self-insert-command)
(let* ((lang (assoc LaTeX-babel-hyphen-language
LaTeX-babel-hyphen-language-alist))
(hyphen (if lang (nth 1 lang) LaTeX-babel-hyphen))
@@ -5983,20 +5983,20 @@ If prefix argument FORCE is non-nil, always insert a
regular hyphen."
(progn (delete-char (- hyphen-length))
(insert "--"))
(delete-char (- hyphen-length))
- (call-interactively 'self-insert-command)))
+ (call-interactively #'self-insert-command)))
;; -- --> [+]-
((string= (buffer-substring (max (- (point) 2) (point-min))
(point))
"--")
- (call-interactively 'self-insert-command))
+ (call-interactively #'self-insert-command))
;; - --> "= / [+]-
((eq (char-before) ?-)
(if h-after-h
(progn (delete-char -1)
(insert hyphen))
- (call-interactively 'self-insert-command)))
+ (call-interactively #'self-insert-command)))
(h-after-h
- (call-interactively 'self-insert-command))
+ (call-interactively #'self-insert-command))
(t (insert hyphen))))))
;; Cater for Delete Selection mode
(put 'LaTeX-babel-insert-hyphen 'delete-selection t)
diff --git a/multi-prompt.el b/multi-prompt.el
index 5ca3422..409e1d0 100644
--- a/multi-prompt.el
+++ b/multi-prompt.el
@@ -99,7 +99,7 @@ are the arguments to `completing-read'. See that."
(interactive)
(if (bobp)
(throw 'multi-prompt-next 'back)
- (call-interactively 'backward-delete-char)))
+ (call-interactively #'backward-delete-char)))
(defun multi-prompt-next ()
(interactive)
@@ -114,7 +114,7 @@ are the arguments to `completing-read'. See that."
(defun multi-prompt-next-must-match ()
(interactive)
- (when (call-interactively 'minibuffer-complete)
+ (when (call-interactively #'minibuffer-complete)
(let ((content (buffer-substring-no-properties (point-min) (point-max))))
(when (or ;; (not require-match)
(assoc content minibuffer-completion-table))
diff --git a/style/biblatex.el b/style/biblatex.el
index e92f186..c925c93 100644
--- a/style/biblatex.el
+++ b/style/biblatex.el
@@ -276,7 +276,7 @@ for citation keys."
;;; Global Customization
;; Setting Package Options
'("ExecuteBibliographyOptions"
- [TeX-arg-eval mapconcat 'identity
+ [TeX-arg-eval mapconcat #'identity
(TeX-completing-read-multiple
"Entry type: " LaTeX-biblatex-entrytype) ","]
(TeX-arg-key-val LaTeX-biblatex-executebibliographyoptions-options))
@@ -329,7 +329,7 @@ for citation keys."
'("defbibcheck" "Name" t)
;; Dynamic Entry Sets
'("defbibentryset" "Set"
- (TeX-arg-eval mapconcat 'identity (TeX-completing-read-multiple
+ (TeX-arg-eval mapconcat #'identity (TeX-completing-read-multiple
"Keys: " (LaTeX-bibitem-list)) ","))
;;; Citation Commands
'("cite" (TeX-arg-conditional TeX-arg-cite-note-p
diff --git a/style/newfloat.el b/style/newfloat.el
index 82adbdb..3eb865c 100644
--- a/style/newfloat.el
+++ b/style/newfloat.el
@@ -176,7 +176,7 @@ If `caption.el' is loaded, add the new floating environment
to
'("SetupFloatingEnvironment"
(TeX-arg-eval completing-read
(TeX-argument-prompt nil nil "Floating environment")
- (mapcar 'car
(LaTeX-newfloat-DeclareFloatingEnvironment-list)))
+ (mapcar #'car
(LaTeX-newfloat-DeclareFloatingEnvironment-list)))
(TeX-arg-key-val LaTeX-newfloat-key-val-options-local))
'("ForEachFloatingEnvironment" t)
@@ -185,7 +185,7 @@ If `caption.el' is loaded, add the new floating environment
to
'("PrepareListOf"
(TeX-arg-eval completing-read
(TeX-argument-prompt nil nil "Floating environment")
- (mapcar 'car
(LaTeX-newfloat-DeclareFloatingEnvironment-list)))
+ (mapcar #'car
(LaTeX-newfloat-DeclareFloatingEnvironment-list)))
t)
'("newfloatsetup"
diff --git a/style/ntheorem.el b/style/ntheorem.el
index 4c57623..e3ab7ad 100644
--- a/style/ntheorem.el
+++ b/style/ntheorem.el
@@ -325,7 +325,7 @@ make them available as new environments. Update
;; 2.4 Generating Theoremlists
'("listtheorems"
- (TeX-arg-eval mapconcat 'identity
+ (TeX-arg-eval mapconcat #'identity
(TeX-completing-read-multiple
"Lists: "
(LaTeX-ntheorem-newtheorem-list)) ","))
diff --git a/style/wrapfig.el b/style/wrapfig.el
index 2de699b..35d8a05 100644
--- a/style/wrapfig.el
+++ b/style/wrapfig.el
@@ -95,7 +95,7 @@
(LaTeX-newfloat-DeclareFloatingEnvironment-list))
(completing-read
"Float type: "
- (mapcar 'car
(LaTeX-newfloat-DeclareFloatingEnvironment-list)))
+ (mapcar #'car
(LaTeX-newfloat-DeclareFloatingEnvironment-list)))
(TeX-read-string "Float type: ")))
(narrow (TeX-read-string "(Optional) Number of narrow lines:
"))
(placement (completing-read
diff --git a/tex.el b/tex.el
index d50f974..38fbd63 100644
--- a/tex.el
+++ b/tex.el
@@ -3367,14 +3367,14 @@ AUCTeX knows of some macros, and may query for extra
arguments.
Space will complete and exit."
(interactive)
(cond ((eq (preceding-char) ?\\)
- (call-interactively 'self-insert-command))
+ (call-interactively #'self-insert-command))
((eq (preceding-char) ?.)
(let ((TeX-default-macro " ")
(minibuffer-local-completion-map TeX-electric-macro-map))
- (call-interactively 'TeX-insert-macro)))
+ (call-interactively #'TeX-insert-macro)))
(t
(let ((minibuffer-local-completion-map TeX-electric-macro-map))
- (call-interactively 'TeX-insert-macro)))))
+ (call-interactively #'TeX-insert-macro)))))
(defvar TeX-exit-mark nil
"Dynamically bound by `TeX-parse-macro' and `LaTeX-env-args'.")
@@ -6180,7 +6180,7 @@ With prefix argument FORCE, always inserts \" characters."
(expand-abbrev)
(if (TeX-looking-at-backward "\\\\/\\(}+\\)" 50)
(replace-match "\\1" t))
- (call-interactively 'self-insert-command))
+ (call-interactively #'self-insert-command))
(defun TeX-insert-braces (arg)
"Make a pair of braces around next ARG sexps and leave point inside.
@@ -6476,9 +6476,9 @@ NAME may be a package, a command, or a document."
"Run ispell on current TeX buffer."
(cond ((and (string-equal file (TeX-region-file))
(fboundp 'ispell-region))
- (call-interactively 'ispell-region))
+ (call-interactively #'ispell-region))
((string-equal file (TeX-region-file))
- (call-interactively 'spell-region))
+ (call-interactively #'spell-region))
((fboundp 'ispell-buffer)
(ispell-buffer))
((fboundp 'ispell)
commit 36369f65be599ce00b5e6e8eba7c73cf834120dd
Author: Ikumi Keita <ikumi@ikumi.que.jp>
Date: Thu Mar 25 16:53:52 2021 +0900
Reduce byte compiler warning
* bib-cite.el (bib-display-or-find-label): Use `outline-show-entry'
instead of `show-entry' when possible. Wrap `show-entry' with
`with-no-warnings'.
(bib-get-citations, psg-list-env): Use `replace-regexp-in-string'
instead of `dired-replace-in-string'.
Use `split-string' instead of `dired-split' and `TeX-split-string'.
(dired-replace-in-string,TeX-split-string): Delete fallback
definitions.
(): Remove `declare-function' for `dired-replace-in-string' and
`dired-split'.
diff --git a/bib-cite.el b/bib-cite.el
index ebacdb7..a996a21 100644
--- a/bib-cite.el
+++ b/bib-cite.el
@@ -1,5 +1,4 @@
-;;; bib-cite.el --- test -*- lexical-binding: t; -*-
-;; bib-cite.el - Display \cite, \ref or \label / Extract refs from BiBTeX file.
+;; bib-cite.el - Display \cite, \ref or \label / Extract refs from BiBTeX
file. -*- lexical-binding: t; -*-
;; Copyright (C) 1994-1999, 2001, 2003-2005, 2014-2021 Free Software
Foundation, Inc.
@@ -594,10 +593,6 @@
(require 'cl-lib))
;; Silence the compiler:
-(declare-function dired-replace-in-string "ext:dired"
- (regexp newtext string))
-(declare-function dired-split "ext:dired-aux"
- (pat str &optional limit))
(declare-function reftex-view-crossref "ext:reftex-dcr"
(&optional arg auto-how fail-quietly))
@@ -1434,7 +1429,11 @@ If within a multi-file document (in auctex only)
(if (bib-Is-hidden)
(save-excursion
(beginning-of-line)
- (show-entry)))))
+ ;; COMPATIBILITY for emacs<25.
+ (if (fboundp 'outline-show-entry)
+ (outline-show-entry)
+ (with-no-warnings
+ (show-entry)))))))
(defvar bib-label-prompt-map
(let ((map (make-sparse-keymap)))
@@ -1761,8 +1760,8 @@ Return the-warnings as text."
(let* ((the-key (car (car string-alist)))
(the-string (cdr (car string-alist)))
(slashed-string ; "J. of Geo.\" -> "J. of Geo.\\\\"
- (dired-replace-in-string
- "\\\\" "\\\\" the-string)))
+ (replace-regexp-in-string
+ "\\\\" "\\\\" the-string t t)))
(while (re-search-forward
(concat "\\(^[, \t]*[a-zA-Z]+[ \t]*=[ \t]*\\)"
@@ -2310,50 +2309,6 @@ If FIRST-FILE is t, stop after first file is found."
;; (setq the-list (cdr the-list))))
;; filespec))
-(or (fboundp 'dired-replace-in-string)
- ;; This code is part of GNU emacs
- (defun dired-replace-in-string (regexp newtext string)
- ;; Replace REGEXP with NEWTEXT everywhere in STRING and return result.
- ;; NEWTEXT is taken literally---no \\DIGIT escapes will be recognized.
- (let ((result "") (start 0) mb me)
- (while (string-match regexp string start)
- (setq mb (match-beginning 0)
- me (match-end 0)
- result (concat result (substring string start mb) newtext)
- start me))
- (concat result (substring string start)))))
-
-
-;; Could use fset here to equal TeX-split-string to dired-split if only
-;; dired-split is defined. That would eliminate a check in psg-list-env.
-(and (not (fboundp 'TeX-split-string))
- (not (fboundp 'dired-split))
- ;; This code is part of AUCTeX
- (defun TeX-split-string (char string)
- "Returns a list of strings. given REGEXP the STRING is split into
-sections which in string was seperated by REGEXP.
-
-Examples:
-
- (TeX-split-string \"\:\" \"abc:def:ghi\")
- -> (\"abc\" \"def\" \"ghi\")
-
- (TeX-split-string \" *\" \"dvips -Plw -p3 -c4 testfile.dvi\")
-
- -> (\"dvips\" \"-Plw\" \"-p3\" \"-c4\" \"testfile.dvi\")
-
-If CHAR is nil, or \"\", an error will occur."
-
- (let ((regexp char)
- (start 0)
- (result '()))
- (while (string-match regexp string start)
- (let ((match (string-match regexp string start)))
- (setq result (cons (substring string start match) result))
- (setq start (match-end 0))))
- (setq result (cons (substring string start nil) result))
- (nreverse result))))
-
(defun bib-cite-file-directory-p (file)
"Like default `file-directory-p' but allow FILE to end in // for ms-windows."
(save-match-data
@@ -2370,15 +2325,12 @@ bib-dos-or-os2-variable affects:
path separator used (: or ;)
whether backslashes are converted to slashes"
(if (not (getenv env))
- nil ;Because dired-replace-in-string fails
+ nil ;Because replace-regexp-in-string fails
(let* ((value (if bib-dos-or-os2-variable
- (dired-replace-in-string "\\\\" "/" (getenv env))
+ (replace-regexp-in-string "\\\\" "/" (getenv env) t t)
(getenv env)))
(sep-char (or (and bib-dos-or-os2-variable ";") ":"))
- (entries (and value
- (or (and (fboundp 'TeX-split-string)
- (TeX-split-string sep-char value))
- (dired-split sep-char value)))))
+ (entries (split-string value sep-char)))
(cl-loop for x in entries if (bib-cite-file-directory-p x) collect x))))
(provide 'bib-cite)
commit 70495129676f7fa123a87bf8c42334849378f2aa
Author: Ikumi Keita <ikumi@ikumi.que.jp>
Date: Thu Mar 25 16:36:49 2021 +0900
Reduce byte compiler warning
* bib-cite.el (bib-bib-label-help-echo-format, bib-ext-list)
(bib-label-help-echo, bib-label-help):
Delete remaining XEmacs only functions and variables.
(bib-highlight-mouse): Don't touch removed variable.
(bib-etags-command, bib-etags-append-command, bib-display, bib-find)
(bib-find-next, bib-make-bibliography, bib-edit-citation)
(bib-get-bibliography):
Fix doc strings.
diff --git a/bib-cite.el b/bib-cite.el
index b21bdcb..ebacdb7 100644
--- a/bib-cite.el
+++ b/bib-cite.el
@@ -628,12 +628,6 @@ You may use `switch-to-buffer'
`switch-to-buffer-other-window' or
"Call bib-highlight-mouse from `LaTeX-mode-hook' to add green highlight."
:type 'boolean)
-(defcustom bib-label-help-echo-format "button2 finds %s, button3 displays %s"
- "Format string for info if the mouse is over LaTeX commands.
-If nil, do not display info."
- :type '(radio (const :tag "Don't display info" nil)
- string))
-
(defcustom bib-bibtex-env-variable "BIBINPUTS"
"Environment variable setting the path where BiBTeX input files are found.
BiBTeX 0.99b manual says this should be TEXBIB.
@@ -673,7 +667,7 @@ setting the elisp variable bib-bibtex-env-variable)"
(defcustom bib-etags-command "etags -r '/.*\\\\\\(eq\\|page\\|[fvF]\\)ref.*/'
-o "
"Variable for the etags command and its output option.
-In unix, this is usually \"etags -r '/.*\\\(eq\|page\|[fvF]\)ref.*/' -o \"
+In unix, this is usually \"etags -r '/.*\\\\\\(eq\\|page\\|[fvF]\\)ref.*/' -o
\"
\(we use the -r option to tell etags to list AMS-LaTeX's \\eqref command.)
In DOS and OS/2, this *may* be different, e.g. using slashes like \"etags /o=\"
If so, set it this variable."
@@ -681,7 +675,7 @@ If so, set it this variable."
(defcustom bib-etags-append-command "etags -r
'/.*\\\\\\(eq\\|page\\|[fvF]\\)ref.*/' -a -o "
"Variable for the etags command and its append and output option.
-In unix, this is usually \"etags -r '/.*\\\(eq\|page\|[fvF]\)ref.*/' -a -o \"
+In unix, this is usually \"etags -r '/.*\\\\\\(eq\\|page\\|[fvF]\\)ref.*/' -a
-o \"
In DOS and OS/2, this *may* be \"etags /a /o=\" If so, set it this variable."
:type 'string)
@@ -725,11 +719,6 @@ A opening curly bracket is appended to the regexp.")
(defvar bib-highlight-mouse-keymap (make-sparse-keymap)
"Keymap for mouse bindings in highlighted texts in bicite.")
-(defvar bib-ext-list nil
- "Xemacs buffer-local list of bib-cite extents.")
-(make-variable-buffer-local 'bib-ext-list)
-(put 'bib-ext-list 'permanent-local t)
-
(defvar bib-cite-minor-mode-menu nil)
;;;###autoload
@@ -884,7 +873,7 @@ runs `bib-find', and [mouse-3] runs `bib-display'."
If text under cursor is a \\cite command, then display its BibTeX info from
\\bibliography input file.
Example with cursor located over cite command or arguments:
- \cite{Wadhams81,Bourke.et.al87,SchneiderBudeus94}
+ \\cite{Wadhams81,Bourke.et.al87,SchneiderBudeus94}
^Display-all-citations ^Display-this-citation
If text under cursor is a \\ref command, then display environment associated
@@ -917,7 +906,7 @@ A TAGS file is created and used for multi-file documents
under auctex."
For multi-entry cite commands, the cursor should be on the actual cite key
desired (otherwise a random entry will be selected).
-e.g.: \cite{Wadhams81,Bourke.et.al87,SchneiderBudeus94}
+e.g.: \\cite{Wadhams81,Bourke.et.al87,SchneiderBudeus94}
^Display-this-citation
If text under cursor is a \\ref command, then point is moved to its matching
@@ -948,7 +937,7 @@ A TAGS file is created and used for multi-file documents
under auctex."
"Bib-cite intenal variable to hold last \\ref or \\eqref find.")
(defun bib-find-next (&optional prev-p)
- "Find next occurrence of a \ref or \eqref.
+ "Find next occurrence of a \\ref or \\eqref.
This is made necessary because we now use a regexp to find tags in multi-file
documents, and the Emacs command `find-tag' doesn't allow to interactively
find the next occurrence of a regexp."
@@ -1033,7 +1022,7 @@ by using bib-apropos sequentially."
"Bib-cite internal variable.")
(defun bib-make-bibliography ()
- "Extract citations used in the current document from \bibliography{} file(s).
+ "Extract citations used in the current document from \\bibliography{}
file(s).
Put them into a buffer named after the current buffer, with extension .bib.
In an AUCTeX multi-file document, parsing must be on and the citation keys
@@ -1220,12 +1209,11 @@ See variables bib-etags-command and bib-etags-filename"
;; *all of code was here*
;; )
(save-excursion
- (let ((s)(e);; (extent) (local-extent-list bib-ext-list)
+ (let ((s)(e)
(inhibit-read-only t)
(modified (buffer-modified-p))) ;put-text-property changing this?
;; * peta Wed Nov 8 16:27:29 1995 -- better remove the mouse face
;; properties first.
- (setq bib-ext-list nil) ;Reconstructed below...
;; Remove properties for regular emacs
;; FIXME This detroys all mouse-faces and local-maps!
;; FIXME Hope no other package is using them in this buffer!
@@ -1269,32 +1257,13 @@ See variables bib-etags-command and bib-etags-filename"
'(mouse-face local-map)))
(set-buffer-modified-p modified))))
-(defun bib-label-help-echo (object)
- (if bib-label-help-echo-format
- (bib-label-help object bib-label-help-echo-format)))
-
-;; Balloon-help callback. Anders Stenman <stenman@isy.liu.se>
-;; Patched by Bruce Ravel <bruce.ravel@nist.gov>
-(defun bib-label-help (object &optional format)
- (or format (setq format "Use mouse button 2 to find the %s.
-Use mouse button 3 to display the %s."))
- (save-match-data
- (let* ((string (extent-string object))
- (type (cond ((string-match "^\\\\[A-Za-z]*cite[A-Za-z]*" string)
"citation")
- ((string-match
- (concat "^" bib-ref-regexp) string)
- "\\label{}")
- ((string-match "^\\\\label" string) "\\ref{}")
- (t "this (unknown) reference"))))
- (format format type type))))
-
;;----------------------------------------------------------------------------
;; Routines to display or edit a citation's bibliography
(defun bib-display-citation ()
"Do the displaying of cite info. Return t if found cite key, nil otherwise.
Example with cursor located over cite command or arguments:
-\cite{Wadhams81,Bourke.et.al87,SchneiderBudeus94}
+\\cite{Wadhams81,Bourke.et.al87,SchneiderBudeus94}
^Display-all-citations ^Display-this-citation"
(save-excursion
(let* ((the-keys-obarray (bib-get-citekeys-obarray)) ;1st in case of error
@@ -1325,10 +1294,10 @@ Example with cursor located over cite command or
arguments:
(defun bib-edit-citation ()
"Do the edit of cite info. Return t if found cite key, nil otherwise.
Find and and put edit point in bib file associated with a BibTeX citation
-under cursor from \bibliography input file.
+under cursor from \\bibliography input file.
In a multi-entry cite command, the cursor should be on the actual cite key
desired (otherwise a random entry will be selected).
-e.g.: \cite{Wadhams81,Bourke.et.al87,SchneiderBudeus94}
+e.g.: \\cite{Wadhams81,Bourke.et.al87,SchneiderBudeus94}
^Display-this-citation"
(let ((the-keys-obarray (bib-get-citekeys-obarray)) ;1st in case of error
(bib-buffer (bib-get-bibliography t))
@@ -2127,9 +2096,9 @@ Makes sure TAGS file exists, etc."
If using AUCTeX, and either TeX-parse-self is set or C-c C-n is used to
parse the document, then the entire multifile document will be searched
-for \bibliography commands.
+for \\bibliography commands.
-If this fails, the current buffer is searched for the first \bibliography
+If this fails, the current buffer is searched for the first \\bibliography
command.
If include-filenames-f is true, include as a special header the filename
-----------------------------------------------------------------------
Summary of changes:
bib-cite.el | 125 ++++++++++--------------------------------------------
latex.el | 10 ++---
multi-prompt.el | 4 +-
style/biblatex.el | 4 +-
style/newfloat.el | 4 +-
style/ntheorem.el | 2 +-
style/wrapfig.el | 2 +-
tex.el | 42 +++++-------------
8 files changed, 47 insertions(+), 146 deletions(-)
hooks/post-receive
--
GNU AUCTeX
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [AUCTeX-diffs] GNU AUCTeX branch, master, updated. 5696f07ad37bb3cf5250fe7c2e0a2471933fe041,
Ikumi Keita <=