diff --git a/ChangeLog b/ChangeLog index 4538d0f..4da30d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,24 +1,3 @@ -2014-08-13 Vincent Belaïche - - * tex-info.el (TeX-texinfo-mode): Code optimization: use - '(set (make-local-variable (quote foo)) some-value)' instead of - '(make-local-variable (quote foo)) (setq foo some-value)' wherever - possible. Add in style Texinfo standard macros '@acronym' and '@tie'. - - * tex.el (TeX-unload-style): Code optimization: use 'assoc-string' - instead of 'assoc' to search style in 'TeX-style-hook-list', and - use delq on returned value of assoc-string for removing the style - --- on the one hand delq will go through the whole list rather - than stop after the first match like in original code, but on the - other hand comparison are faster because eq instead of equal is - used and we are working on assoc cell rather than on key, so less - indirection, furthermore delq is C code. Anyway that make the code - much smaller and easier to understand. - (TeX-file-extensions): Add txi amongst extension of - texinfo files, for consistency with info node '(texinfo) Minimum' - (TeX-run-style-hooks): Code optimization: use 'assoc-string' - instead of 'assoc' to search style in 'TeX-style-hook-list'. - 2014-01-06 Vincent Belaïche * tex-info.el (Texinfo-reftex-hook): Replace use of diff --git a/tex-info.el b/tex-info.el index 849e94f..a42884d 100644 --- a/tex-info.el +++ b/tex-info.el @@ -544,28 +544,38 @@ value of `Texinfo-mode-hook'." (setq major-mode 'texinfo-mode) (use-local-map Texinfo-mode-map) (set-syntax-table texinfo-mode-syntax-table) - - (set (make-local-variable 'page-delimiter) - (concat - "^@node [ \t]*[Tt]op\\|^@\\(" - texinfo-chapter-level-regexp - "\\)")) - (set (make-local-variable 'require-final-newline) t) - (set (make-local-variable 'indent-tabs-mode) nil) - (set (make-local-variable 'paragraph-separate) - (concat "\b\\|^@[a-zA-Z]*[ \n]\\|" paragraph-separate)) - (set (make-local-variable 'paragraph-start) - (concat "\b\\|^@[a-zA-Z]*[ \n]\\|" paragraph-start)) - (set (make-local-variable 'fill-column) 72) - (set (make-local-variable 'comment-start) "@c ") - (set (make-local-variable 'comment-start-skip) "@c +\\|@comment +") + (make-local-variable 'page-delimiter) + (setq page-delimiter + (concat + "^@node [ \t]*[Tt]op\\|^@\\(" + texinfo-chapter-level-regexp + "\\)")) + (make-local-variable 'require-final-newline) + (setq require-final-newline t) + (make-local-variable 'indent-tabs-mode) + (setq indent-tabs-mode nil) + (make-local-variable 'paragraph-separate) + (setq paragraph-separate + (concat "\b\\|^@[a-zA-Z]*[ \n]\\|" paragraph-separate)) + (make-local-variable 'paragraph-start) + (setq paragraph-start + (concat "\b\\|^@[a-zA-Z]*[ \n]\\|" paragraph-start)) + (make-local-variable 'fill-column) + (setq fill-column 72) + (make-local-variable 'comment-start) + (setq comment-start "@c ") + (make-local-variable 'comment-start-skip) + (setq comment-start-skip "@c +\\|@comment +") (set (make-local-variable 'comment-use-syntax) nil) - (set (make-local-variable 'words-include-escapes) t) - (if (boundp 'texinfo-imenu-generic-expression) + (make-local-variable 'words-include-escapes) + (setq words-include-escapes t) + (if (not (boundp 'texinfo-imenu-generic-expression)) ;; This was introduced in 19.30. - (set (make-local-variable 'imenu-generic-expression) texinfo-imenu-generic-expression)) - - (set (make-local-variable 'font-lock-defaults) + () + (make-local-variable 'imenu-generic-expression) + (setq imenu-generic-expression texinfo-imenu-generic-expression)) + (make-local-variable 'font-lock-defaults) + (setq font-lock-defaults ;; COMPATIBILITY for Emacs 20 (if (boundp 'texinfo-font-lock-syntactic-keywords) '(texinfo-font-lock-keywords @@ -576,41 +586,48 @@ value of `Texinfo-mode-hook'." (if (not (boundp 'texinfo-section-list)) ;; This was included in 19.31. () - (set (make-local-variable 'outline-regexp) - (concat "@\\(" - (mapconcat 'car texinfo-section-list "\\>\\|") - "\\>\\)")) - (set (make-local-variable 'outline-level) 'texinfo-outline-level)) + (make-local-variable 'outline-regexp) + (setq outline-regexp + (concat "@\\(" + (mapconcat 'car texinfo-section-list "\\>\\|") + "\\>\\)")) + (make-local-variable 'outline-level) + (setq outline-level 'texinfo-outline-level)) ;; Mostly AUCTeX stuff (easy-menu-add Texinfo-mode-menu Texinfo-mode-map) (easy-menu-add Texinfo-command-menu Texinfo-mode-map) - (set (make-local-variable 'TeX-command-current) 'TeX-command-master) + (make-local-variable 'TeX-command-current) + (setq TeX-command-current 'TeX-command-master) (setq TeX-default-extension "texi") + (make-local-variable 'TeX-esc) + (setq TeX-esc "@") - (set (make-local-variable 'TeX-esc) "@") - - (set (make-local-variable 'TeX-auto-regexp-list) 'TeX-auto-empty-regexp-list) - (set (make-local-variable 'TeX-auto-update) t) + (make-local-variable 'TeX-auto-regexp-list) + (setq TeX-auto-regexp-list 'TeX-auto-empty-regexp-list) + (make-local-variable 'TeX-auto-update) + (setq TeX-auto-update t) (setq TeX-command-default "TeX") (setq TeX-header-end "%*end") (setq TeX-trailer-start (regexp-quote (concat TeX-esc "bye"))) - - (set (make-local-variable 'TeX-complete-list) + + (make-local-variable 'TeX-complete-list) + (setq TeX-complete-list (list (list "@\\([a-zA-Z]*\\)" 1 'TeX-symbol-list-filtered nil) (list "" TeX-complete-word))) - (set (make-local-variable 'TeX-font-list) Texinfo-font-list) - (set (make-local-variable 'TeX-font-replace-function) 'TeX-font-replace-macro) + (make-local-variable 'TeX-font-list) + (setq TeX-font-list Texinfo-font-list) + (make-local-variable 'TeX-font-replace-function) + (setq TeX-font-replace-function 'TeX-font-replace-macro) (add-hook 'find-file-hooks (lambda () (unless (file-exists-p (buffer-file-name)) (TeX-master-file nil nil t))) nil t) (TeX-add-symbols - '("acronym" "Acronym") '("appendix" (TeX-arg-literal " ") (TeX-arg-free "Title")) '("appendixsec" (TeX-arg-literal " ") (TeX-arg-free "Title")) '("appendixsection" (TeX-arg-literal " ") (TeX-arg-free "Title")) @@ -718,7 +735,6 @@ value of `Texinfo-mode-hook'." '("thischaptername") '("thisfile") '("thispage") - '("tie") '("tindex" (TeX-arg-literal " ") (TeX-arg-free "Entry")) '("title" (TeX-arg-literal " ") (TeX-arg-free "Title")) '("titlefont" "Text") diff --git a/tex.el b/tex.el index 068859f..07c452e 100644 --- a/tex.el +++ b/tex.el @@ -2389,9 +2389,14 @@ active.") (defun TeX-unload-style (style) "Forget that we once loaded STYLE." - (let ((style-data (assoc-string style TeX-style-hook-list))) - (if style-data - (setq TeX-style-hook-list (delq style-data TeX-style-hook-list))))) + (cond ((null (assoc style TeX-style-hook-list))) + ((equal (car (car TeX-style-hook-list)) style) + (setq TeX-style-hook-list (cdr TeX-style-hook-list))) + (t + (let ((entry TeX-style-hook-list)) + (while (not (equal (car (car (cdr entry))) style)) + (setq entry (cdr entry))) + (setcdr entry (cdr (cdr entry))))))) (defcustom TeX-virgin-style (if (and TeX-auto-global (file-directory-p TeX-auto-global)) @@ -2425,7 +2430,7 @@ active.") (match-beginning 2) (match-end 2)))) (condition-case err (mapcar 'funcall - (cdr-safe (assoc-string style TeX-style-hook-list))) + (cdr-safe (assoc style TeX-style-hook-list))) ;; This happens in case some style added a new parser, and ;; now the style isn't used anymore (user deleted ;; \usepackage{style}). Then we're left over with, e.g., @@ -3711,7 +3716,7 @@ Check for potential LaTeX environments." "File extensions recognized by AUCTeX." :group 'TeX-file) -(defcustom TeX-file-extensions '("tex" "sty" "cls" "ltx" "texi" "txi" "texinfo" "dtx") +(defcustom TeX-file-extensions '("tex" "sty" "cls" "ltx" "texi" "texinfo" "dtx") "*File extensions used by manually generated TeX files." :group 'TeX-file-extension :type '(repeat (string :format "%v")))