X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/b201b9880e01120b7e64f82c98464c5bea630b0d..73b0cd50031a714347109169ceb8bacae338612a:/lisp/progmodes/meta-mode.el diff --git a/lisp/progmodes/meta-mode.el b/lisp/progmodes/meta-mode.el index c70f5cdb6a..b36104bf49 100644 --- a/lisp/progmodes/meta-mode.el +++ b/lisp/progmodes/meta-mode.el @@ -1,7 +1,6 @@ ;;; meta-mode.el --- major mode for editing Metafont or MetaPost sources -;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007 -;; Free Software Foundation, Inc. +;; Copyright (C) 1997, 2001-2011 Free Software Foundation, Inc. ;; Author: Ulrik Vieth ;; Version: 1.0 @@ -9,10 +8,10 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is free software; you can redistribute it and/or modify +;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 3, or (at your option) -;; any later version. +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,9 +19,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -;; Boston, MA 02110-1301, USA. +;; along with GNU Emacs. If not, see . ;;; Commentary: @@ -476,6 +473,7 @@ If the list was changed, sort the list and remove duplicates first." (defun meta-complete-symbol () "Perform completion on Metafont or MetaPost symbol preceding point." + ;; FIXME: Use completion-at-point-functions. (interactive "*") (let ((list meta-complete-list) entry) @@ -489,29 +487,12 @@ If the list was changed, sort the list and remove duplicates first." (close (nth 3 entry)) (begin (match-beginning sub)) (end (match-end sub)) - (pattern (meta-match-buffer 0)) - (symbol (buffer-substring begin end)) - (list (funcall (nth 2 entry))) - (completion (try-completion symbol list))) - (cond ((eq completion t) - (and close - (not (looking-at (regexp-quote close))) - (insert close))) - ((null completion) - (error "Can't find completion for \"%s\"" pattern)) - ((not (string-equal symbol completion)) - (delete-region begin end) - (insert completion) - (and close - (eq (try-completion completion list) t) - (not (looking-at (regexp-quote close))) - (insert close))) - (t - (message "Making completion list...") - (let ((list (all-completions symbol list nil))) - (with-output-to-temp-buffer "*Completions*" - (display-completion-list list symbol))) - (message "Making completion list... done")))) + (list (funcall (nth 2 entry)))) + (completion-in-region + begin end + (if (zerop (length close)) list + (apply-partially 'completion-table-with-terminator + close list)))) (funcall (nth 1 entry))))) @@ -536,24 +517,24 @@ If the list was changed, sort the list and remove duplicates first." ;;; Indentation. (defcustom meta-indent-level 2 - "*Indentation of begin-end blocks in Metafont or MetaPost mode." + "Indentation of begin-end blocks in Metafont or MetaPost mode." :type 'integer :group 'meta-font) (defcustom meta-left-comment-regexp "%%+" - "*Regexp matching comments that should be placed on the left margin." + "Regexp matching comments that should be placed on the left margin." :type 'regexp :group 'meta-font) (defcustom meta-right-comment-regexp nil - "*Regexp matching comments that should be placed to the right margin." + "Regexp matching comments that should be placed to the right margin." :type '(choice regexp (const :tag "None" nil)) :group 'meta-font) (defcustom meta-ignore-comment-regexp "%[^%]" - "*Regexp matching comments that whose indentation should not be touched." + "Regexp matching comments that whose indentation should not be touched." :type 'regexp :group 'meta-font) @@ -562,21 +543,21 @@ If the list was changed, sort the list and remove duplicates first." (concat "\\(begin\\(char\\|fig\\|gr\\(aph\\|oup\\)\\|logochar\\)\\|" "def\\|for\\(\\|ever\\|suffixes\\)\\|if\\|mode_def\\|" "primarydef\\|secondarydef\\|tertiarydef\\|vardef\\)") - "*Regexp matching the beginning of environments to be indented." + "Regexp matching the beginning of environments to be indented." :type 'regexp :group 'meta-font) (defcustom meta-end-environment-regexp (concat "\\(end\\(char\\|def\\|f\\(ig\\|or\\)\\|gr\\(aph\\|oup\\)\\)" "\\|fi\\)") - "*Regexp matching the end of environments to be indented." + "Regexp matching the end of environments to be indented." :type 'regexp :group 'meta-font) (defcustom meta-within-environment-regexp ; (concat "\\(e\\(lse\\(\\|if\\)\\|xit\\(if\\|unless\\)\\)\\)") (concat "\\(else\\(\\|if\\)\\)") - "*Regexp matching keywords within environments not to be indented." + "Regexp matching keywords within environments not to be indented." :type 'regexp :group 'meta-font) @@ -594,12 +575,11 @@ If the list was changed, sort the list and remove duplicates first." "Indent the line containing point as Metafont or MetaPost source." (interactive) (let ((indent (meta-indent-calculate))) - (save-excursion - (if (/= (current-indentation) indent) - (let ((beg (progn (beginning-of-line) (point))) - (end (progn (back-to-indentation) (point)))) - (delete-region beg end) - (indent-to indent)))) + (if (/= (current-indentation) indent) + (save-excursion + (delete-region (line-beginning-position) + (progn (back-to-indentation) (point))) + (indent-to indent))) (if (< (current-column) indent) (back-to-indentation)))) @@ -763,13 +743,13 @@ If the list was changed, sort the list and remove duplicates first." (defcustom meta-begin-defun-regexp (concat "\\(begin\\(char\\|fig\\|logochar\\)\\|def\\|mode_def\\|" "primarydef\\|secondarydef\\|tertiarydef\\|vardef\\)") - "*Regexp matching beginning of defuns in Metafont or MetaPost mode." + "Regexp matching beginning of defuns in Metafont or MetaPost mode." :type 'regexp :group 'meta-font) (defcustom meta-end-defun-regexp (concat "\\(end\\(char\\|def\\|fig\\)\\)") - "*Regexp matching the end of defuns in Metafont or MetaPost mode." + "Regexp matching the end of defuns in Metafont or MetaPost mode." :type 'regexp :group 'meta-font) @@ -864,11 +844,10 @@ The environment marked is the one that contains point or follows point." ;;; Syntax table, keymap and menu. -(defvar meta-mode-abbrev-table nil +(define-abbrev-table 'meta-mode-abbrev-table () "Abbrev table used in Metafont or MetaPost mode.") -(define-abbrev-table 'meta-mode-abbrev-table ()) -(defvar meta-mode-syntax-table +(defvar meta-common-mode-syntax-table (let ((st (make-syntax-table))) ;; underscores are word constituents (modify-syntax-entry ?_ "w" st) @@ -905,9 +884,8 @@ The environment marked is the one that contains point or follows point." st) "Syntax table used in Metafont or MetaPost mode.") -(defvar meta-mode-map +(defvar meta-common-mode-map (let ((map (make-sparse-keymap))) - (define-key map "\C-m" 'reindent-then-newline-and-indent) ;; Comment Paragraphs: ;; (define-key map "\M-a" 'backward-sentence) ;; (define-key map "\M-e" 'forward-sentence) @@ -935,10 +913,10 @@ The environment marked is the one that contains point or follows point." ;; (define-key map "\C-c\C-l" 'meta-recenter-output) map) "Keymap used in Metafont or MetaPost mode.") - +(define-obsolete-variable-alias 'meta-mode-map 'meta-common-mode-map "24.1") (easy-menu-define - meta-mode-menu meta-mode-map + meta-mode-menu meta-common-mode-map "Menu used in Metafont or MetaPost mode." (list "Meta" ["Forward Environment" meta-beginning-of-defun t] @@ -974,21 +952,21 @@ The environment marked is the one that contains point or follows point." ;;; Hook variables. (defcustom meta-mode-load-hook nil - "*Hook evaluated when first loading Metafont or MetaPost mode." + "Hook evaluated when first loading Metafont or MetaPost mode." :type 'hook :group 'meta-font) (defcustom meta-common-mode-hook nil - "*Hook evaluated by both `metafont-mode' and `metapost-mode'." + "Hook evaluated by both `metafont-mode' and `metapost-mode'." :type 'hook :group 'meta-font) (defcustom metafont-mode-hook nil - "*Hook evaluated by `metafont-mode' after `meta-common-mode-hook'." + "Hook evaluated by `metafont-mode' after `meta-common-mode-hook'." :type 'hook :group 'meta-font) (defcustom metapost-mode-hook nil - "*Hook evaluated by `metapost-mode' after `meta-common-mode-hook'." + "Hook evaluated by `metapost-mode' after `meta-common-mode-hook'." :type 'hook :group 'meta-font) @@ -996,106 +974,62 @@ The environment marked is the one that contains point or follows point." ;;; Initialization. -(defun meta-common-initialization () +(define-derived-mode meta-common-mode prog-mode "-Meta-common-" "Common initialization for Metafont or MetaPost mode." - (kill-all-local-variables) - - (make-local-variable 'paragraph-start) - (make-local-variable 'paragraph-separate) - (setq paragraph-start - (concat page-delimiter "\\|$")) - (setq paragraph-separate - (concat page-delimiter "\\|$")) - - (make-local-variable 'paragraph-ignore-fill-prefix) - (setq paragraph-ignore-fill-prefix t) - - (make-local-variable 'comment-start-skip) - (make-local-variable 'comment-start) - (make-local-variable 'comment-end) - (make-local-variable 'comment-multi-line) - (setq comment-start-skip "%+[ \t\f]*") - (setq comment-start "%") - (setq comment-end "") - (setq comment-multi-line nil) + :abbrev-table meta-mode-abbrev-table + (set (make-local-variable 'paragraph-start) + (concat page-delimiter "\\|$")) + (set (make-local-variable 'paragraph-separate) + (concat page-delimiter "\\|$")) + + (set (make-local-variable 'paragraph-ignore-fill-prefix) t) + + (set (make-local-variable 'comment-start-skip) "%+[ \t\f]*") + (set (make-local-variable 'comment-start) "%") + (set (make-local-variable 'comment-end) "") + (set (make-local-variable 'comment-multi-line) nil) ;; We use `back-to-indentation' but \f is no indentation sign. (modify-syntax-entry ?\f "_ ") - (make-local-variable 'parse-sexp-ignore-comments) - (setq parse-sexp-ignore-comments t) + (set (make-local-variable 'parse-sexp-ignore-comments) t) - (make-local-variable 'comment-indent-function) - (setq comment-indent-function 'meta-comment-indent) - (make-local-variable 'indent-line-function) - (setq indent-line-function 'meta-indent-line) + (set (make-local-variable 'comment-indent-function) #'meta-comment-indent) + (set (make-local-variable 'indent-line-function) #'meta-indent-line) ;; No need to define a mode-specific 'indent-region-function. ;; Simply use the generic 'indent-region and 'comment-region. ;; Set defaults for font-lock mode. - (make-local-variable 'font-lock-defaults) - (setq font-lock-defaults - '(meta-font-lock-keywords - nil nil ((?_ . "w")) nil - (font-lock-comment-start-regexp . "%"))) + (set (make-local-variable 'font-lock-defaults) + '(meta-font-lock-keywords + nil nil ((?_ . "w")) nil + (font-lock-comment-start-regexp . "%"))) ;; Activate syntax table, keymap and menu. - (setq local-abbrev-table meta-mode-abbrev-table) - (set-syntax-table meta-mode-syntax-table) - (use-local-map meta-mode-map) - (easy-menu-add meta-mode-menu) - ) + (easy-menu-add meta-mode-menu)) ;;;###autoload -(defun metafont-mode () - "Major mode for editing Metafont sources. -Special commands: -\\{meta-mode-map} - -Turning on Metafont mode calls the value of the variables -`meta-common-mode-hook' and `metafont-mode-hook'." - (interactive) - (meta-common-initialization) - (setq mode-name "Metafont") - (setq major-mode 'metafont-mode) - +(define-derived-mode metafont-mode meta-common-mode "Metafont" + "Major mode for editing Metafont sources." ;; Set defaults for completion function. - (make-local-variable 'meta-symbol-list) - (make-local-variable 'meta-symbol-changed) - (make-local-variable 'meta-complete-list) - (setq meta-symbol-list nil) - (setq meta-symbol-changed nil) + (set (make-local-variable 'meta-symbol-list) nil) + (set (make-local-variable 'meta-symbol-changed) nil) (apply 'meta-add-symbols metafont-symbol-list) - (setq meta-complete-list + (set (make-local-variable 'meta-complete-list) (list (list "\\<\\(\\sw+\\)" 1 'meta-symbol-list) - (list "" 'ispell-complete-word))) - (run-mode-hooks 'meta-common-mode-hook 'metafont-mode-hook)) + (list "" 'ispell-complete-word)))) ;;;###autoload -(defun metapost-mode () - "Major mode for editing MetaPost sources. -Special commands: -\\{meta-mode-map} - -Turning on MetaPost mode calls the value of the variable -`meta-common-mode-hook' and `metafont-mode-hook'." - (interactive) - (meta-common-initialization) - (setq mode-name "MetaPost") - (setq major-mode 'metapost-mode) - +(define-derived-mode metapost-mode meta-common-mode "MetaPost" + "Major mode for editing MetaPost sources." ;; Set defaults for completion function. - (make-local-variable 'meta-symbol-list) - (make-local-variable 'meta-symbol-changed) - (make-local-variable 'meta-complete-list) - (setq meta-symbol-list nil) - (setq meta-symbol-changed nil) + (set (make-local-variable 'meta-symbol-list) nil) + (set (make-local-variable 'meta-symbol-changed) nil) (apply 'meta-add-symbols metapost-symbol-list) - (setq meta-complete-list + (set (make-local-variable 'meta-complete-list) (list (list "\\<\\(\\sw+\\)" 1 'meta-symbol-list) - (list "" 'ispell-complete-word))) - (run-mode-hooks 'meta-common-mode-hook 'metapost-mode-hook)) + (list "" 'ispell-complete-word)))) ;;; Just in case ... @@ -1103,5 +1037,4 @@ Turning on MetaPost mode calls the value of the variable (provide 'meta-mode) (run-hooks 'meta-mode-load-hook) -;; arch-tag: ec2916b2-3a83-4cf7-962d-d8019370c006 ;;; meta-mode.el ends here