[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[AUCTeX-diffs] GNU AUCTeX branch, master, updated. 3ce90dbc3176f434e140c
|
From: |
Ikumi Keita |
|
Subject: |
[AUCTeX-diffs] GNU AUCTeX branch, master, updated. 3ce90dbc3176f434e140cb23552b5f04e50a5693 |
|
Date: |
Wed, 5 Dec 2018 06:28:45 -0500 (EST) |
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 3ce90dbc3176f434e140cb23552b5f04e50a5693 (commit)
via 45ad237806613cfa365a7d1f8bc799d0cc930b2b (commit)
via 5827aeb3aff59fd5988b4037931c4d7cc441bbd9 (commit)
via 9ae66cd34509ef9ce47f9249d887a5b6935b7203 (commit)
from 48d5874a44aed7d916346ac545fc5385c4092aa3 (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 3ce90dbc3176f434e140cb23552b5f04e50a5693
Author: Ikumi Keita <address@hidden>
Date: Tue Nov 27 04:54:16 2018 +0900
Remove compatibility code for older emacsen
* tex.el: Remove XEmacs compatibility definitions for
`TeX-read-string', `TeX-active-mark', `TeX-activate-region',
`line-beginning-position', `line-end-position' and
`TeX-overlay-prioritize'.
(TeX-activate-region): Remove compatibility code for older emacsen.
diff --git a/tex.el b/tex.el
index 980c308..e2a2d45 100644
--- a/tex.el
+++ b/tex.el
@@ -673,67 +673,6 @@ emacs 24.1 and is then later run by emacs 24.5."
The step should be big enough to allow setting a priority for new
overlays between two existing ones.")
-
-;;; Special support for XEmacs
-
-(when (featurep 'xemacs)
-
- (defun TeX-read-string
- (prompt &optional initial-input history default-value)
- (condition-case nil
- (read-string prompt initial-input history default-value t)
- (wrong-number-of-arguments
- (read-string prompt initial-input history default-value))))
-
- (defun TeX-active-mark ()
- (and zmacs-regions (mark)))
-
- (fset 'TeX-activate-region (symbol-function 'zmacs-activate-region))
-
- ;; I am aware that this counteracts coding conventions but I am sick
- ;; of it.
- (unless (fboundp 'line-beginning-position)
- (defalias 'line-beginning-position 'point-at-bol))
- (unless (fboundp 'line-end-position)
- (defalias 'line-end-position 'point-at-eol))
-
- (defun TeX-overlay-prioritize (start end)
- "Calculate a priority for an overlay extending from START to END.
-The calculated priority is lower than the minimum of priorities
-of surrounding overlays and higher than the maximum of enclosed
-overlays."
- (let (inner-priority outer-priority
- (prios (cons nil nil)))
- (map-extents
- #'(lambda (ov prios)
- (and
- (or (eq (extent-property ov 'category) 'TeX-fold)
- (extent-property ov 'preview-state))
- (setcar prios
- (max (or (car prios) 0)
- (extent-property ov 'priority))))
- nil)
- nil start end prios 'start-and-end-in-region 'priority)
- (map-extents
- #'(lambda (ov prios)
- (and
- (or (eq (extent-property ov 'category) 'TeX-fold)
- (extent-property ov 'preview-state))
- (setcdr prios
- (min (or (cdr prios) most-positive-fixnum)
- (extent-property ov 'priority))))
- nil)
- nil start end prios
- '(start-and-end-in-region negate-in-region) 'priority)
- (setq inner-priority (car prios) outer-priority (cdr prios))
- (cond ((and inner-priority (not outer-priority))
- (+ inner-priority TeX-overlay-priority-step))
- ((and (not inner-priority) outer-priority)
- (/ outer-priority 2))
- ((and inner-priority outer-priority)
- (+ (/ (- outer-priority inner-priority) 2) inner-priority))
- (t TeX-overlay-priority-step)))))
-
;; require crm here, because we often do
;;
;; (let ((crm-separator ","))
@@ -790,54 +729,38 @@ Ensures that empty input results in nil across different
emacs versions."
hist def inherit-input-method)))
(if (equal result '("")) nil result))))
-;;; Special support for GNU Emacs
-
-(unless (featurep 'xemacs)
-
- (defun TeX-read-string (prompt &optional initial-input history default-value)
- (read-string prompt initial-input history default-value t))
-
- (defun TeX-active-mark ()
- (and transient-mark-mode mark-active))
-
- (defun TeX-activate-region ()
- (setq deactivate-mark nil)
- (if (fboundp 'activate-mark)
- (activate-mark)
- ;; COMPATIBILITY for Emacs <= 22
- ;; This part is adopted from `activate-mark' of Emacs 24.5.
- (when (mark t)
- (unless (and transient-mark-mode mark-active
- (mark))
- (force-mode-line-update) ;Refresh toolbar (bug#16382).
- (setq mark-active t)
- (unless transient-mark-mode
- (setq transient-mark-mode 'lambda))
- (if (boundp 'activate-mark-hook)
- (run-hooks 'activate-mark-hook))))))
-
- (defun TeX-overlay-prioritize (start end)
- "Calculate a priority for an overlay extending from START to END.
+(defun TeX-read-string (prompt &optional initial-input history default-value)
+ (read-string prompt initial-input history default-value t))
+
+(defun TeX-active-mark ()
+ (and transient-mark-mode mark-active))
+
+(defun TeX-activate-region ()
+ (setq deactivate-mark nil)
+ (activate-mark))
+
+(defun TeX-overlay-prioritize (start end)
+ "Calculate a priority for an overlay extending from START to END.
The calculated priority is lower than the minimum of priorities
of surrounding overlays and higher than the maximum of enclosed
overlays."
- (let (outer-priority inner-priority ov-priority)
- (dolist (ov (overlays-in start end))
- (when (or (eq (overlay-get ov 'category) 'TeX-fold)
- (overlay-get ov 'preview-state))
- (setq ov-priority (overlay-get ov 'priority))
- (if (>= (overlay-start ov) start)
- (setq inner-priority (max ov-priority (or inner-priority
- ov-priority)))
- (setq outer-priority (min ov-priority (or outer-priority
- ov-priority))))))
- (cond ((and inner-priority (not outer-priority))
- (+ inner-priority TeX-overlay-priority-step))
- ((and (not inner-priority) outer-priority)
- (/ outer-priority 2))
- ((and inner-priority outer-priority)
- (+ (/ (- outer-priority inner-priority) 2) inner-priority))
- (t TeX-overlay-priority-step)))))
+ (let (outer-priority inner-priority ov-priority)
+ (dolist (ov (overlays-in start end))
+ (when (or (eq (overlay-get ov 'category) 'TeX-fold)
+ (overlay-get ov 'preview-state))
+ (setq ov-priority (overlay-get ov 'priority))
+ (if (>= (overlay-start ov) start)
+ (setq inner-priority (max ov-priority (or inner-priority
+ ov-priority)))
+ (setq outer-priority (min ov-priority (or outer-priority
+ ov-priority))))))
+ (cond ((and inner-priority (not outer-priority))
+ (+ inner-priority TeX-overlay-priority-step))
+ ((and (not inner-priority) outer-priority)
+ (/ outer-priority 2))
+ ((and inner-priority outer-priority)
+ (+ (/ (- outer-priority inner-priority) 2) inner-priority))
+ (t TeX-overlay-priority-step))))
(defun TeX-delete-dups-by-car (alist &optional keep-list)
"Return a list of all elements in ALIST, but each car only once.
commit 45ad237806613cfa365a7d1f8bc799d0cc930b2b
Author: Ikumi Keita <address@hidden>
Date: Tue Nov 27 04:52:02 2018 +0900
Remove TeX-maybe-remove-help, TeX-menu-with-help
* tex.el (TeX-maybe-remove-help, TeX-menu-with-help): Remove.
(TeX-mode-specific-command-menu-entries, TeX-fold-menu)
(TeX-common-menu-entries):
* context.el:
* latex.el:
* plain-tex.el:
* tex-buf.el:
* tex-info.el:
Remove `TeX-menu-with-help' and fix indent.
diff --git a/context.el b/context.el
index ee35eb6..5622d8a 100644
--- a/context.el
+++ b/context.el
@@ -1,6 +1,6 @@
;;; context.el --- Support for ConTeXt documents.
-;; Copyright (C) 2003-2006, 2008, 2010, 2012, 2014-2017
+;; Copyright (C) 2003-2006, 2008, 2010, 2012, 2014-2018
;; Free Software Foundation, Inc.
;; Maintainer: Berend de Boer <address@hidden>
@@ -1482,58 +1482,57 @@ else. There might be text before point."
(easy-menu-define ConTeXt-mode-menu
ConTeXt-mode-map
"Menu used in ConTeXt mode."
- (TeX-menu-with-help
- `("ConTeXt"
- (,ConTeXt-project-structure-menu-name)
- (,ConTeXt-section-block-menu-name)
- (,ConTeXt-numbered-section-menu-name)
- (,ConTeXt-unnumbered-section-menu-name)
- ["Add Table of Contents to Emacs Menu" (imenu-add-to-menubar "TOC") t]
- "-"
- ["Macro ..." TeX-insert-macro
- :help "Insert a macro and possibly arguments"]
- ["Complete" TeX-complete-symbol
- :help "Complete the current macro or environment name"]
- ["Show ConTeXt Macro Definition" ConTeXt-etexshow]
- "-"
- (,ConTeXt-environment-menu-name)
- (,ConTeXt-environment-modify-menu-name)
- ["Item" ConTeXt-insert-item
- :help "Insert a new \\item into current environment"]
- (,ConTeXt-define-menu-name)
- (,ConTeXt-setup-menu-name)
- (,ConTeXt-other-macro-menu-name)
- "-"
- ("Insert Font"
- ["Emphasize" (TeX-font nil ?\C-e) :keys "C-c C-f C-e"]
- ["Bold" (TeX-font nil ?\C-b) :keys "C-c C-f C-b"]
- ["Typewriter" (TeX-font nil ?\C-t) :keys "C-c C-f C-t"]
- ["Small Caps" (TeX-font nil ?\C-c) :keys "C-c C-f C-c"]
- ["Sans Serif" (TeX-font nil ?\C-f) :keys "C-c C-f C-f"]
- ["Italic" (TeX-font nil ?\C-i) :keys "C-c C-f C-i"]
- ["Slanted" (TeX-font nil ?\C-s) :keys "C-c C-f C-s"]
- ["Roman" (TeX-font nil ?\C-r) :keys "C-c C-f C-r"]
- ["Calligraphic" (TeX-font nil ?\C-a) :keys "C-c C-f C-a"])
- ("Replace Font"
- ["Emphasize" (TeX-font t ?\C-e) :keys "C-u C-c C-f C-e"]
- ["Bold" (TeX-font t ?\C-b) :keys "C-u C-c C-f C-b"]
- ["Typewriter" (TeX-font t ?\C-t) :keys "C-u C-c C-f C-t"]
- ["Small Caps" (TeX-font t ?\C-c) :keys "C-u C-c C-f C-c"]
- ["Sans Serif" (TeX-font t ?\C-f) :keys "C-u C-c C-f C-f"]
- ["Italic" (TeX-font t ?\C-i) :keys "C-u C-c C-f C-i"]
- ["Slanted" (TeX-font t ?\C-s) :keys "C-u C-c C-f C-s"]
- ["Roman" (TeX-font t ?\C-r) :keys "C-u C-c C-f C-r"]
- ["Calligraphic" (TeX-font t ?\C-a) :keys "C-u C-c C-f C-a"])
- ["Delete Font" (TeX-font t ?\C-d) :keys "C-c C-f C-d"]
- "-"
- ["Comment or Uncomment Region"
- comment-or-uncomment-region
- :help "Make the selected region outcommented or active again"]
- ["Comment or Uncomment Paragraph"
- TeX-comment-or-uncomment-paragraph
- :help "Make the current paragraph outcommented or active again"]
- ,TeX-fold-menu
- "-" . ,TeX-common-menu-entries)))
+ `("ConTeXt"
+ (,ConTeXt-project-structure-menu-name)
+ (,ConTeXt-section-block-menu-name)
+ (,ConTeXt-numbered-section-menu-name)
+ (,ConTeXt-unnumbered-section-menu-name)
+ ["Add Table of Contents to Emacs Menu" (imenu-add-to-menubar "TOC") t]
+ "-"
+ ["Macro ..." TeX-insert-macro
+ :help "Insert a macro and possibly arguments"]
+ ["Complete" TeX-complete-symbol
+ :help "Complete the current macro or environment name"]
+ ["Show ConTeXt Macro Definition" ConTeXt-etexshow]
+ "-"
+ (,ConTeXt-environment-menu-name)
+ (,ConTeXt-environment-modify-menu-name)
+ ["Item" ConTeXt-insert-item
+ :help "Insert a new \\item into current environment"]
+ (,ConTeXt-define-menu-name)
+ (,ConTeXt-setup-menu-name)
+ (,ConTeXt-other-macro-menu-name)
+ "-"
+ ("Insert Font"
+ ["Emphasize" (TeX-font nil ?\C-e) :keys "C-c C-f C-e"]
+ ["Bold" (TeX-font nil ?\C-b) :keys "C-c C-f C-b"]
+ ["Typewriter" (TeX-font nil ?\C-t) :keys "C-c C-f C-t"]
+ ["Small Caps" (TeX-font nil ?\C-c) :keys "C-c C-f C-c"]
+ ["Sans Serif" (TeX-font nil ?\C-f) :keys "C-c C-f C-f"]
+ ["Italic" (TeX-font nil ?\C-i) :keys "C-c C-f C-i"]
+ ["Slanted" (TeX-font nil ?\C-s) :keys "C-c C-f C-s"]
+ ["Roman" (TeX-font nil ?\C-r) :keys "C-c C-f C-r"]
+ ["Calligraphic" (TeX-font nil ?\C-a) :keys "C-c C-f C-a"])
+ ("Replace Font"
+ ["Emphasize" (TeX-font t ?\C-e) :keys "C-u C-c C-f C-e"]
+ ["Bold" (TeX-font t ?\C-b) :keys "C-u C-c C-f C-b"]
+ ["Typewriter" (TeX-font t ?\C-t) :keys "C-u C-c C-f C-t"]
+ ["Small Caps" (TeX-font t ?\C-c) :keys "C-u C-c C-f C-c"]
+ ["Sans Serif" (TeX-font t ?\C-f) :keys "C-u C-c C-f C-f"]
+ ["Italic" (TeX-font t ?\C-i) :keys "C-u C-c C-f C-i"]
+ ["Slanted" (TeX-font t ?\C-s) :keys "C-u C-c C-f C-s"]
+ ["Roman" (TeX-font t ?\C-r) :keys "C-u C-c C-f C-r"]
+ ["Calligraphic" (TeX-font t ?\C-a) :keys "C-u C-c C-f C-a"])
+ ["Delete Font" (TeX-font t ?\C-d) :keys "C-c C-f C-d"]
+ "-"
+ ["Comment or Uncomment Region"
+ comment-or-uncomment-region
+ :help "Make the selected region outcommented or active again"]
+ ["Comment or Uncomment Paragraph"
+ TeX-comment-or-uncomment-paragraph
+ :help "Make the current paragraph outcommented or active again"]
+ ,TeX-fold-menu
+ "-" . ,TeX-common-menu-entries))
(defun ConTeXt-menu-update (&optional menu)
"Update entries on AUCTeX menu."
diff --git a/latex.el b/latex.el
index 96fcf04..b1d2901 100644
--- a/latex.el
+++ b/latex.el
@@ -5628,79 +5628,78 @@ regenerated by the respective menu filter."
(easy-menu-define LaTeX-mode-menu
LaTeX-mode-map
"Menu used in LaTeX mode."
- (TeX-menu-with-help
- `("LaTeX"
- ("Section (C-c C-s)" :filter LaTeX-section-menu-filter)
- ["Macro..." TeX-insert-macro
- :help "Insert a macro and possibly arguments"]
- ["Complete Macro" TeX-complete-symbol
- :help "Complete the current macro or environment name"]
- ,(list LaTeX-environment-menu-name
- :filter (lambda (ignored) (LaTeX-environment-menu-filter
- LaTeX-environment-menu-name)))
- ,(list LaTeX-environment-modify-menu-name
- :filter (lambda (ignored) (LaTeX-environment-menu-filter
- LaTeX-environment-modify-menu-name)))
- ["Close Environment" LaTeX-close-environment
- :help "Insert the \\end part of the current environment"]
- ["Item" LaTeX-insert-item
- :help "Insert a new \\item into current environment"]
+ `("LaTeX"
+ ("Section (C-c C-s)" :filter LaTeX-section-menu-filter)
+ ["Macro..." TeX-insert-macro
+ :help "Insert a macro and possibly arguments"]
+ ["Complete Macro" TeX-complete-symbol
+ :help "Complete the current macro or environment name"]
+ ,(list LaTeX-environment-menu-name
+ :filter (lambda (ignored) (LaTeX-environment-menu-filter
+ LaTeX-environment-menu-name)))
+ ,(list LaTeX-environment-modify-menu-name
+ :filter (lambda (ignored) (LaTeX-environment-menu-filter
+ LaTeX-environment-modify-menu-name)))
+ ["Close Environment" LaTeX-close-environment
+ :help "Insert the \\end part of the current environment"]
+ ["Item" LaTeX-insert-item
+ :help "Insert a new \\item into current environment"]
+ "-"
+ ("Insert Font"
+ ["Emphasize" (TeX-font nil ?\C-e) :keys "C-c C-f C-e"]
+ ["Bold" (TeX-font nil ?\C-b) :keys "C-c C-f C-b"]
+ ["Typewriter" (TeX-font nil ?\C-t) :keys "C-c C-f C-t"]
+ ["Small Caps" (TeX-font nil ?\C-c) :keys "C-c C-f C-c"]
+ ["Sans Serif" (TeX-font nil ?\C-f) :keys "C-c C-f C-f"]
+ ["Italic" (TeX-font nil ?\C-i) :keys "C-c C-f C-i"]
+ ["Slanted" (TeX-font nil ?\C-s) :keys "C-c C-f C-s"]
+ ["Roman" (TeX-font nil ?\C-r) :keys "C-c C-f C-r"]
+ ["Calligraphic" (TeX-font nil ?\C-a) :keys "C-c C-f C-a"])
+ ("Replace Font"
+ ["Emphasize" (TeX-font t ?\C-e) :keys "C-u C-c C-f C-e"]
+ ["Bold" (TeX-font t ?\C-b) :keys "C-u C-c C-f C-b"]
+ ["Typewriter" (TeX-font t ?\C-t) :keys "C-u C-c C-f C-t"]
+ ["Small Caps" (TeX-font t ?\C-c) :keys "C-u C-c C-f C-c"]
+ ["Sans Serif" (TeX-font t ?\C-f) :keys "C-u C-c C-f C-f"]
+ ["Italic" (TeX-font t ?\C-i) :keys "C-u C-c C-f C-i"]
+ ["Slanted" (TeX-font t ?\C-s) :keys "C-u C-c C-f C-s"]
+ ["Roman" (TeX-font t ?\C-r) :keys "C-u C-c C-f C-r"]
+ ["Calligraphic" (TeX-font t ?\C-a) :keys "C-u C-c C-f C-a"])
+ ["Delete Font" (TeX-font t ?\C-d) :keys "C-c C-f C-d"]
+ "-"
+ ["Comment or Uncomment Region"
+ comment-or-uncomment-region
+ :help "Make the selected region outcommented or active again"]
+ ["Comment or Uncomment Paragraph"
+ TeX-comment-or-uncomment-paragraph
+ :help "Make the current paragraph outcommented or active again"]
+ ("Formatting and Marking"
+ ["Format Environment" LaTeX-fill-environment
+ :help "Fill and indent the current environment"]
+ ["Format Paragraph" LaTeX-fill-paragraph
+ :help "Fill and ident the current paragraph"]
+ ["Format Region" LaTeX-fill-region
+ :help "Fill and indent the currently selected region"]
+ ["Format Section" LaTeX-fill-section
+ :help "Fill and indent the current section"]
"-"
- ("Insert Font"
- ["Emphasize" (TeX-font nil ?\C-e) :keys "C-c C-f C-e"]
- ["Bold" (TeX-font nil ?\C-b) :keys "C-c C-f C-b"]
- ["Typewriter" (TeX-font nil ?\C-t) :keys "C-c C-f C-t"]
- ["Small Caps" (TeX-font nil ?\C-c) :keys "C-c C-f C-c"]
- ["Sans Serif" (TeX-font nil ?\C-f) :keys "C-c C-f C-f"]
- ["Italic" (TeX-font nil ?\C-i) :keys "C-c C-f C-i"]
- ["Slanted" (TeX-font nil ?\C-s) :keys "C-c C-f C-s"]
- ["Roman" (TeX-font nil ?\C-r) :keys "C-c C-f C-r"]
- ["Calligraphic" (TeX-font nil ?\C-a) :keys "C-c C-f C-a"])
- ("Replace Font"
- ["Emphasize" (TeX-font t ?\C-e) :keys "C-u C-c C-f C-e"]
- ["Bold" (TeX-font t ?\C-b) :keys "C-u C-c C-f C-b"]
- ["Typewriter" (TeX-font t ?\C-t) :keys "C-u C-c C-f C-t"]
- ["Small Caps" (TeX-font t ?\C-c) :keys "C-u C-c C-f C-c"]
- ["Sans Serif" (TeX-font t ?\C-f) :keys "C-u C-c C-f C-f"]
- ["Italic" (TeX-font t ?\C-i) :keys "C-u C-c C-f C-i"]
- ["Slanted" (TeX-font t ?\C-s) :keys "C-u C-c C-f C-s"]
- ["Roman" (TeX-font t ?\C-r) :keys "C-u C-c C-f C-r"]
- ["Calligraphic" (TeX-font t ?\C-a) :keys "C-u C-c C-f C-a"])
- ["Delete Font" (TeX-font t ?\C-d) :keys "C-c C-f C-d"]
+ ["Mark Environment" LaTeX-mark-environment
+ :help "Mark the current environment"]
+ ["Mark Section" LaTeX-mark-section
+ :help "Mark the current section"]
"-"
- ["Comment or Uncomment Region"
- comment-or-uncomment-region
- :help "Make the selected region outcommented or active again"]
- ["Comment or Uncomment Paragraph"
- TeX-comment-or-uncomment-paragraph
- :help "Make the current paragraph outcommented or active again"]
- ("Formatting and Marking"
- ["Format Environment" LaTeX-fill-environment
- :help "Fill and indent the current environment"]
- ["Format Paragraph" LaTeX-fill-paragraph
- :help "Fill and ident the current paragraph"]
- ["Format Region" LaTeX-fill-region
- :help "Fill and indent the currently selected region"]
- ["Format Section" LaTeX-fill-section
- :help "Fill and indent the current section"]
- "-"
- ["Mark Environment" LaTeX-mark-environment
- :help "Mark the current environment"]
- ["Mark Section" LaTeX-mark-section
- :help "Mark the current section"]
- "-"
- ["Beginning of Environment" LaTeX-find-matching-begin
- :help "Move point to the beginning of the current environment"]
- ["End of Environment" LaTeX-find-matching-end
- :help "Move point to the end of the current environment"])
- ,TeX-fold-menu
- ["Math Mode" LaTeX-math-mode
- :style toggle :selected LaTeX-math-mode
- :help "Toggle math mode"]
- "-"
- [ "Convert 209 to 2e" LaTeX-209-to-2e
- :visible (member "latex2" (TeX-style-list)) ]
- . ,TeX-common-menu-entries)))
+ ["Beginning of Environment" LaTeX-find-matching-begin
+ :help "Move point to the beginning of the current environment"]
+ ["End of Environment" LaTeX-find-matching-end
+ :help "Move point to the end of the current environment"])
+ ,TeX-fold-menu
+ ["Math Mode" LaTeX-math-mode
+ :style toggle :selected LaTeX-math-mode
+ :help "Toggle math mode"]
+ "-"
+ [ "Convert 209 to 2e" LaTeX-209-to-2e
+ :visible (member "latex2" (TeX-style-list)) ]
+ . ,TeX-common-menu-entries))
(defcustom LaTeX-font-list
'((?\C-a "" "" "\\mathcal{" "}")
diff --git a/plain-tex.el b/plain-tex.el
index b881516..4be0e3d 100644
--- a/plain-tex.el
+++ b/plain-tex.el
@@ -55,40 +55,39 @@ Install tool bar if `plain-TeX-enable-toolbar' is non-nil."
"Keymap used in plain TeX mode.")
(defvar plain-TeX-menu-entries
- (TeX-menu-with-help
- `(["Macro..." TeX-insert-macro
- :help "Insert a macro and possibly arguments"]
- ["Complete" TeX-complete-symbol
- :help "Complete the current macro"]
- "-"
- ("Insert Font"
- ["Emphasize" (TeX-font nil ?\C-e) :keys "C-c C-f C-e"]
- ["Bold" (TeX-font nil ?\C-b) :keys "C-c C-f C-b"]
- ["Typewriter" (TeX-font nil ?\C-t) :keys "C-c C-f C-t"]
- ["Small Caps" (TeX-font nil ?\C-c) :keys "C-c C-f C-c"]
- ["Sans Serif" (TeX-font nil ?\C-f) :keys "C-c C-f C-f"]
- ["Italic" (TeX-font nil ?\C-i) :keys "C-c C-f C-i"]
- ["Slanted" (TeX-font nil ?\C-s) :keys "C-c C-f C-s"]
- ["Roman" (TeX-font nil ?\C-r) :keys "C-c C-f C-r"]
- ["Calligraphic" (TeX-font nil ?\C-a) :keys "C-c C-f C-a"])
- ("Replace Font"
- ["Emphasize" (TeX-font t ?\C-e) :keys "C-u C-c C-f C-e"]
- ["Bold" (TeX-font t ?\C-b) :keys "C-u C-c C-f C-b"]
- ["Typewriter" (TeX-font t ?\C-t) :keys "C-u C-c C-f C-t"]
- ["Small Caps" (TeX-font t ?\C-c) :keys "C-u C-c C-f C-c"]
- ["Sans Serif" (TeX-font t ?\C-f) :keys "C-u C-c C-f C-f"]
- ["Italic" (TeX-font t ?\C-i) :keys "C-u C-c C-f C-i"]
- ["Slanted" (TeX-font t ?\C-s) :keys "C-u C-c C-f C-s"]
- ["Roman" (TeX-font t ?\C-r) :keys "C-u C-c C-f C-r"]
- ["Calligraphic" (TeX-font t ?\C-a) :keys "C-u C-c C-f C-a"])
- ["Delete Font" (TeX-font t ?\C-d) :keys "C-c C-f C-d"]
- "-"
- ["Comment or Uncomment Region" comment-or-uncomment-region
- :help "Comment or uncomment the currently selected region"]
- ["Comment or Uncomment Paragraph" TeX-comment-or-uncomment-paragraph
- :help "Comment or uncomment the paragraph containing point"]
- ,TeX-fold-menu
- "-" . ,TeX-common-menu-entries)))
+ `(["Macro..." TeX-insert-macro
+ :help "Insert a macro and possibly arguments"]
+ ["Complete" TeX-complete-symbol
+ :help "Complete the current macro"]
+ "-"
+ ("Insert Font"
+ ["Emphasize" (TeX-font nil ?\C-e) :keys "C-c C-f C-e"]
+ ["Bold" (TeX-font nil ?\C-b) :keys "C-c C-f C-b"]
+ ["Typewriter" (TeX-font nil ?\C-t) :keys "C-c C-f C-t"]
+ ["Small Caps" (TeX-font nil ?\C-c) :keys "C-c C-f C-c"]
+ ["Sans Serif" (TeX-font nil ?\C-f) :keys "C-c C-f C-f"]
+ ["Italic" (TeX-font nil ?\C-i) :keys "C-c C-f C-i"]
+ ["Slanted" (TeX-font nil ?\C-s) :keys "C-c C-f C-s"]
+ ["Roman" (TeX-font nil ?\C-r) :keys "C-c C-f C-r"]
+ ["Calligraphic" (TeX-font nil ?\C-a) :keys "C-c C-f C-a"])
+ ("Replace Font"
+ ["Emphasize" (TeX-font t ?\C-e) :keys "C-u C-c C-f C-e"]
+ ["Bold" (TeX-font t ?\C-b) :keys "C-u C-c C-f C-b"]
+ ["Typewriter" (TeX-font t ?\C-t) :keys "C-u C-c C-f C-t"]
+ ["Small Caps" (TeX-font t ?\C-c) :keys "C-u C-c C-f C-c"]
+ ["Sans Serif" (TeX-font t ?\C-f) :keys "C-u C-c C-f C-f"]
+ ["Italic" (TeX-font t ?\C-i) :keys "C-u C-c C-f C-i"]
+ ["Slanted" (TeX-font t ?\C-s) :keys "C-u C-c C-f C-s"]
+ ["Roman" (TeX-font t ?\C-r) :keys "C-u C-c C-f C-r"]
+ ["Calligraphic" (TeX-font t ?\C-a) :keys "C-u C-c C-f C-a"])
+ ["Delete Font" (TeX-font t ?\C-d) :keys "C-c C-f C-d"]
+ "-"
+ ["Comment or Uncomment Region" comment-or-uncomment-region
+ :help "Comment or uncomment the currently selected region"]
+ ["Comment or Uncomment Paragraph" TeX-comment-or-uncomment-paragraph
+ :help "Comment or uncomment the paragraph containing point"]
+ ,TeX-fold-menu
+ "-" . ,TeX-common-menu-entries))
(easy-menu-define plain-TeX-mode-command-menu
plain-TeX-mode-map
diff --git a/tex-buf.el b/tex-buf.el
index 12447d7..e89df51 100644
--- a/tex-buf.el
+++ b/tex-buf.el
@@ -3694,32 +3694,31 @@ forward, if negative)."
(easy-menu-define TeX-error-overview-menu
TeX-error-overview-mode-map
"Menu used in TeX error overview mode."
- (TeX-menu-with-help
- '("TeX errors"
- ["Next error" TeX-error-overview-next-error
- :help "Jump to the next error"]
- ["Previous error" TeX-error-overview-previous-error
- :help "Jump to the previous error"]
- ["Go to source" TeX-error-overview-goto-source
- :help "Show the error in the source"]
- ["Jump to source" TeX-error-overview-jump-to-source
- :help "Move point to the error in the source"]
- ["Go to log" TeX-error-overview-goto-log
- :help "Show the error in the log buffer"]
- "-"
- ["Debug Bad Boxes" TeX-error-overview-toggle-debug-bad-boxes
- :style toggle :selected TeX-debug-bad-boxes
- :help "Show overfull and underfull boxes"]
- ["Debug Warnings" TeX-error-overview-toggle-debug-warnings
- :style toggle :selected TeX-debug-warnings
- :help "Show warnings"]
- ["Ignore Unimportant Warnings"
- TeX-error-overview-toggle-suppress-ignored-warnings
- :style toggle :selected TeX-suppress-ignored-warnings
- :help "Hide specified warnings"]
- "-"
- ["Quit" TeX-error-overview-quit
- :help "Quit"])))
+ '("TeX errors"
+ ["Next error" TeX-error-overview-next-error
+ :help "Jump to the next error"]
+ ["Previous error" TeX-error-overview-previous-error
+ :help "Jump to the previous error"]
+ ["Go to source" TeX-error-overview-goto-source
+ :help "Show the error in the source"]
+ ["Jump to source" TeX-error-overview-jump-to-source
+ :help "Move point to the error in the source"]
+ ["Go to log" TeX-error-overview-goto-log
+ :help "Show the error in the log buffer"]
+ "-"
+ ["Debug Bad Boxes" TeX-error-overview-toggle-debug-bad-boxes
+ :style toggle :selected TeX-debug-bad-boxes
+ :help "Show overfull and underfull boxes"]
+ ["Debug Warnings" TeX-error-overview-toggle-debug-warnings
+ :style toggle :selected TeX-debug-warnings
+ :help "Show warnings"]
+ ["Ignore Unimportant Warnings"
+ TeX-error-overview-toggle-suppress-ignored-warnings
+ :style toggle :selected TeX-suppress-ignored-warnings
+ :help "Hide specified warnings"]
+ "-"
+ ["Quit" TeX-error-overview-quit
+ :help "Quit"]))
(defvar TeX-error-overview-list-entries nil
"List of errors to be used in the error overview.")
diff --git a/tex-info.el b/tex-info.el
index 52d01be..3fc868f 100644
--- a/tex-info.el
+++ b/tex-info.el
@@ -535,58 +535,57 @@ is assumed by default."
(easy-menu-define Texinfo-mode-menu
Texinfo-mode-map
"Menu used in Texinfo mode."
- (TeX-menu-with-help
- `("Texinfo"
- ["Node ..." address@hidden
- :help "Insert a node"]
- ["Macro ..." TeX-insert-macro
- :help "Insert a macro and possibly arguments"]
- ["Complete Macro" TeX-complete-symbol
- :help "Complete the current macro"]
- ["Environment ..." Texinfo-insert-environment
- :help "Insert an environment"]
- ["Item" address@hidden
- :help "Insert an @item"]
- "-"
- ("Insert Font"
- ["Emphasize" (TeX-font nil ?\C-e) :keys "C-c C-f C-e"]
- ["Bold" (TeX-font nil ?\C-b) :keys "C-c C-f C-b"]
- ["Typewriter" (TeX-font nil ?\C-t) :keys "C-c C-f C-t"]
- ["Small Caps" (TeX-font nil ?\C-c) :keys "C-c C-f C-c"]
- ["Italic" (TeX-font nil ?\C-i) :keys "C-c C-f C-i"]
- ["Sample" (TeX-font nil ?\C-s) :keys "C-c C-f C-s"]
- ["Roman" (TeX-font nil ?\C-r) :keys "C-c C-f C-r"])
- ("Replace Font"
- ["Emphasize" (TeX-font t ?\C-e) :keys "C-u C-c C-f C-e"]
- ["Bold" (TeX-font t ?\C-b) :keys "C-u C-c C-f C-b"]
- ["Typewriter" (TeX-font t ?\C-t) :keys "C-u C-c C-f C-t"]
- ["Small Caps" (TeX-font t ?\C-c) :keys "C-u C-c C-f C-c"]
- ["Italic" (TeX-font t ?\C-i) :keys "C-u C-c C-f C-i"]
- ["Sample" (TeX-font t ?\C-s) :keys "C-u C-c C-f C-s"]
- ["Roman" (TeX-font t ?\C-r) :keys "C-u C-c C-f C-r"])
- ["Delete Font" (TeX-font t ?\C-d) :keys "C-c C-f C-d"]
- "-"
- ["Create Master Menu" texinfo-master-menu
- :help "Make a master menu for the whole Texinfo file"]
- ["Create Menu" texinfo-make-menu
- :help "Make or update the menu for the current section"]
- ["Update Node" texinfo-update-node
- :help "Update the current node"]
- ["Update Every Node" texinfo-every-node-update
- :help "Update every node in the current file"]
- ["Update All Menus" texinfo-all-menus-update
- :help "Update every menu in the current file"]
- "-"
- ("Commenting"
- ["Comment or Uncomment Region"
- comment-or-uncomment-region
- :help "Comment or uncomment the currently selected region"]
- ["Comment or Uncomment Paragraph"
- TeX-comment-or-uncomment-paragraph
- :help "Comment or uncomment the current paragraph"])
- ,TeX-fold-menu
- "-"
- . ,TeX-common-menu-entries)))
+ `("Texinfo"
+ ["Node ..." address@hidden
+ :help "Insert a node"]
+ ["Macro ..." TeX-insert-macro
+ :help "Insert a macro and possibly arguments"]
+ ["Complete Macro" TeX-complete-symbol
+ :help "Complete the current macro"]
+ ["Environment ..." Texinfo-insert-environment
+ :help "Insert an environment"]
+ ["Item" address@hidden
+ :help "Insert an @item"]
+ "-"
+ ("Insert Font"
+ ["Emphasize" (TeX-font nil ?\C-e) :keys "C-c C-f C-e"]
+ ["Bold" (TeX-font nil ?\C-b) :keys "C-c C-f C-b"]
+ ["Typewriter" (TeX-font nil ?\C-t) :keys "C-c C-f C-t"]
+ ["Small Caps" (TeX-font nil ?\C-c) :keys "C-c C-f C-c"]
+ ["Italic" (TeX-font nil ?\C-i) :keys "C-c C-f C-i"]
+ ["Sample" (TeX-font nil ?\C-s) :keys "C-c C-f C-s"]
+ ["Roman" (TeX-font nil ?\C-r) :keys "C-c C-f C-r"])
+ ("Replace Font"
+ ["Emphasize" (TeX-font t ?\C-e) :keys "C-u C-c C-f C-e"]
+ ["Bold" (TeX-font t ?\C-b) :keys "C-u C-c C-f C-b"]
+ ["Typewriter" (TeX-font t ?\C-t) :keys "C-u C-c C-f C-t"]
+ ["Small Caps" (TeX-font t ?\C-c) :keys "C-u C-c C-f C-c"]
+ ["Italic" (TeX-font t ?\C-i) :keys "C-u C-c C-f C-i"]
+ ["Sample" (TeX-font t ?\C-s) :keys "C-u C-c C-f C-s"]
+ ["Roman" (TeX-font t ?\C-r) :keys "C-u C-c C-f C-r"])
+ ["Delete Font" (TeX-font t ?\C-d) :keys "C-c C-f C-d"]
+ "-"
+ ["Create Master Menu" texinfo-master-menu
+ :help "Make a master menu for the whole Texinfo file"]
+ ["Create Menu" texinfo-make-menu
+ :help "Make or update the menu for the current section"]
+ ["Update Node" texinfo-update-node
+ :help "Update the current node"]
+ ["Update Every Node" texinfo-every-node-update
+ :help "Update every node in the current file"]
+ ["Update All Menus" texinfo-all-menus-update
+ :help "Update every menu in the current file"]
+ "-"
+ ("Commenting"
+ ["Comment or Uncomment Region"
+ comment-or-uncomment-region
+ :help "Comment or uncomment the currently selected region"]
+ ["Comment or Uncomment Paragraph"
+ TeX-comment-or-uncomment-paragraph
+ :help "Comment or uncomment the current paragraph"])
+ ,TeX-fold-menu
+ "-"
+ . ,TeX-common-menu-entries))
(defvar Texinfo-font-list
'((?\C-b "@b{" "}")
diff --git a/tex.el b/tex.el
index bb34660..980c308 100644
--- a/tex.el
+++ b/tex.el
@@ -649,32 +649,6 @@ emacs 24.1 and is then later run by emacs 24.5."
(require 'easymenu)
-(eval-and-compile
- (if (featurep 'xemacs)
- (defun TeX-maybe-remove-help (menu)
- "Removes :help entries from menus, since XEmacs does not like them.
-Also does other stuff."
- (cond ((consp menu)
- (cond ((eq (car menu) :help)
- (TeX-maybe-remove-help (cddr menu)))
- ((eq (car menu) :visible)
- (cons :included
- (cons (cadr menu)
- (TeX-maybe-remove-help (cddr menu)))))
- (t (cons (TeX-maybe-remove-help (car menu))
- (TeX-maybe-remove-help (cdr menu))))))
- ((vectorp menu)
- (vconcat (TeX-maybe-remove-help (append menu nil))))
- (t menu)))
- (defun TeX-maybe-remove-help (menu)
- "Compatibility function that would remove :help entries if on XEmacs,
-but does nothing in Emacs."
- menu))
- (defmacro TeX-menu-with-help (menu)
- "Compatibility macro that removes :help entries if on XEmacs.
-Also does other stuff."
- (TeX-maybe-remove-help menu)))
-
;;; Documentation for Info-goto-emacs-command-node and similar
(eval-after-load 'info '(dolist (elt '("TeX" "LaTeX" "ConTeXt" "Texinfo"
@@ -5010,93 +4984,91 @@ Brace insertion is only done if point is in a math
construct and
(defun TeX-mode-specific-command-menu-entries (mode)
"Return the entries for a Command menu specific to the major MODE."
(append
- (TeX-menu-with-help
- `("Command on"
- [ "Master File" TeX-command-select-master
- :keys "C-c C-c" :style radio
- :selected (eq TeX-command-current 'TeX-command-master)
- :help "Commands in this menu work on the Master File"]
- [ "Buffer" TeX-command-select-buffer
- :keys "C-c C-b" :style radio
- :selected (eq TeX-command-current 'TeX-command-buffer)
- :help "Commands in this menu work on the current buffer"]
- [ "Region" TeX-command-select-region
- :keys "C-c C-r" :style radio
- :selected (eq TeX-command-current 'TeX-command-region)
- :help "Commands in this menu work on the region"]
- [ "Fix the Region" TeX-pin-region
- :active (or (if prefix-arg
- (<= (prefix-numeric-value prefix-arg) 0)
- (and (boundp 'TeX-command-region-begin)
- (markerp TeX-command-region-begin)))
- mark-active)
- ;;:visible (eq TeX-command-current 'TeX-command-region)
- :style toggle
- :selected (and (boundp 'TeX-command-region-begin)
- (markerp TeX-command-region-begin))
- :help "Fix the region for \"Command on Region\""]
- "-"
- ["Recenter Output Buffer" TeX-recenter-output-buffer
- :help "Show the output of current TeX process"]
- ["Kill Job" TeX-kill-job
- :help "Kill the current TeX process"]
- ["Next Error" TeX-next-error
- :help "Jump to the next error of the last TeX run"]
- ["Previous Error" TeX-previous-error
- :help "Jump to the previous error of the last TeX run"
- :visible TeX-parse-all-errors]
- ["Error Overview" TeX-error-overview
- :help "Open an overview of errors occured in the last TeX run"
- :visible (and TeX-parse-all-errors (fboundp 'tabulated-list-mode))]
- ["Quick View" TeX-view
- :help "Start a viewer without prompting"]
+ `("Command on"
+ [ "Master File" TeX-command-select-master
+ :keys "C-c C-c" :style radio
+ :selected (eq TeX-command-current 'TeX-command-master)
+ :help "Commands in this menu work on the Master File"]
+ [ "Buffer" TeX-command-select-buffer
+ :keys "C-c C-b" :style radio
+ :selected (eq TeX-command-current 'TeX-command-buffer)
+ :help "Commands in this menu work on the current buffer"]
+ [ "Region" TeX-command-select-region
+ :keys "C-c C-r" :style radio
+ :selected (eq TeX-command-current 'TeX-command-region)
+ :help "Commands in this menu work on the region"]
+ [ "Fix the Region" TeX-pin-region
+ :active (or (if prefix-arg
+ (<= (prefix-numeric-value prefix-arg) 0)
+ (and (boundp 'TeX-command-region-begin)
+ (markerp TeX-command-region-begin)))
+ mark-active)
+ ;;:visible (eq TeX-command-current 'TeX-command-region)
+ :style toggle
+ :selected (and (boundp 'TeX-command-region-begin)
+ (markerp TeX-command-region-begin))
+ :help "Fix the region for \"Command on Region\""]
+ "-"
+ ["Recenter Output Buffer" TeX-recenter-output-buffer
+ :help "Show the output of current TeX process"]
+ ["Kill Job" TeX-kill-job
+ :help "Kill the current TeX process"]
+ ["Next Error" TeX-next-error
+ :help "Jump to the next error of the last TeX run"]
+ ["Previous Error" TeX-previous-error
+ :help "Jump to the previous error of the last TeX run"
+ :visible TeX-parse-all-errors]
+ ["Error Overview" TeX-error-overview
+ :help "Open an overview of errors occured in the last TeX run"
+ :visible (and TeX-parse-all-errors (fboundp 'tabulated-list-mode))]
+ ["Quick View" TeX-view
+ :help "Start a viewer without prompting"]
+ "-"
+ ("TeXing Options"
+ ,@(mapcar (lambda (x)
+ (let ((symbol (car x)) (name (nth 1 x)))
+ `[ ,(format "Use %s engine" name) (TeX-engine-set ',symbol)
+ :style radio :selected (eq TeX-engine ',symbol)
+ :help ,(format "Use %s engine for compiling" name) ]))
+ (TeX-engine-alist))
"-"
- ("TeXing Options"
- ,@(mapcar (lambda (x)
- (let ((symbol (car x)) (name (nth 1 x)))
- `[ ,(format "Use %s engine" name) (TeX-engine-set ',symbol)
- :style radio :selected (eq TeX-engine ',symbol)
- :help ,(format "Use %s engine for compiling" name) ]))
- (TeX-engine-alist))
- "-"
- [ "Generate PDF" TeX-PDF-mode
- :style toggle :selected TeX-PDF-mode
- :active (not (eq TeX-engine 'omega))
- :help "Use PDFTeX to generate PDF instead of DVI"]
- ( "PDF from DVI"
- :visible TeX-PDF-mode
- :help "Compile to DVI with (La)TeX and convert to PDF"
- [ "Compile directly to PDF"
- (lambda () (interactive) (setq TeX-PDF-from-DVI nil))
- :style radio :selected (null (TeX-PDF-from-DVI))
- :help "Compile directly to PDF without intermediate conversions"]
- [ "dvips + ps2pdf"
- (lambda () (interactive) (setq TeX-PDF-from-DVI "Dvips"))
- :style radio :selected (equal (TeX-PDF-from-DVI) "Dvips")
- :help "Convert DVI to PDF with dvips + ps2pdf sequence"]
- [ "dvipdfmx"
- (lambda () (interactive) (setq TeX-PDF-from-DVI "Dvipdfmx"))
- :style radio :selected (equal (TeX-PDF-from-DVI) "Dvipdfmx")
- :help "Convert DVI to PDF with dvipdfmx"])
- [ "Run Interactively" TeX-interactive-mode
- :style toggle :selected TeX-interactive-mode :keys "C-c C-t C-i"
- :help "Stop on errors in a TeX run"]
- [ "Correlate I/O" TeX-source-correlate-mode
- :style toggle :selected TeX-source-correlate-mode
- :help "Enable forward and inverse search in the previewer"]
- ["Debug Bad Boxes" TeX-toggle-debug-bad-boxes
- :style toggle :selected TeX-debug-bad-boxes :keys "C-c C-t C-b"
- :help "Make \"Next Error\" show overfull and underfull boxes"]
- ["Debug Warnings" TeX-toggle-debug-warnings
- :style toggle :selected TeX-debug-warnings
- :help "Make \"Next Error\" show warnings"])
- ["Compile and view" TeX-command-run-all
- :help "Compile the document until it is ready and open the viewer"]))
+ [ "Generate PDF" TeX-PDF-mode
+ :style toggle :selected TeX-PDF-mode
+ :active (not (eq TeX-engine 'omega))
+ :help "Use PDFTeX to generate PDF instead of DVI"]
+ ( "PDF from DVI"
+ :visible TeX-PDF-mode
+ :help "Compile to DVI with (La)TeX and convert to PDF"
+ [ "Compile directly to PDF"
+ (lambda () (interactive) (setq TeX-PDF-from-DVI nil))
+ :style radio :selected (null (TeX-PDF-from-DVI))
+ :help "Compile directly to PDF without intermediate conversions"]
+ [ "dvips + ps2pdf"
+ (lambda () (interactive) (setq TeX-PDF-from-DVI "Dvips"))
+ :style radio :selected (equal (TeX-PDF-from-DVI) "Dvips")
+ :help "Convert DVI to PDF with dvips + ps2pdf sequence"]
+ [ "dvipdfmx"
+ (lambda () (interactive) (setq TeX-PDF-from-DVI "Dvipdfmx"))
+ :style radio :selected (equal (TeX-PDF-from-DVI) "Dvipdfmx")
+ :help "Convert DVI to PDF with dvipdfmx"])
+ [ "Run Interactively" TeX-interactive-mode
+ :style toggle :selected TeX-interactive-mode :keys "C-c C-t C-i"
+ :help "Stop on errors in a TeX run"]
+ [ "Correlate I/O" TeX-source-correlate-mode
+ :style toggle :selected TeX-source-correlate-mode
+ :help "Enable forward and inverse search in the previewer"]
+ ["Debug Bad Boxes" TeX-toggle-debug-bad-boxes
+ :style toggle :selected TeX-debug-bad-boxes :keys "C-c C-t C-b"
+ :help "Make \"Next Error\" show overfull and underfull boxes"]
+ ["Debug Warnings" TeX-toggle-debug-warnings
+ :style toggle :selected TeX-debug-warnings
+ :help "Make \"Next Error\" show warnings"])
+ ["Compile and view" TeX-command-run-all
+ :help "Compile the document until it is ready and open the viewer"])
(let ((file 'TeX-command-on-current)) ;; is this actually needed?
- (TeX-maybe-remove-help
- (delq nil
- (mapcar 'TeX-command-menu-entry
- (TeX-mode-specific-command-list mode)))))))
+ (delq nil
+ (mapcar #'TeX-command-menu-entry
+ (TeX-mode-specific-command-list mode))))))
(defun TeX-mode-specific-command-list (mode)
"Return the list of commands available in the given MODE."
@@ -5112,88 +5084,86 @@ Brace insertion is only done if point is in a math
construct and
(nreverse out-list)))
(defvar TeX-fold-menu
- (TeX-menu-with-help
- '("Show/Hide"
- ["Fold Mode" TeX-fold-mode
- :style toggle
- :selected (and (boundp 'TeX-fold-mode) TeX-fold-mode)
- :help "Toggle folding mode"]
- "-"
- ["Hide All in Current Buffer" TeX-fold-buffer
- :active (and (boundp 'TeX-fold-mode) TeX-fold-mode)
- :help "Hide all configured TeX constructs in the current buffer"]
- ["Hide All in Current Region" TeX-fold-region
- :active (and (boundp 'TeX-fold-mode) TeX-fold-mode)
- :help "Hide all configured TeX constructs in the marked region"]
- ["Hide All in Current Paragraph" TeX-fold-paragraph
- :active (and (boundp 'TeX-fold-mode) TeX-fold-mode)
- :help "Hide all configured TeX constructs in the paragraph containing
point"]
- ["Hide Current Macro" TeX-fold-macro
- :active (and (boundp 'TeX-fold-mode) TeX-fold-mode)
- :help "Hide the macro containing point"]
- ["Hide Current Environment" TeX-fold-env
- :visible (not (eq major-mode 'plain-tex-mode))
- :active (and (boundp 'TeX-fold-mode) TeX-fold-mode)
- :help "Hide the environment containing point"]
- ["Hide Current Comment" TeX-fold-comment
- :active (and (boundp 'TeX-fold-mode) TeX-fold-mode)
- :help "Hide the comment containing point"]
- "-"
- ["Show All in Current Buffer" TeX-fold-clearout-buffer
- :active (and (boundp 'TeX-fold-mode) TeX-fold-mode)
- :help "Permanently show all folded content again"]
- ["Show All in Current Region" TeX-fold-clearout-region
- :active (and (boundp 'TeX-fold-mode) TeX-fold-mode)
- :help "Permanently show all folded content in marked region"]
- ["Show All in Current Paragraph" TeX-fold-clearout-paragraph
- :active (and (boundp 'TeX-fold-mode) TeX-fold-mode)
- :help "Permanently show all folded content in paragraph containing
point"]
- ["Show Current Item" TeX-fold-clearout-item
- :active (and (boundp 'TeX-fold-mode) TeX-fold-mode)
- :help "Permanently show the item containing point"]
- "-"
- ["Hide or Show Current Item" TeX-fold-dwim
- :active (and (boundp 'TeX-fold-mode) TeX-fold-mode)
- :help "Hide or show the item containing point"]))
- "Menu definition for commands from tex-fold.el.")
+ '("Show/Hide"
+ ["Fold Mode" TeX-fold-mode
+ :style toggle
+ :selected (and (boundp 'TeX-fold-mode) TeX-fold-mode)
+ :help "Toggle folding mode"]
+ "-"
+ ["Hide All in Current Buffer" TeX-fold-buffer
+ :active (and (boundp 'TeX-fold-mode) TeX-fold-mode)
+ :help "Hide all configured TeX constructs in the current buffer"]
+ ["Hide All in Current Region" TeX-fold-region
+ :active (and (boundp 'TeX-fold-mode) TeX-fold-mode)
+ :help "Hide all configured TeX constructs in the marked region"]
+ ["Hide All in Current Paragraph" TeX-fold-paragraph
+ :active (and (boundp 'TeX-fold-mode) TeX-fold-mode)
+ :help "Hide all configured TeX constructs in the paragraph containing
point"]
+ ["Hide Current Macro" TeX-fold-macro
+ :active (and (boundp 'TeX-fold-mode) TeX-fold-mode)
+ :help "Hide the macro containing point"]
+ ["Hide Current Environment" TeX-fold-env
+ :visible (not (eq major-mode 'plain-tex-mode))
+ :active (and (boundp 'TeX-fold-mode) TeX-fold-mode)
+ :help "Hide the environment containing point"]
+ ["Hide Current Comment" TeX-fold-comment
+ :active (and (boundp 'TeX-fold-mode) TeX-fold-mode)
+ :help "Hide the comment containing point"]
+ "-"
+ ["Show All in Current Buffer" TeX-fold-clearout-buffer
+ :active (and (boundp 'TeX-fold-mode) TeX-fold-mode)
+ :help "Permanently show all folded content again"]
+ ["Show All in Current Region" TeX-fold-clearout-region
+ :active (and (boundp 'TeX-fold-mode) TeX-fold-mode)
+ :help "Permanently show all folded content in marked region"]
+ ["Show All in Current Paragraph" TeX-fold-clearout-paragraph
+ :active (and (boundp 'TeX-fold-mode) TeX-fold-mode)
+ :help "Permanently show all folded content in paragraph containing point"]
+ ["Show Current Item" TeX-fold-clearout-item
+ :active (and (boundp 'TeX-fold-mode) TeX-fold-mode)
+ :help "Permanently show the item containing point"]
+ "-"
+ ["Hide or Show Current Item" TeX-fold-dwim
+ :active (and (boundp 'TeX-fold-mode) TeX-fold-mode)
+ :help "Hide or show the item containing point"])
+ "Menu definition for commands from tex-fold.el.")
(defvar TeX-customization-menu nil)
(defvar TeX-common-menu-entries
- (TeX-menu-with-help
- `(("Multifile/Parsing"
- ["Switch to Master File" TeX-home-buffer
- :help "Switch to buffer of Master File, or buffer of last TeX command"]
- ["Save Document" TeX-save-document
- :help "Save all buffers associated with the current Master File"]
- ["Set Master File" TeX-master-file-ask
- :active (not (TeX-local-master-p))
- :help "Set the main file to run TeX commands on"]
- ["Reset Buffer" TeX-normal-mode
- :help "Save and reparse the current buffer for style information"]
- ["Reset AUCTeX" (TeX-normal-mode t) :keys "C-u C-c C-n"
- :help "Reset buffer and reload AUCTeX style files"])
- ["Find Documentation..." TeX-documentation-texdoc
- :help "Get help on commands, packages, or TeX-related topics in general"]
- ["Read the AUCTeX Manual" TeX-goto-info-page
- :help "Everything worth reading"]
- ("Customize AUCTeX"
- ["Browse Options"
- (customize-group 'AUCTeX)
- :help "Open the customization buffer for AUCTeX"]
- ["Extend this Menu"
- (progn
- (easy-menu-add-item
- nil
- ;; Ugly hack because docTeX mode uses the LaTeX menu.
- (list (if (eq major-mode 'doctex-mode) "LaTeX" TeX-base-mode-name))
- (or TeX-customization-menu
- (setq TeX-customization-menu
- (customize-menu-create 'AUCTeX "Customize AUCTeX")))))
- :help "Make this menu a full-blown customization menu"])
- ["Report AUCTeX Bug" TeX-submit-bug-report
- :help ,(format "Problems with AUCTeX %s? Mail us!"
- AUCTeX-version)])))
+ `(("Multifile/Parsing"
+ ["Switch to Master File" TeX-home-buffer
+ :help "Switch to buffer of Master File, or buffer of last TeX command"]
+ ["Save Document" TeX-save-document
+ :help "Save all buffers associated with the current Master File"]
+ ["Set Master File" TeX-master-file-ask
+ :active (not (TeX-local-master-p))
+ :help "Set the main file to run TeX commands on"]
+ ["Reset Buffer" TeX-normal-mode
+ :help "Save and reparse the current buffer for style information"]
+ ["Reset AUCTeX" (TeX-normal-mode t) :keys "C-u C-c C-n"
+ :help "Reset buffer and reload AUCTeX style files"])
+ ["Find Documentation..." TeX-documentation-texdoc
+ :help "Get help on commands, packages, or TeX-related topics in general"]
+ ["Read the AUCTeX Manual" TeX-goto-info-page
+ :help "Everything worth reading"]
+ ("Customize AUCTeX"
+ ["Browse Options"
+ (customize-group 'AUCTeX)
+ :help "Open the customization buffer for AUCTeX"]
+ ["Extend this Menu"
+ (progn
+ (easy-menu-add-item
+ nil
+ ;; Ugly hack because docTeX mode uses the LaTeX menu.
+ (list (if (eq major-mode 'doctex-mode) "LaTeX" TeX-base-mode-name))
+ (or TeX-customization-menu
+ (setq TeX-customization-menu
+ (customize-menu-create 'AUCTeX "Customize AUCTeX")))))
+ :help "Make this menu a full-blown customization menu"])
+ ["Report AUCTeX Bug" TeX-submit-bug-report
+ :help ,(format "Problems with AUCTeX %s? Mail us!"
+ AUCTeX-version)]))
;;; Verbatim constructs
commit 5827aeb3aff59fd5988b4037931c4d7cc441bbd9
Author: Ikumi Keita <address@hidden>
Date: Tue Nov 27 04:14:29 2018 +0900
Remove TeX-mark-active
* tex.el (TeX-mark-active): Remove.
(TeX-mode-specific-command-menu-entries):
* style/dinbrief.el (LaTeX-dinbrief-insert)
(LaTeX-dinbrief-env-recipient):
Use the variable `mark-active' directly instead of the function
`TeX-mark-active'.
diff --git a/style/dinbrief.el b/style/dinbrief.el
index 2ec5611..8c08b66 100644
--- a/style/dinbrief.el
+++ b/style/dinbrief.el
@@ -1,6 +1,6 @@
;;; dinbrief.el --- Special code for LaTeX-Style dinbrief.
-;; Copyright (C) 1994, 2013, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 2013, 2014, 2018 Free Software Foundation, Inc.
;; Author: Werner Fink <address@hidden>
;; Maintainer: address@hidden
@@ -67,7 +67,7 @@
(defmacro LaTeX-dinbrief-insert (&rest args)
"Insert text ignoring active markers."
- `(progn (if (TeX-mark-active) (deactivate-mark))
+ `(progn (if mark-active (deactivate-mark))
(insert ,@args)))
(defun LaTeX-dinbrief-style ()
@@ -123,7 +123,7 @@
(newline-and-indent)
(if (not (zerop (length retouradr)))
(progn
- (if (TeX-mark-active) (deactivate-mark))
+ (if mark-active (deactivate-mark))
(LaTeX-dinbrief-insert TeX-esc "backaddress" TeX-grop retouradr
TeX-grcl)
(newline-and-indent)))))
(LaTeX-dinbrief-insert TeX-esc "enabledraftstandard")
diff --git a/tex.el b/tex.el
index e211c85..bb34660 100644
--- a/tex.el
+++ b/tex.el
@@ -711,12 +711,6 @@ overlays between two existing ones.")
(wrong-number-of-arguments
(read-string prompt initial-input history default-value))))
- (defun TeX-mark-active ()
- ;; In Lucid (mark) returns nil when not active.
- (if zmacs-regions
- (mark)
- (mark t)))
-
(defun TeX-active-mark ()
(and zmacs-regions (mark)))
@@ -829,10 +823,6 @@ Ensures that empty input results in nil across different
emacs versions."
(defun TeX-read-string (prompt &optional initial-input history default-value)
(read-string prompt initial-input history default-value t))
- (defun TeX-mark-active ()
- ;; In FSF 19 mark-active indicates if mark is active.
- mark-active)
-
(defun TeX-active-mark ()
(and transient-mark-mode mark-active))
@@ -5039,7 +5029,7 @@ Brace insertion is only done if point is in a math
construct and
(<= (prefix-numeric-value prefix-arg) 0)
(and (boundp 'TeX-command-region-begin)
(markerp TeX-command-region-begin)))
- (TeX-mark-active))
+ mark-active)
;;:visible (eq TeX-command-current 'TeX-command-region)
:style toggle
:selected (and (boundp 'TeX-command-region-begin)
commit 9ae66cd34509ef9ce47f9249d887a5b6935b7203
Author: Ikumi Keita <address@hidden>
Date: Tue Nov 27 04:09:28 2018 +0900
Remove TeX-replace-regexp-in-string
* tex.el (TeX-replace-regexp-in-string): Remove.
* latex.el:
* style/empheq.el:
* style/floatrow.el:
* style/tcolorbox.el:
* style/xcolor.el:
Use `replace-regexp-in-string' instead of
`TeX-replace-regexp-in-string'.
diff --git a/latex.el b/latex.el
index cbd3e89..96fcf04 100644
--- a/latex.el
+++ b/latex.el
@@ -1624,7 +1624,7 @@ This is necessary since index entries may contain
commands and stuff.")
Split the string at commas and remove Biber file extensions."
(let ((bibs (TeX-split-string " *, *" (TeX-match-buffer match))))
(dolist (bib bibs)
- (LaTeX-add-bibliographies (TeX-replace-regexp-in-string
+ (LaTeX-add-bibliographies (replace-regexp-in-string
(concat "\\(?:\\."
(mapconcat #'identity
TeX-Biber-file-extensions
diff --git a/style/empheq.el b/style/empheq.el
index 5680132..4814934 100644
--- a/style/empheq.el
+++ b/style/empheq.el
@@ -232,7 +232,7 @@ number of ampersands if possible."
(when (looking-at "[ \t\n\r%]*\\[")
(forward-sexp))
(re-search-forward "[ \t\n\r%]*{\\([^}]+\\)}")
- (setq match (TeX-replace-regexp-in-string "[ \t\n\r%]" ""
+ (setq match (replace-regexp-in-string "[ \t\n\r%]" ""
(match-string-no-properties 1)))
(if (string-match "=" match)
(progn
diff --git a/style/floatrow.el b/style/floatrow.el
index 4adc052..4b917b2 100644
--- a/style/floatrow.el
+++ b/style/floatrow.el
@@ -1,6 +1,6 @@
;;; floatrow.el --- AUCTeX style for `floatrow.sty' (v0.3b)
-;; Copyright (C) 2017 Free Software Foundation, Inc.
+;; Copyright (C) 2017, 2018 Free Software Foundation, Inc.
;; Author: Arash Esbati <address@hidden>
;; Maintainer: address@hidden
@@ -434,7 +434,7 @@ entries are available under \"rawfigure*?\" and
\"rawtable*?\"."
"Create raw floating ENV with floatrow.sty.
Also insert the macro \"\\RawFloats\" when finished with user
queries."
- (let ((environment (TeX-replace-regexp-in-string "raw" "" env)))
+ (let ((environment (replace-regexp-in-string "raw" "" env)))
(LaTeX-env-figure environment)
(save-excursion
;; `LaTeX-find-matching-begin' will not work for us as we don't
diff --git a/style/tcolorbox.el b/style/tcolorbox.el
index b8e6512..2859276 100644
--- a/style/tcolorbox.el
+++ b/style/tcolorbox.el
@@ -1,6 +1,6 @@
;;; tcolorbox.el --- AUCTeX style for `tcolorbox.sty' (v4.00)
-;; Copyright (C) 2015, 2016 Free Software Foundation, Inc.
+;; Copyright (C) 2015, 2016, 2018 Free Software Foundation, Inc.
;; Author: Tassilo Horn <address@hidden>
;; Maintainer: address@hidden
@@ -454,7 +454,7 @@ e.g. \"tcolorboxlib-raster.el\"."
(when (LaTeX-tcolorbox-tcbuselibrary-list)
(let (libs)
(dolist (x (LaTeX-tcolorbox-tcbuselibrary-list))
- (push (TeX-replace-regexp-in-string "[ %\n\r\t]" "" (car x)) libs))
+ (push (replace-regexp-in-string "[ %\n\r\t]" "" (car x)) libs))
(setq libs (mapconcat #'identity libs ","))
(dolist (x (split-string libs "," t))
(TeX-run-style-hooks (concat "tcolorboxlib-" x)))))
diff --git a/style/xcolor.el b/style/xcolor.el
index 771bcff..174493f 100644
--- a/style/xcolor.el
+++ b/style/xcolor.el
@@ -1,6 +1,6 @@
;; xcolor.el --- AUCTeX style for `xcolor.sty' (v2.12)
-;; Copyright (C) 2016--2017 Free Software Foundation, Inc.
+;; Copyright (C) 2016--2018 Free Software Foundation, Inc.
;; Author: Arash Esbati <address@hidden>
;; Maintainer: address@hidden
@@ -264,7 +264,7 @@ xcolor package.")
(let ((head (car colset))
(tail (cadr colset))
(cols (split-string
- (TeX-replace-regexp-in-string "[ %\n\r\t]" "" (nth 2 colset))
+ (replace-regexp-in-string "[ %\n\r\t]" "" (nth 2 colset))
"\\(,[^;]+;\\|,[^;]+$\\)" t)))
(dolist (color cols)
(LaTeX-add-xcolor-definecolors (concat head color tail))))))
diff --git a/tex.el b/tex.el
index 044dd22..e211c85 100644
--- a/tex.el
+++ b/tex.el
@@ -764,11 +764,7 @@ overlays."
(/ outer-priority 2))
((and inner-priority outer-priority)
(+ (/ (- outer-priority inner-priority) 2) inner-priority))
- (t TeX-overlay-priority-step))))
-
- (defun TeX-replace-regexp-in-string (regexp rep string)
- "Compatibility function mimicking `replace-regexp-in-string' for XEmacs."
- (replace-in-string string regexp rep)) )
+ (t TeX-overlay-priority-step)))))
;; require crm here, because we often do
;;
@@ -877,9 +873,7 @@ overlays."
(/ outer-priority 2))
((and inner-priority outer-priority)
(+ (/ (- outer-priority inner-priority) 2) inner-priority))
- (t TeX-overlay-priority-step))))
-
- (defalias #'TeX-replace-regexp-in-string #'replace-regexp-in-string) )
+ (t TeX-overlay-priority-step)))))
(defun TeX-delete-dups-by-car (alist &optional keep-list)
"Return a list of all elements in ALIST, but each car only once.
-----------------------------------------------------------------------
Summary of changes:
context.el | 105 ++++++-----
latex.el | 143 ++++++++-------
plain-tex.el | 67 ++++---
style/dinbrief.el | 6 +-
style/empheq.el | 2 +-
style/floatrow.el | 4 +-
style/tcolorbox.el | 4 +-
style/xcolor.el | 4 +-
tex-buf.el | 51 +++---
tex-info.el | 103 ++++++-----
tex.el | 499 ++++++++++++++++++++---------------------------------
11 files changed, 430 insertions(+), 558 deletions(-)
hooks/post-receive
--
GNU AUCTeX
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [AUCTeX-diffs] GNU AUCTeX branch, master, updated. 3ce90dbc3176f434e140cb23552b5f04e50a5693,
Ikumi Keita <=