Merged from miles@gnu.org--gnu-2005 (patch 593-595)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-593
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-594
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-595
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-425

lisp/ChangeLog

-2005-10-11  Sven Joachim  <svenjoac@gmx.de>
+2005-10-13  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* toolbar/diropen.xpm, toolbar/diropen.pbm: New versions made from
+	Gnome file-manager.png.  Suggested by
+	Joachim Nilsson <joachim.nilsson@vmlinux.org>.
+
+	* toolbar/README: Add diropen.xpm.
+
+2005-10-13  Bill Wohler  <wohler@newt.com>
+
+	* makefile.w32-in (MH_E_SRC): Rename from MH-E-SRC per NMAKE
+	restrictions.  Suggested by David Robinow <drobinow@gmail.com>.
+
+2005-10-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* progmodes/mixal-mode.el (mixal-operation-codes-alist):
+	Don't waste the byte-compiler's time on constant data.
+
+2005-10-13  Kenichi Handa  <handa@m17n.org>
+
+	* international/utf-8.el (utf-8-compose): Display an invalid UTF-8
+	byte with `escape-glyph' face.
+
+	* international/fontset.el (ccl-encode-unicode-font):
+	Lookup utf-subst-table-for-encode, not ucs-mule-cjk-to-unicode.
+	Handle the case that ucs-mule-to-mule-unicode translates a character to
+	ASCII (usually for IPA characters).
+
+2005-10-12  Bill Wohler  <wohler@newt.com>
+
+	* makefile.w32-in (MH-E-SRC): New. Used by mh-autoloads.
+	(mh-autoloads): New. Builds mh-e/mh-loaddefs.el. Rebuilds if any
+	files in MH-E-SRC have been updated.
+	(updates, compile, recompile, bootstrap): Depend on mh-autoloads.
+
+2005-10-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* progmodes/mixal-mode.el (mixal-operation-codes): Remove.
+	(mixal-mode-syntax-table): Add \n as end-comment.
+	(mixal-operation-codes-alist): Immediately initialize to full value.
+	(mixal-add-operation-code): Remove.
+	(mixal-describe-operation-code): Make the arg non-optional.
+	Use the interactive spec instead.
+	Use mixal-operation-codes-alist rather than mixal-operation-codes.
+	(mixal-font-lock-keywords): Don't highlight comments here any more.
+	(mixal-font-lock-syntactic-keywords): New var.
+	(mixal-mode): Use it.  Fix comment-start-skip.
+
+2005-10-12  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* startup.el (command-line-x-option-alist): -nb => -nbi
+
+2005-10-12  Kim F. Storm  <storm@cua.dk>
+
+	* startup.el (fancy-splash-default-action): Discard mouse click in
+	the spash screen window, as it has no sensible meaning in the
+	next window to be selected.  Fixes error reported by Jan D.
+
+2005-10-12  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* desktop.el (desktop-load-file): Do nothing when FUNCTION is nil.
+
+2005-10-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* progmodes/mixal-mode.el: Sync with version in the GNU MDK project.
+	Try to fix up minor layout issues like indentation, line break, etc...
+	(mixal-mode-syntax-table): Don't try to specify comment syntax,
+	because it doesn't work.
+	(mixal-operation-codes): Add some more codes.
+	(mixal-font-lock-keywords): Process comments here.
+	(mixal-mode): mixasm no longer needs -g option.
+
+2005-10-11  Sven Joachim  <svenjoac@gmx.de>  (tiny change)
 
 	* progmodes/sh-script.el (sh-tmp-file):
 	Use mktemp -t.  Finish support for es and rc shells.
@@ -798,7 +870,7 @@
 	color rxvt terminals by using the code xterm.el used to use before
 	2005-04-09 in order to match the colors used by rxvt.
 
-2005-09-24  Emanuele Giaquinta <emanuele.giaquinta@gmail.com> (tiny change)
+2005-09-24  Emanuele Giaquinta <emanuele.giaquinta@gmail.com>  (tiny change)
 
 	* term/rxvt.el (rxvt-register-default-colors): Add support for 88
 	colors rxvt-unicode terminals by using the same code as xterm.el.
@@ -5940,8 +6012,8 @@
 
 	* log-view.el (log-view-file, log-view-message): Remove "-face"
 	suffix from face names.
-	(log-view-file-face, log-view-message-face): New
-	backward-compatibility aliases for renamed faces.
+	(log-view-file-face, log-view-message-face):
+	New backward-compatibility aliases for renamed faces.
 	(log-view-file-face, log-view-message-face): Use renamed log-view
 	faces.
 
@@ -5961,8 +6033,8 @@
 	(ruler-mode-margins-face, ruler-mode-fringes-face)
 	(ruler-mode-column-number-face, ruler-mode-fill-column-face)
 	(ruler-mode-comment-column-face, ruler-mode-goal-column-face)
-	(ruler-mode-tab-stop-face, ruler-mode-current-column-face): New
-	backward-compatibility aliases for renamed faces.
+	(ruler-mode-tab-stop-face, ruler-mode-current-column-face):
+	New backward-compatibility aliases for renamed faces.
 	(ruler-mode-pad, ruler-mode-margins, ruler-mode-fringes)
 	(ruler-mode-column-number, ruler-mode-fill-column)
 	(ruler-mode-comment-column, ruler-mode-goal-column)
@@ -6085,8 +6157,7 @@
 	* comint.el (comint-check-proc, make-comint-in-buffer)
 	(comint-source-default): Doc fixes.
 
-	* term.el (term-send-string): Improve argument/docstring
-	consistency.
+	* term.el (term-send-string): Improve argument/docstring consistency.
 
 2005-06-09  Luc Teirlinck  <teirllm@auburn.edu>
 
@@ -6203,12 +6274,11 @@
 	XEmacs code.
 	(flyspell-word): Minor simplification.
 	(flyspell-math-tex-command-p): Quieten the byte-compiler.
-	(flyspell-external-point-words): Remove unused vars `size' and
-	`start'.
-	(flyspell-do-correct): Rename from flyspell-xemacs-correct.  Merge
-	the corresponding Emacs code.
-	(flyspell-correct-word, flyspell-xemacs-popup): Use
-	flyspell-do-correct.
+	(flyspell-external-point-words): Remove unused vars `size' and `start'.
+	(flyspell-do-correct): Rename from flyspell-xemacs-correct.
+	Merge the corresponding Emacs code.
+	(flyspell-correct-word, flyspell-xemacs-popup):
+	Use flyspell-do-correct.
 
 	* emacs-lisp/debug.el (debug): Don't bury the buffer unless it's in
 	a dedicated window.
@@ -6247,8 +6317,7 @@
 	Add a completion-base-size-function property.
 
 	* simple.el (completion-setup-function): Look for
-	completion-base-size-function property of
-	minibuffer-completion-table.
+	completion-base-size-function property of minibuffer-completion-table.
 
 	* files.el (locate-file-completion): Doc fix.
 

lisp/desktop.el

@@ -963,10 +963,11 @@ directory DIRNAME."
 
 (defun desktop-load-file (function)
   "Load the file where auto loaded FUNCTION is defined."
-  (let ((fcell (symbol-function function)))
-    (when (and (listp fcell)
-               (eq 'autoload (car fcell)))
-      (load (cadr fcell)))))
+  (when function
+    (let ((fcell (symbol-function function)))
+      (when (and (listp fcell)
+                 (eq 'autoload (car fcell)))
+        (load (cadr fcell))))))
 
 ;; ----------------------------------------------------------------------------
 ;; Create a buffer, load its file, set its mode, ...;

lisp/info.el

@@ -3666,23 +3666,23 @@ the variable `Info-file-list-for-emacs'."
                                   ((equal tag "Up") Info-up-link-keymap))))))
         (when Info-use-header-line
           (goto-char (point-min))
-          (let ((header-end (line-end-position))
-                header)
-            ;; If we find neither Next: nor Prev: link, show the entire
-            ;; node header.  Otherwise, don't show the File: and Node:
-            ;; parts, to avoid wasting precious space on information that
-            ;; is available in the mode line.
-            (if (re-search-forward
-                 "\\(next\\|up\\|prev[ious]*\\): "
-                 header-end t)
-                (progn
-                  (goto-char (match-beginning 1))
-                  (setq header (buffer-substring (point) header-end)))
-              (if (re-search-forward "node:[ \t]*[^ \t]+[ \t]*" header-end t)
-                  (setq header
+          (let* ((header-end (line-end-position))
+                 (header
+                  ;; If we find neither Next: nor Prev: link, show the entire
+                  ;; node header.  Otherwise, don't show the File: and Node:
+                  ;; parts, to avoid wasting precious space on information that
+                  ;; is available in the mode line.
+                  (if (re-search-forward
+                       "\\(next\\|up\\|prev[ious]*\\): "
+                       header-end t)
+                      (progn
+                        (goto-char (match-beginning 1))
+                        (buffer-substring (point) header-end))
+                    (if (re-search-forward "node:[ \t]*[^ \t]+[ \t]*"
+                                           header-end t)
                         (concat "No next, prev or up links  --  "
-                                (buffer-substring (point) header-end)))
-                (setq header (buffer-substring (point) header-end))))
+                                (buffer-substring (point) header-end))
+                      (buffer-substring (point) header-end)))))
             (put-text-property (point-min) (1+ (point-min))
                                'header-line
 			       (replace-regexp-in-string
@@ -3698,9 +3698,15 @@ the variable `Info-file-list-for-emacs'."
 
       ;; Fontify titles
       (goto-char (point-min))
-      (when not-fontified-p
-        (while (re-search-forward "\n\\([^ \t\n].+\\)\n\\(\\*\\*+\\|==+\\|--+\\|\\.\\.+\\)$"
-                                  nil t)
+      (when (and font-lock-mode not-fontified-p)
+        (while (and (re-search-forward "\n\\([^ \t\n].+\\)\n\\(\\*\\*+\\|==+\\|--+\\|\\.\\.+\\)$"
+                                       nil t)
+                    ;; Only consider it as an underlined title if the ASCII
+                    ;; underline has the same size as the text.  A typical
+                    ;; counter example is when a continuation "..." is alone
+                    ;; on a line.
+                    (= (- (match-end 1) (match-beginning 1))
+                       (- (match-end 2) (match-beginning 2))))
           (let* ((c (preceding-char))
                  (face
                   (cond ((= c ?*) 'info-title-1)

lisp/international/fontset.el

@@ -173,39 +173,42 @@
        ((if (r2 >= 0)
 	    ;; This is a 2D charset.
 	    (r1 = ((r1 << 7) | r2)))
-	(lookup-character ucs-mule-cjk-to-unicode r0 r1)
+	(lookup-character utf-subst-table-for-encode r0 r1)
 	(if r7
 	    ;; We got it!
 	    ((r1 = (r0 >> 8))
 	     (r2 = (r0 & #xFF)))
 	  ;; Look for a translation for non-ASCII chars.
 	  ((translate-character ucs-mule-to-mule-unicode r0 r1)
-	   (if (r0 == ,(charset-id 'latin-iso8859-1))
-	       ((r2 = (r1 + 128))
+	   (if (r0 == ,(charset-id 'ascii))
+	       ((r2 = r1)
 		(r1 = 0))
-	     ((r2 = (r1 & #x7F))
-	      (r1 >>= 7)
-	      (if (r0 == ,(charset-id 'mule-unicode-0100-24ff))
-		  ((r1 *= 96)
-		   (r1 += r2)
-		   (r1 += ,(- #x100 (* 32 96) 32))
-		   (r1 >8= 0)
-		   (r2 = r7))
-		(if (r0 == ,(charset-id 'mule-unicode-2500-33ff))
-		    ((r1 *= 96)
-		     (r1 += r2)
-		     (r1 += ,(- #x2500 (* 32 96) 32))
-		     (r1 >8= 0)
-		     (r2 = r7))
-		  (if (r0 == ,(charset-id 'mule-unicode-e000-ffff))
-		      ((r1 *= 96)
-		       (r1 += r2)
-		       (r1 += ,(- #xe000 (* 32 96) 32))
-		       (r1 >8= 0)
-		       (r2 = r7))
-		    ;; No way, use the glyph for U+FFFD.
-		    ((r1 = #xFF)
-		     (r2 = #xFD)))))))))))))
+	     ((if (r0 == ,(charset-id 'latin-iso8859-1))
+		  ((r2 = (r1 + 128))
+		   (r1 = 0))
+		((r2 = (r1 & #x7F))
+		 (r1 >>= 7)
+		 (if (r0 == ,(charset-id 'mule-unicode-0100-24ff))
+		     ((r1 *= 96)
+		      (r1 += r2)
+		      (r1 += ,(- #x100 (* 32 96) 32))
+		      (r1 >8= 0)
+		      (r2 = r7))
+		   (if (r0 == ,(charset-id 'mule-unicode-2500-33ff))
+		       ((r1 *= 96)
+			(r1 += r2)
+			(r1 += ,(- #x2500 (* 32 96) 32))
+			(r1 >8= 0)
+			(r2 = r7))
+		     (if (r0 == ,(charset-id 'mule-unicode-e000-ffff))
+			 ((r1 *= 96)
+			  (r1 += r2)
+			  (r1 += ,(- #xe000 (* 32 96) 32))
+			  (r1 >8= 0)
+			  (r2 = r7))
+		       ;; No way, use the glyph for U+FFFD.
+		       ((r1 = #xFF)
+			(r2 = #xFD)))))))))))))))
   "Encode characters for display with iso10646 font.
 Translate through the translation-hash-table named
 `ucs-mule-cjk-to-unicode' and the translation-table named

lisp/international/utf-8.el

@@ -934,7 +934,8 @@ Move point to the end of the sequence."
 			     'help-echo 'utf-8-help-echo)
 	  (if (= l 2)
 	      (put-text-property (point) (min (point-max) (+ l (point)))
-				 'display (format "\\%03o" ch))
+				 'display (propertize (format "\\%03o" ch)
+						      'face 'escape-glyph))
 	    (compose-region (point) (+ l (point)) ?$,3u=(B))
 	  (forward-char l))
       (forward-char 1))))

lisp/makefile.w32-in

@@ -176,7 +176,7 @@ update-subdirs-SH: doit
 	   $(srcdir)/update-subdirs $$file; \
 	done;
 
-updates: update-subdirs autoloads finder-data custom-deps
+updates: update-subdirs autoloads mh-autoloads finder-data custom-deps
 
 # Update the AUTHORS file.
 
@@ -207,7 +207,7 @@ TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2)
 # compiled find the right files.
 
 # Need separate version for sh and native cmd.exe
-compile: subdirs.el compile-$(SHELLTYPE) doit
+compile: subdirs.el mh-autoloads compile-$(SHELLTYPE) doit
 
 compile-CMD:
 #	-for %%f in ($(lisp) $(WINS)) do for %%g in (%%f\*.elc) do @attrib -r %%g
@@ -282,9 +282,47 @@ compile-after-backup: backup-compiled-files compile-always
 # Note that this doesn't create .elc files.  It only recompiles if an
 # .elc is present.
 
-recompile: doit
+recompile: mh-autoloads doit
 	$(emacs) -f batch-byte-recompile-directory $(lisp)
 
+# Update MH-E internal autoloads. These are not to be confused with
+# the autoloads for the MH-E entry points, which are already in
+# loaddefs.el.
+MH_E_SRC = $(lisp)/mh-e/mh-acros.el $(lisp)/mh-e/mh-alias.el	\
+	$(lisp)/mh-e/mh-comp.el $(lisp)/mh-e/mh-customize.el	\
+	$(lisp)/mh-e/mh-e.el $(lisp)/mh-e/mh-funcs.el		\
+	$(lisp)/mh-e/mh-mime.el $(lisp)/mh-e/mh-pick.el		\
+	$(lisp)/mh-e/mh-print.el $(lisp)/mh-e/mh-inc.el		\
+	$(lisp)/mh-e/mh-init.el $(lisp)/mh-e/mh-index.el	\
+	$(lisp)/mh-e/mh-identity.el $(lisp)/mh-e/mh-junk.el	\
+	$(lisp)/mh-e/mh-seq.el $(lisp)/mh-e/mh-speed.el		\
+	$(lisp)/mh-e/mh-utils.el
+
+mh-autoloads: $(lisp)/mh-e/mh-loaddefs.el
+$(lisp)/mh-e/mh-loaddefs.el: $(MH_E_SRC)
+	echo ";;; mh-loaddefs.el --- automatically extracted autoloads" > $@
+	echo ";;" >> $@
+	echo ";;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc." >> $@
+	echo ";;; Author: Bill Wohler <wohler@newt.com>" >> $@
+	echo ";;; Keywords: mail" >> $@
+	echo ";;; Commentary:" >> $@
+	echo ";;; Change Log:" >> $@
+	echo ";;; Code:" >> $@
+	$(EMACS) $(EMACSOPT) \
+	   -l autoload \
+	   --eval "(setq generate-autoload-cookie \";;;###mh-autoload\")" \
+	   --eval "(setq generated-autoload-file \"$(lisp)/mh-e/mh-loaddefs.el\")" \
+	   --eval "(setq make-backup-files nil)" \
+	   -f batch-update-autoloads $(lisp)/mh-e
+	echo "" >> $@
+	echo "(provide 'mh-loaddefs)" >> $@
+	echo ";;; Local Variables:" >> $@
+	echo ";;; version-control: never" >> $@
+	echo ";;; no-byte-compile: t" >> $@
+	echo ";;; no-update-autoloads: t" >> $@
+	echo ";;; End:" >> $@
+	echo ";;; mh-loaddefs.el ends here" >> $@
+
 # Prepare a bootstrap in the lisp subdirectory.
 #
 # Build loaddefs.el to make sure it's up-to-date.  If it's not, that
@@ -316,7 +354,7 @@ bootstrap-clean-SH:
 # When done, remove bootstrap-emacs from ../bin, so that
 # it will not be mistaken for an installed binary.
 
-bootstrap: update-subdirs autoloads compile finder-data custom-deps
+bootstrap: update-subdirs autoloads mh-autoloads compile finder-data custom-deps
 	- $(DEL) $(EMACS)
 
 #

lisp/mh-e/.gitignore

+mh-autoloads.el
 mh-loaddefs.el

lisp/progmodes/mixal-mode.el

@@ -46,6 +46,14 @@
 
 ;;; History:
 ;; Version 0.3:
+;; 12/10/05: Stefan Monnier <monnier@iro.umontreal.ca>
+;;           Use font-lock-syntactic-keywords to detect/mark comments.
+;;           Use [^ \t\n]+ to match the operand part of a line.
+;;           Drop mixal-operation-codes.
+;;           Build the mixal-operation-codes-alist immediately.
+;;           Use `interactive' in mixal-describe-operation-code.
+;;           Remove useless ".*$" at the end of some regexps.
+;;           Fix the definition of comment-start-skip.
 ;; 08/10/05: sync mdk and emacs cvs
 ;;           from emacs: compile-command and require-final-newline
 ;;           from mdk:   see version 0.2
@@ -79,10 +87,12 @@
 ;;; Syntax table
 (defvar mixal-mode-syntax-table
   (let ((st (make-syntax-table)))
-    ;; (modify-syntax-entry ?* "<" st)    we need to do a bit more to make
-    ;; (modify-syntax-entry ?\n ">" st)    fontlocking for comments work
+    ;; We need to do a bit more to make fontlocking for comments work.
+    ;; See mixal-font-lock-syntactic-keywords.
+    ;; (modify-syntax-entry ?* "<" st)
+    (modify-syntax-entry ?\n ">" st)
     st)
-  "Syntax table for `dot-mode'.")
+  "Syntax table for `mixal-mode'.")
 
 (defvar mixal-font-lock-label-face 'font-lock-variable-name-face
   "Face name to use for label names.
@@ -99,48 +109,10 @@ value.")
 Default value is that of `font-lock-builtin-face', but you can modify its
 value.")
 
-(defvar mixal-operation-codes
-  '("NOP" "ADD" "FADD" "SUB" "FSUB" "MUL" "FMUL" "DIV" "FDIV" "NUM" "CHAR"
-    "HLT" "SLA" "SRA" "SLAX" "SRAX" "SLC" "SRC" "MOVE" "LDA" "LD1" "LD2" "LD3"
-    "LD4" "LD5" "LD6" "LDX" "LDAN" "LD1N" "LD2N" "LD3N" "LD4N" "LD5N" "LD6N"
-    "LDXN" "STA" "ST1" "ST2" "ST3" "ST4" "ST5" "ST6" "STX" "STJ" "STZ" "JBUS"
-    "IOC" "IN" "OUT" "JRAD" "JMP" "JSJ" "JOV" "JNOV"
-    "JL" "JE" "JG" "JGE" "JNE" "JLE"
-    "JAN" "J1N" "J2N" "J3N" "J4N" "J5N" "J6N" "JXN"
-    "JAZ" "J1Z" "J2Z" "J3Z" "J4Z" "J5Z" "J6Z" "JXZ"
-    "JAP" "J1P" "J2P" "J3P" "J4P" "J5P" "J6P" "JXP"
-    "JANN" "J1NN" "J2NN" "J3NN" "J4NN" "J5NN" "J6NN" "JXNN"
-    "JANZ" "J1NZ" "J2NZ" "J3NZ" "J4NZ" "J5NZ" "J6NZ" "JXNZ"
-    "JANP" "J1NP" "J2NP" "J3NP" "J4NP" "J5NP" "J6NP" "JXNP"
-    "INCA" "DECA" "ENTA" "ENNA" "INC1" "DEC1" "ENT1" "ENN1"
-    "INC2" "DEC2" "ENT2" "ENN2" "INC3" "DEC3" "ENT3" "ENN3" "INC4" "DEC4"
-    "ENT4" "ENN4" "INC5" "DEC5" "ENT5" "ENN5" "INC6" "DEC6" "ENT6" "ENN6"
-    "INCX" "DECX" "ENTX" "ENNX" "CMPA" "FCMP" "CMP1" "CMP2" "CMP3" "CMP4"
-    "CMP5" "CMP6" "CMPX")
-  "List of possible operation codes as strings.")
-;; (makunbound 'mixal-operation-codes)
-
 (defvar mixal-assembly-pseudoinstructions
   '("ORIG" "EQU" "CON" "ALF" "END")
   "List of possible assembly pseudoinstructions.")
 
-;;; Font-locking:
-(defvar mixal-font-lock-keywords
-  `(("^\\([A-Z0-9a-z]+\\).*$"
-     (1 mixal-font-lock-label-face))
-    (,(regexp-opt mixal-operation-codes 'words)
-     . mixal-font-lock-operation-code-face)
-    (,(regexp-opt
-       mixal-assembly-pseudoinstructions 'words)
-     . mixal-font-lock-assembly-pseudoinstruction-face)
-    ("^[A-Z0-9a-z]*[ \t]+[A-ZO-9a-z]+[ \t]+\\(=.*=\\).*$"
-     (1 font-lock-constant-face))
-    ("^[A-Z0-9a-z]*[ \t]+[A-Z0-9a-z]+[ \t]+[A-Z0-9a-z,():+-\\*=\" ]*\t+\\(.*\\)$"
-     (1 font-lock-comment-face))
-    ("^\\*.*$" . font-lock-comment-face))
-  "Keyword highlighting specification for `mixal-mode'.")
-;; (makunbound 'mixal-font-lock-keywords)
-
 ;;;; Compilation
 ;; Output from mixasm is compatible with default behavior of emacs,
 ;; I just added a key (C-cc) and modified the make-command.
@@ -149,1127 +121,940 @@ value.")
 ;; Tabs works well by default.
 
 ;;;; Describe
-(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 as a string,
-C-BYTE is the operation code telling what operation is to be performed,
-F-BYTE holds a 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.")
-;; (makunbound 'mixal-operation-codes-alist)
-
-(defun mixal-add-operation-code (op-code group full-name C-byte F-byte
-                                         description execution-time)
-  "Add an operation code to `mixal-operation-codes-alist'."
-  (setq mixal-operation-codes-alist
-        (cons (list op-code group full-name C-byte F-byte
-                    description execution-time)
-              mixal-operation-codes-alist)))
-
-;; now add each operation code
-
-(mixal-add-operation-code
- 'LDA 'loading "load A" 8 'field
- "Put in rA the contents of cell no. M.
+(defvar mixal-operation-codes-alist
+  ;; FIXME: the codes FADD, FSUB, FMUL, FDIV, JRAD, and FCMP were in
+  ;; mixal-operation-codes but not here.  They should probably be added here.
+  ;; 
+  ;; We used to define this with a backquote and subexps like ,(+ 8 3) for
+  ;; better clarity, but the resulting code was too big and caused the
+  ;; byte-compiler to eat up all the stack space.  Even using
+  ;; `eval-when-compile' didn't help because the byte-compiler insists on
+  ;; compiling the code before evaluating it.
+  '((LDA loading "load A" 8 field
+         "Put in rA the contents of cell no. M.
 Uses a + when there is no sign in subfield. Subfield is left padded with
 zeros to make a word."
- 2)
+         2)
 
-(mixal-add-operation-code
- 'LDX 'loading "load X" 15 'field
- "Put in rX the contents of cell no. M.
+    (LDX loading "load X" 15 field
+         "Put in rX the contents of cell no. M.
 Uses a + when there is no sign in subfield. Subfield is left padded with
 zeros to make a word."
- 2)
+         2)
 
-(mixal-add-operation-code
- 'LD1 'loading "load I1" (+ 8 1) 'field
- "Put in rI1 the contents of cell no. M.
+    (LD1 loading "load I1" 9 field
+         "Put in rI1 the contents of cell no. M.
 Uses a + when there is no sign in subfield. Subfield is left padded with
 zeros to make a word. Index registers only have 2 bytes and a sign, Trying
 to set anything more that that will result in undefined behavior."
- 2)
+         2)
 
-(mixal-add-operation-code
- 'LD2 'loading "load I2" (+ 8 2) 'field
- "Put in rI2 the contents of cell no. M.
+    (LD2 loading "load I2" 10 field
+         "Put in rI2 the contents of cell no. M.
 Uses a + when there is no sign in subfield. Subfield is left padded with
 zeros to make a word. Index registers only have 2 bytes and a sign, Trying
 to set anything more that that will result in undefined behavior."
- 2)
+         2)
 
-(mixal-add-operation-code
- 'LD3 'loading "load I3" (+ 8 3) 'field
- "Put in rI3 the contents of cell no. M.
+    (LD3 loading "load I3" 11 field
+         "Put in rI3 the contents of cell no. M.
 Uses a + when there is no sign in subfield. Subfield is left padded with
 zeros to make a word. Index registers only have 2 bytes and a sign, Trying
 to set anything more that that will result in undefined behavior."
- 2)
+         2)
 
-(mixal-add-operation-code
- 'LD4 'loading "load I4" (+ 8 4) 'field
- "Put in rI4 the contents of cell no. M.
+    (LD4 loading "load I4" 12 field
+         "Put in rI4 the contents of cell no. M.
 Uses a + when there is no sign in subfield. Subfield is left padded with
 zeros to make a word. Index registers only have 2 bytes and a sign, Trying
 to set anything more that that will result in undefined behavior."
- 2)
+         2)
 
-(mixal-add-operation-code
- 'LD5 'loading "load I5" (+ 8 5) 'field
- "Put in rI5 the contents of cell no. M.
+    (LD5 loading "load I5" 13 field
+         "Put in rI5 the contents of cell no. M.
 Uses a + when there is no sign in subfield. Subfield is left padded with
 zeros to make a word. Index registers only have 2 bytes and a sign, Trying
 to set anything more that that will result in undefined behavior."
- 2)
+         2)
 
-(mixal-add-operation-code
- 'LD6 'loading "load I6" (+ 8 6) 'field
- "Put in rI6 the contents of cell no. M.
+    (LD6 loading "load I6" 14 field
+         "Put in rI6 the contents of cell no. M.
 Uses a + when there is no sign in subfield. Subfield is left padded with
 zeros to make a word. Index registers only have 2 bytes and a sign, Trying
 to set anything more that that will result in undefined behavior."
- 2)
+         2)
 
-(mixal-add-operation-code
- 'LDAN 'loading "load A negative" 16 'field
- "Put in rA the contents of cell no. M, with opposite sign.
+    (LDAN loading "load A negative" 16 field
+          "Put in rA the contents of cell no. M, with opposite sign.
 Uses a + when there is no sign in subfield, otherwise use the opposite sign.
 Subfield is left padded with zeros to make a word."
- 2)
+          2)
 
-(mixal-add-operation-code
- 'LDXN 'loading "load X negative" 23 'field
- "Put in rX the contents of cell no. M, with opposite sign.
+    (LDXN loading "load X negative" 23 field
+          "Put in rX the contents of cell no. M, with opposite sign.
 Uses a + when there is no sign in subfield, otherwise use the opposite sign.
 Subfield is left padded with zeros to make a word."
- 2)
+          2)
 
-(mixal-add-operation-code
- 'LD1N 'loading "load I1 negative" (+ 16 1) 'field
- "Put in rI1 the contents of cell no. M, with opposite sign.
+    (LD1N loading "load I1 negative" 17 field
+          "Put in rI1 the contents of cell no. M, with opposite sign.
 Uses a + when there is no sign in subfield, otherwise use the opposite sign.
 Subfield is left padded with zeros to make a word. Index registers only
 have 2 bytes and a sign, Trying to set anything more that that will result
 in undefined behavior."
- 2)
+          2)
 
-(mixal-add-operation-code
- 'LD2N 'loading "load I2 negative" (+ 16 2) 'field
- "Put in rI2 the contents of cell no. M, with opposite sign.
+    (LD2N loading "load I2 negative" 18 field
+          "Put in rI2 the contents of cell no. M, with opposite sign.
 Uses a + when there is no sign in subfield, otherwise use the opposite sign.
 Subfield is left padded with zeros to make a word. Index registers only
 have 2 bytes and a sign, Trying to set anything more that that will result
 in undefined behavior."
- 2)
+          2)
 
-(mixal-add-operation-code
- 'LD3N 'loading "load I3 negative" (+ 16 3) 'field
- "Put in rI3 the contents of cell no. M, with opposite sign.
+    (LD3N loading "load I3 negative" 19 field
+          "Put in rI3 the contents of cell no. M, with opposite sign.