From 7b1a284cc1d4e2376d15d68f286ab96356f15470 Mon Sep 17 00:00:00 2001 From: Jose Antonio Ortega Ruiz Date: Sat, 8 Oct 2005 13:05:46 +0000 Subject: (Module): sync with Emacs CVS (Pieter). --- ChangeLog | 4 ++++ misc/mixal-mode.el | 21 ++++++++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2c075b9..893c4ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-10-08 Jose Antonio Ortega Ruiz + + * misc/mixal-mode.el (Module): sync with Emacs CVS (Pieter). + 2005-09-29 Jose Antonio Ortega Ruiz * mixlib/mix.c: copyright year in console message updated. diff --git a/misc/mixal-mode.el b/misc/mixal-mode.el index 638947a..180cf83 100644 --- a/misc/mixal-mode.el +++ b/misc/mixal-mode.el @@ -1,6 +1,6 @@ ;;; mixal-mode.el --- Major mode for the mix asm language. -;; Copyright (C) 2003, 2005 Free Software Foundation +;; Copyright (C) 2003, 2004, 2005 Free Software Foundation ;; This program is free software; you can redistribute it and/or ;; modify it under the terms of the GNU General Public License as @@ -17,8 +17,8 @@ ;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ;; MA 02110-1301 USA -;; Author: Pieter E.J. Pareit -;; Maintainer: Pieter E.J. Pareit +;; Author: Pieter E.J. Pareit +;; Maintainer: Pieter E.J. Pareit ;; Created: 09 Nov 2002 ;; Version: 0.1 ;; Keywords: Knuth mix mixal asm mixvm "The Art Of Computer Programming" @@ -45,6 +45,11 @@ ;; Have fun. ;;; History: +;; Version 0.3: +;; 08/10/05: sync mdk and emacs cvs +;; from emacs: compile-command and require-final-newline +;; from mdk: see version 0.2 +;; correct my email address ;; Version 0.2: ;; 06/04/05: mixasm no longer needs -g option ;; fontlocking of comments works in all? cases now @@ -58,6 +63,7 @@ ;; 09/11/02: started mixal-mode. ;;; Code: +(defvar compile-command) ;;; Key map (defvar mixal-mode-map @@ -146,11 +152,11 @@ value.") (defvar mixal-operation-codes-alist '() "Alist that contains all the possible operation codes for mix. Each elt has the form (OP-CODE GROUP FULL-NAME C-BYTE F-BYTE DESCRIPTION EXECUTION-TIME) -Where OP-CODE is the text of the opcode as an symbol, FULL NAME is the human readable name +Where OP-CODE is the text of the opcode as an symbol, FULL-NAME is the human readable name as a string, C-BYTE is the operation code telling what operation is to be performed, F-BYTE holds an modification of the operation code which can be a symbol or a number, DESCRIPTION contains an string with a description about the operation code and EXECUTION-TIME holds info -about the time it takes, number or string") +about the time it takes, number or string.") ; (makunbound 'mixal-operation-codes-alist) (defun mixal-add-operation-code (op-code group full-name C-byte F-byte description execution-time) @@ -1311,8 +1317,9 @@ The converted character representation is stored in rAX." (set (make-local-variable 'compile-command) (concat "mixasm " buffer-file-name)) ;; mixasm will do strange when there is no final newline, - ;; let emacs ensure that it is always there - (set (make-local-variable 'require-final-newline) t)) + ;; so let Emacs ensure that it is always there + (set (make-local-variable 'require-final-newline) + mode-require-final-newline)) ;;;###autoload (add-to-list 'auto-mode-alist '("\\.mixal\\'" . mixal-mode)) -- cgit v1.2.3