Commits

Anonymous committed a145efe

Import from CVS: tag r20-1b3

Comments (0)

Files changed (139)

 							-*- indented-text -*-
+to 20.1 beta3
+-- Customized edit-faces Courtesy of Jens Lautenbacher
+-- W3-3.0.62
+-- AUCTeX-9.7k
+-- mic-paren.el-1.3 Courtesy of Mikael Sjödin
+-- hm--html-menus-5.3
+-- custom-1.46
+-- site-load.el preconfigured to work with DOC string generation
+-- regex.c MULE bugfix Courtesy of David Moore
+-- python-mode.el-2.90
+-- balloon-help-1.04
+-- xrdb-mode.el-1.21
+-- itimer.el-1.01 Courtesy of Kyle Jones
+-- Miscellaneous bug fixes.
+-- Dynamic computation of PURESIZE during build
+
 to 20.1 beta2
 -- First cut at MS Windows NT support Courtesy of David Hobley
 -- itimer.el-1.01 Courtesy of Kyle Jones
 -- hyperbole-4.021 Courtesy of Bob Weiner
 -- Restoration of reportmail.el Courtesy of jwz
 -- Restoration of passwd.el Courtesy of jwz
--- AUC TeX-9.7i Courtesy of Per Abrahamsen
+-- AUC TeX-9.7i Courtesy of Per Abrahamsen (Contributed code integrated
+       courtesy of Soren Dayton)
 -- viper-2.93 Courtesy of Michael Kifer
 -- ediff-2.64 Courtesy of Michael Kifer
 -- edmacro.el-3.05
+Wed Feb 26 22:12:12 1997  Steven L Baur  <steve@altair.xemacs.org>
+
+	* Makefile.in (top_distclean): Reset src/PURESIZE.h for
+	distribution.
+
+	* XEmacs 20.1-b3 is released.
+
 Sun Feb 23 17:10:09 1997  Steven L Baur  <steve@altair.xemacs.org>
 
 	* XEmacs 20.1-b2 is released.
 
 	* XEmacs 19-15-b'95 is released.
 
+Fri Feb 21 22:29:51 1997  Martin Buchholz  <mrb@eng.sun.com>
+
+	* etc/toolbar/workshop-cap-up.xpm:  Moved caption up one pixel.
+
+	* lwlib/xlwscrollbar.c : Fix many scrollbar bugs:
+	- "knob" renamed to "slider"
+	- leftmost pixel wasn't sensitive to button clicks, while righmost
+	  pixel was.
+	- many glitches fixed if Emacs*XlwScrollBar.ArrowPosition:same:
+	  - goobers on top of up-arrow removed.
+	  - up-arrow would not always be redrawn when necessary
+	  - slider drag would be `off' by size of up-arrow
+	- horizontal and vertical scrollbars didn't use exactly the same
+	  dimensions.
+	- slider was never drawn if XlwScrollBar.shadowThickness was 0.
+	- Now up- and down-arrows actually work near beginning/end of buffer!
+
 Thu Feb 20 12:40:57 1997  Jan Vroonhof <vroonhof@math.ethz.ch>
 
 	* configure.in (with_xauth): Attempted correction of test for
 top_distclean=\
 	rm -f config.status config-tmp-* build-install ; \
 	rm -f Makefile ${SUBDIR_MAKEFILES}; \
-	(cd lock && rm -f *)
+	(cd lock && rm -f *) ; \
+	echo "/* This file is generated by XEmacs, DO NOT MODIFY!!! */" > src/PURESIZE.h; \
+	echo "# define PURESIZE 1350000" >> src/PURESIZE.h
 
 distclean: FRC.distclean
 	(cd src      && $(MAKE) $(MFLAGS) distclean)
 *XmScrollBar*Background:		Gray75
 
 !
-! The Lucid Scrollbar supports two added resources, KnobStyle is either
+! The Lucid Scrollbar supports two added resources, SliderStyle is either
 ! "plain" (default) or "dimple".  Dimple puts a small dimple in the middle
-! of the knob that depresses when the knob is clicked on.  ArrowPosition is
+! of the slider that depresses when the slider is clicked on.  ArrowPosition is
 ! either "opposite" (default) or "same".  Opposite puts the arrows at opposite
 ! of the scrollbar, same puts both arrows at the same end, like the Amiga.
 !
-! Emacs*XlwScrollBar.KnobStyle:      dimple
+! Emacs*XlwScrollBar.SliderStyle:    dimple
 ! Emacs*XlwScrollBar.ArrowPosition:  opposite
 
 

etc/sample.Xdefaults

 Emacs*XmScrollBar.Background:		Gray75
 
 !
-! The Lucid Scrollbar supports two added resources, KnobStyle is either
+! The Lucid Scrollbar supports two added resources, SliderStyle is either
 ! "plain" (default) or "dimple".  Dimple puts a small dimple in the middle
-! of the knob that depresses when the knob is clicked on.  ArrowPosition is
+! of the slider that depresses when the slider is clicked on.  ArrowPosition is
 ! either "opposite" (default) or "same".  Opposite puts the arrows at opposite
 ! of the scrollbar, same puts both arrows at the same end, like the Amiga.
 !
-! Emacs*XlwScrollBar.KnobStyle:      dimple
+! Emacs*XlwScrollBar.SliderStyle:    dimple
 ! Emacs*XlwScrollBar.ArrowPosition:  opposite
 
 
 		   (t nil))))
     (cond (bg
 	   (let ((def (color-name (face-background 'default)))
-		 (faces (list-faces)))
+		 (faces (face-list)))
 	     (while faces
 	       (let ((obg (face-background (car faces))))
 		 (if (and obg (equal def (color-name obg)))
 ;; constructed using the environment variables USER and DOMAINNAME
 ;; (e.g. turner@lanl.gov), if set.
 
-(if (and running-xemacs (< emacs-major-version 20) (>= emacs-minor-version 15))
+(if (and running-xemacs
+	 (or (and (= emacs-major-version 20) (>= emacs-minor-version 1))
+	     (and (= emacs-major-version 19) (>= emacs-minor-version 15))))
     (progn
       (message "Loading and configuring bundled packages... efs")
       (require 'efs-auto)
 		 (getenv "DOMAINNAME"))
 	    (setq efs-generate-anonymous-password
 		  (concat (getenv "USER")"@"(getenv "DOMAINNAME")))))
-      (setq efs-auto-save 1)
-      ))
-(if (and running-xemacs (< emacs-major-version 20) (< emacs-minor-version 15))
-    (progn
-      (message "Loading and configuring bundled packages... ange-ftp")
-      (require 'ange-ftp)
-      (if (getenv "USER")
-	  (setq ange-ftp-default-user (getenv "USER")))
-      (if (getenv "EMAIL_ADDRESS")
-	  (setq ange-ftp-generate-anonymous-password (getenv "EMAIL_ADDRESS"))
-	(if (and (getenv "USER")
-		 (getenv "DOMAINNAME"))
-	    (setq ange-ftp-generate-anonymous-password
-		  (concat (getenv "USER")"@"(getenv "DOMAINNAME")))))
-      (setq ange-ftp-auto-save 1)
-      )
+      (setq efs-auto-save 1))
+  (progn
+    (message "Loading and configuring bundled packages... ange-ftp")
+    (require 'ange-ftp)
+    (if (getenv "USER")
+	(setq ange-ftp-default-user (getenv "USER")))
+    (if (getenv "EMAIL_ADDRESS")
+	(setq ange-ftp-generate-anonymous-password (getenv "EMAIL_ADDRESS"))
+      (if (and (getenv "USER")
+	       (getenv "DOMAINNAME"))
+	  (setq ange-ftp-generate-anonymous-password
+		(concat (getenv "USER")"@"(getenv "DOMAINNAME")))))
+    (setq ange-ftp-auto-save 1)
+    )
   )
 
 

etc/toolbar/workshop-cap-up.xpm

Old
Old image
New
New image
 "                   ..XXX         ",
 "                                 ",
 "                                 ",
-"                                 ",
 "         X        X              ",
 " X  X  X X     XX X              ",
 " X  X  X X  X X   XXX   XX  XXX  ",
 "  X X X  XX     X X  X X  X X  X ",
 "   X X   X X    X X  X X  X X  X ",
 "   X X   X  X XX  X  X  XX  XXX  ",
-"                            X    "};
+"                            X    ",
+"                                 "};

etc/toolbar/workshop-cap-xx.xpm

Old
Old image
New
New image
 "                   ..XXX         ",
 "                                 ",
 "                                 ",
-"                                 ",
 "         X        X              ",
 " X  X  X X     XX X              ",
 " X  X  X X  X X   XXX   XX  XXX  ",
 "  X X X  XX     X X  X X  X X  X ",
 "   X X   X X    X X  X X  X X  X ",
 "   X X   X  X XX  X  X  XX  XXX  ",
-"                            X    "};
+"                            X    ",
+"                                 "};

etc/w3/stylesheet

            insert-before: "[[";
            insert-after: "]]"
          }
+
+input:text,
+input:integer,
+input:float,
+input:url,
+input:text    { insert-before: "[{"; insert-after: "}]"; }
+select { insert-before: "[{"; insert-after: "}]"; }
+
 } // @media tty
 
 
 
 Packages:
 
-* AUC TeX::	Mode for editing TeX files.
+* AUCTeX::	Mode for editing TeX files.
 * CC-MODE::	Mode for editing C, C++, and Objective-C code.
 * CL::		A Common Lisp compatibility package for Emacs-Lisp.
 * Custom::	Customization Library for Emacs

lib-src/ChangeLog

+Wed Feb 26 18:17:59 1997  Steven L Baur  <steve@altair.xemacs.org>
+
+	* make-docfile.c (next_extra_elc): New function.
+	(main): Use it.  Implementation of `-i' parameter to pass a list
+	of site-loaded lisp files.
+
 Wed Feb 19 18:24:49 1997  Steven L Baur  <steve@altair.xemacs.org>
 
 	* update-elc.sh: Added lisp/auctex.

lib-src/make-docfile.c

  Then comes F for a function or V for a variable.
  Then comes the function or variable name, terminated with a newline.
  Then comes the documentation for that function or variable.
+
+ Added 19.15/20.1:  `-i site-packages' allow installer to dump extra packages
+ without modifying Makefiles, etc.
  */
 
 #define NO_SHORTNAMES   /* Tell config not to load remap.h */
 
 /* Stdio stream for output to the DOC file.  */
 static FILE *outfile;
+static char *extra_elcs = NULL;
 
 enum
 {
   return result;
 }
 
+static char *
+next_extra_elc(char *extra_elcs)
+{
+  static FILE *fp = NULL;
+  static char line_buf[BUFSIZ];
+  char *p = line_buf+1;
+
+  if (!fp) {
+    if (!extra_elcs) {
+      return NULL;
+    } else if (!(fp = fopen(extra_elcs, "r"))) {
+      /* It is not an error if this file doesn't exist. */
+      /*fatal("error opening site package file list", 0);*/
+      return NULL;
+    }
+    fgets(line_buf, BUFSIZ, fp);
+  }
+
+again:
+  if (!fgets(line_buf, BUFSIZ, fp)) {
+    fclose(fp);
+    fp = NULL;
+    return NULL;
+  }
+  line_buf[0] = '\0';
+  if (strlen(p) <= 2 || strlen(p) >= (BUFSIZ - 5)) {
+    /* reject too short or too long lines */
+    goto again;
+  }
+  p[strlen(p) - 2] = '\0';
+  strcat(p, ".elc");
+
+  return p;
+}
+
 
 int
 main (int argc, char **argv)
       i += 2;
     }
 
+  if (argc > (i + 1) && !strcmp(argv[i], "-i")) {
+    extra_elcs = argv[i + 1];
+    i += 2;
+  }
+
   if (outfile == 0)
     fatal ("No output file specified", "");
 
 	/* err_count seems to be {mis,un}used */
 	err_count += scan_file (argv[i]);
     }
+
+  if (extra_elcs) {
+    char *p;
+
+    while ((p = next_extra_elc(extra_elcs)) != NULL) {
+      err_count += scan_file(p);
+    }
+  }
+
   putc ('\n', outfile);
 #ifndef VMS
   exit (err_count > 0);

lib-src/update-elc.sh

 make_special oobr HYPB_ELC='' elc
 make_special eos -k		# not stricly necessary...
 make_special ilisp elc
-make_special auctex
+make_special auctex some
 
 ignore_pattern=''
 for dir in $ignore_dirs ; do
+Wed Feb 26 18:09:56 1997  Andreas Jaeger <aj@arthur.pfalz.de>
+
+	* x11/x-menubar.el (default-menubar): `FAQ' should be `FAQ
+	(local)' in Help menu.
+
+Mon Feb 24 18:33:38 1997  Martin Buchholz  <mrb@eng.sun.com>
+
+	* mule/mule-debug.el (describe-coding-system): Ported from
+	Mule to XEmacs.
+
+	* mule/mule-x-init.el (x-use-halfwidth-roman-font): New
+	function:
+	 "Maybe set charset registry of the 'ascii charset to ROMAN-REGISTRY.
+
+	Do this only if:
+	 - the current display is an X device
+	 - the displayed width of FULLWIDTH-CHARSET is twice the displayed
+	   width of the 'ascii charset, but only when using ROMAN-REGISTRY.
+
+	Traditionally, Asian characters have been displayed so that they
+	occupy exactly twice the screen space of ASCII (`halfwidth')
+	characters.  On many systems, e.g. Sun CDE systems, this can only be
+	achieved by using a national variant roman font to display ASCII."
+
 Sun Feb 23 12:56:28 1997  Steven L Baur  <steve@altair.xemacs.org>
 
 	* edebug/edebug.el: Synch up with Emacs 19.34.

lisp/auctex/ChangeLog

+Wed Feb 26 23:15:27 1997  Per Abrahamsen  <abraham@dina.kvl.dk>
+
+	* Version 9.7k released.
+
+Wed Feb 26 23:14:43 1997  Per Abrahamsen  <abraham@dina.kvl.dk>
+
+	* tex.el (TeX-submit-bug-report): Fix address (sunsite, not iesd!).
+
+Tue Feb 25 17:36:11 1997  Per Abrahamsen  <abraham@dina.kvl.dk>
+
+	* Version 9.7j released.
+
+Fri Feb 21 09:29:20 1997  Per Abrahamsen  <abraham@dina.kvl.dk>
+
+	* Makefile (some): New target.  
+	Suggested by Steven L Baur <steve@miranova.com>.
+
+Thu Feb 20 11:30:50 1997  Per Abrahamsen  <abraham@dina.kvl.dk>
+
+	* Version 9.7i released.
+
+Thu Feb 20 10:59:38 1997  Per Abrahamsen  <abraham@dina.kvl.dk>
+
+	* tex.el: Removed autoloads that conflicts with `tex-mode.el'.
+	(TeX-lisp-directory): Default to data-directory.
+
 Thu Feb 20 11:30:50 1997  Per Abrahamsen  <abraham@dina.kvl.dk>
 
 	* Version 9.7i released.

lisp/auctex/Makefile

 # Makefile - for the AUC TeX distribution.
 #
 # Maintainer: Per Abrahamsen <auc-tex@sunsite.auc.dk>
-# Version: 9.7i
+# Version: 9.7k
 #
 # Edit the makefile, type `make', and follow the instructions.
 
 lisp:
 	$(ELC) $(AUCSRC) $(STYLESRC) $(CONTRIB)
 
+some:	$(AUCELC) style/*.elc
+
 install:	install-lisp
 
-tex.elc:	tex.el
-	$(ELC) $(AUCSRC) $(STYLESRC)
-
 contrib:
 	$(ELC) bib-cite.el
 	$(ELC) font-latex.el
 # 	$(ELC) tex-jp.el              # Doesn't compile without MULE
 # 	$(ELC) hilit-LaTeX.el         # Doesn't compile without X
 
-install-lisp:	tex.elc
+install-lisp:	some
 	if [ ! -d $(lispdir) ]; then mkdir $(lispdir); else true; fi ;
 	if [ -f $(lispdir)/tex-site.el ]; \
 	then \

lisp/auctex/auc-old.el

 ;;; auc-old.el - Compatibility with AUC TeX 6.*
 ;;
 ;; Maintainer: Per Abrahamsen <auc-tex@sunsite.auc.dk>
-;; Version: 9.7i
+;; Version: 9.7k
 ;;
 ;; Copyright (C) 1991 Kresten Krab Thorup 
 ;; Copyright (C) 1993 Per Abrahamsen 

lisp/auctex/latex.el

 ;;; latex.el --- Support for LaTeX documents.
 ;; 
 ;; Maintainer: Per Abrahamsen <auc-tex@sunsite.auc.dk>
-;; Version: 9.7i
+;; Version: 9.7k
 ;; Keywords: wp
 ;; X-URL: http://sunsite.auc.dk/auctex
 

lisp/auctex/tex-buf.el

 ;;; tex-buf.el - External commands for AUC TeX.
 ;;
 ;; Maintainer: Per Abrahamsen <auc-tex@sunsite.auc.dk>
-;; Version: 9.7i
+;; Version: 9.7k
 
 ;; Copyright (C) 1991 Kresten Krab Thorup
 ;; Copyright (C) 1993, 1996 Per Abrahamsen 

lisp/auctex/tex-info.el

 ;;; tex-info.el - Support for editing TeXinfo source.
 ;;
 ;; Maintainer: Per Abrahamsen <auc-tex@sunsite.auc.dk>
-;; Version: 9.7i
+;; Version: 9.7k
 
 ;; Copyright (C) 1993, 1994, 1997 Per Abrahamsen 
 ;; 

lisp/auctex/tex.el

 ;;; tex.el --- Support for TeX documents.
 
 ;; Maintainer: Per Abrahamsen <auc-tex@sunsite.auc.dk>
-;; Version: 9.7i
+;; Version: 9.7k
 ;; Keywords: wp
 ;; X-URL: http://sunsite.auc.dk/auctex
 
 ;; These two variables are automatically updated with "make dist", so
 ;; be careful before changing anything.
 
-(defconst AUC-TeX-version "9.7i"
+(defconst AUC-TeX-version "9.7k"
   "AUC TeX version number")
 
-(defconst AUC-TeX-date "Thu Feb 20 11:30:55 MET 1997"
+(defconst AUC-TeX-date "Wed Feb 26 23:15:31 MET 1997"
   "AUC TeX release date")
 
 ;;; Buffer
   (interactive)
   (require 'reporter)
   (reporter-submit-bug-report
-   "auc-tex@iesd.auc.dk"
+   "auc-tex@sunsite.auc.dk"
    (concat "AUC TeX " AUC-TeX-version)
    (list 'window-system
 	 'LaTeX-version

lisp/comint/shell.el

 (defvar shell-mode-hook nil
   "*Hook for customising Shell mode.")
 
+
+;; font-locking
+(defvar shell-prompt-face 'shell-prompt-face
+  "Face for shell prompts.")
+(defvar shell-option-face 'shell-option-face
+  "Face for command line options.")
+(defvar shell-output-face 'shell-output-face
+  "Face for generic shell output.")
+(defvar shell-output-2-face 'shell-output-2-face
+  "Face for grep-like output.")
+(defvar shell-output-3-face 'shell-output-3-face
+  "Face for [N] output where N is a number.")
+
+(make-face shell-prompt-face)
+(make-face shell-option-face)
+(make-face shell-output-face)
+(make-face shell-output-2-face)
+(make-face shell-output-3-face)
+
+(defun shell-font-lock-mode-hook ()
+  (or (face-differs-from-default-p shell-prompt-face)
+      (copy-face 'font-lock-keyword-face shell-prompt-face))
+  (or (face-differs-from-default-p shell-option-face)
+      (copy-face 'font-lock-comment-face shell-option-face))
+  (or (face-differs-from-default-p shell-output-face)
+      (copy-face 'italic shell-output-face))
+  (or (face-differs-from-default-p shell-output-2-face)
+      (copy-face 'font-lock-string-face shell-output-2-face))
+  (or (face-differs-from-default-p shell-output-3-face)
+      (copy-face 'font-lock-string-face shell-output-3-face))
+  ;; we only need to do this once
+  (remove-hook 'font-lock-mode-hook 'shell-font-lock-mode-hook))
+(add-hook 'font-lock-mode-hook 'shell-font-lock-mode-hook)
+
+(defvar shell-prompt-pattern-for-font-lock shell-prompt-pattern
+  "Pattern to use to font-lock the prompt.
+Defaults to `shell-prompt-pattern'.")
+
 (defvar shell-font-lock-keywords
-  (list (cons shell-prompt-pattern 'font-lock-keyword-face)
-	'("[ \t]\\([+-][^ \t\n]+\\)" 1 font-lock-comment-face)
-	'("^[^ \t\n]+:.*" . font-lock-string-face)
-	'("^\\[[1-9][0-9]*\\]" . font-lock-string-face))
+  (list (cons 'shell-prompt-pattern-for-font-lock shell-prompt-face)
+	'("[ \t]\\([+-][^ \t\n>]+\\)" 1 shell-option-face)
+	'("^[^ \t\n]+:.*" . shell-output-2-face)
+	'("^\\[[1-9][0-9]*\\]" . shell-output-3-face)
+	'("^[^\n]+.*$" . shell-output-face))
   "Additional expressions to highlight in Shell mode.")
 (put 'shell-mode 'font-lock-defaults '(shell-font-lock-keywords t))
+
 
 ;;; Basic Procedures
 ;;; ===========================================================================

lisp/custom/ChangeLog

+Wed Feb 26 22:17:38 1997  Per Abrahamsen  <abraham@dina.kvl.dk>
+
+	* Version 1.46 released.
+
+Wed Feb 26 12:27:21 1997  Per Abrahamsen  <abraham@dina.kvl.dk>
+
+	* custom.el (emacs): Moved to custom-edit.el.
+	(customize): Ditto.
+	* custom-edit.el: Added customization groups for all finder
+	keywords. 
+	(customize): Add to the appropriate groups.
+	* widget-edit.el (widgets): Ditto.
+	* custom.texi (Usage for Package Authors): Documented it.
+
+	* widget-edit.el (widget-push-button-value-create): Use
+	`device-on-window-system-p' instead of `device-type'.
+
+	* Version 1.45 released.
+
+Wed Feb 26 12:26:30 1997  Per Abrahamsen  <abraham@dina.kvl.dk>
+
+	* widget-edit.el (widget-push-button-value-create): Check that
+	(device-type) is x.
+	Reported by "Tomasz J. Cholewo" <tjchol01@mecca.spd.louisville.edu>.
+	
+Sun Feb 23 21:48:43 1997  Per Abrahamsen  <abraham@dina.kvl.dk>
+
+	* custom-edit.el (customize-face): By default, customize all
+	faces.  
+
 Thu Feb 20 11:55:45 1997  Per Abrahamsen  <abraham@dina.kvl.dk>
 
 	* Version 1.44 released.

lisp/custom/custom-edit.el

 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: help, faces
-;; Version: 1.44
+;; Version: 1.46
 ;; X-URL: http://www.dina.kvl.dk/~abraham/custom/
 
 ;;; Commentary:
   :custom-set :custom-save :custom-reset-current :custom-reset-saved 
   :custom-reset-factory)
 
+;;; Customization Groups.
+
+(defgroup emacs nil
+  "Customization of the One True Editor."
+  :link '(custom-manual "(emacs)Top"))
+
+;; Most of these groups are stolen from `finder.el',
+(defgroup editing nil
+  "Basic text editing facilities."
+  :group 'emacs)
+
+(defgroup abbrev nil
+  "Abbreviation handling, typing shortcuts, macros."
+  :tag "Abbreviations"
+  :group 'editing)
+
+(defgroup matching nil
+  "Various sorts of searching and matching."
+  :group 'editing)
+
+(defgroup emulations nil
+  "Emulations of other editors."
+  :group 'editing)
+
+(defgroup mouse nil
+  "Mouse support."
+  :group 'editing)
+
+(defgroup outlines nil
+  "Support for hierarchical outlining."
+  :group 'editing)
+
+(defgroup external nil
+  "Interfacing to external utilities."
+  :group 'emacs)
+
+(defgroup bib nil
+  "Code related to the `bib' bibliography processor."
+  :tag "Bibliography"
+  :group 'external)
+
+(defgroup processes nil
+  "Process, subshell, compilation, and job control support."
+  :group 'external
+  :group 'development)
+
+(defgroup programming nil
+  "Support for programming in other languages."
+  :group 'emacs)
+
+(defgroup languages nil
+  "Specialized modes for editing programming languages."
+  :group 'programming)
+
+(defgroup lisp nil
+  "Lisp support, including Emacs Lisp."
+  :group 'languages
+  :group 'development)
+
+(defgroup c nil
+  "Support for the C language and related languages."
+  :group 'languages)
+
+(defgroup tools nil
+  "Programming tools."
+  :group 'programming)
+
+(defgroup oop nil
+  "Support for object-oriented programming."
+  :group 'programming)
+
+(defgroup applications nil
+  "Applications written in Emacs."
+  :group 'emacs)
+
+(defgroup calendar nil
+  "Calendar and time management support."
+  :group 'applications)
+
+(defgroup mail nil
+  "Modes for electronic-mail handling."
+  :group 'applications)
+
+(defgroup news nil
+  "Support for netnews reading and posting."
+  :group 'applications)
+
+(defgroup games nil
+  "Games, jokes and amusements."
+  :group 'applications)
+
+(defgroup development nil
+  "Support for further development of Emacs."
+  :group 'emacs)
+
+(defgroup docs nil
+  "Support for Emacs documentation."
+  :group 'development)
+
+(defgroup extensions nil
+  "Emacs Lisp language extensions."
+  :group 'development)
+
+(defgroup internal nil
+  "Code for Emacs internals, build process, defaults."
+  :group 'development)
+
+(defgroup maint nil
+  "Maintenance aids for the Emacs development group."
+  :tag "Maintenance"
+  :group 'development)
+
+(defgroup environment nil
+  "Fitting Emacs with its environment."
+  :group 'emacs)
+
+(defgroup comm nil
+  "Communications, networking, remote access to files."
+  :tag "Communication"
+  :group 'environment)
+
+(defgroup hardware nil
+  "Support for interfacing with exotic hardware."
+  :group 'environment)
+
+(defgroup terminals nil
+  "Support for terminal types."
+  :group 'environment)
+
+(defgroup unix nil
+  "Front-ends/assistants for, or emulators of, UNIX features."
+  :group 'environment)
+
+(defgroup vms nil
+  "Support code for vms."
+  :group 'environment)
+
+(defgroup i18n nil
+  "Internationalization and alternate character-set support."
+  :group 'environment
+  :group 'editing)
+
+(defgroup frames nil
+  "Support for Emacs frames and window systems."
+  :group 'environment)
+
+(defgroup data nil
+  "Support editing files of data."
+  :group 'emacs)
+
+(defgroup wp nil
+  "Word processing."
+  :group 'emacs)
+
+(defgroup tex nil
+  "Code related to the TeX formatter."
+  :group 'wp)
+
+(defgroup faces nil
+  "Support for multiple fonts."
+  :group 'emacs)
+
+(defgroup hypermedia nil
+  "Support for links between text or other media types."
+  :group 'emacs)
+
+(defgroup help nil
+  "Support for on-line help systems."
+  :group 'emacs)
+
+(defgroup local nil
+  "Code local to your site."
+  :group 'emacs)
+
+(defgroup customize '((widgets custom-group))
+  "Customization of the Customization support."
+  :link '(custom-manual "(custom)Top")
+  :link '(url-link :tag "Development Page" 
+		   "http://www.dina.kvl.dk/~abraham/custom/")
+  :prefix "custom-"
+  :group 'help
+  :group 'faces)
+
 ;;; Utilities.
 
 (defun custom-quote (sexp)
   (custom-buffer-create (list (list symbol 'custom-variable))))
 
 ;;;###autoload
-(defun customize-face (symbol)
-  "Customize FACE."
-  (interactive (list (completing-read "Customize face: " 
+(defun customize-face (&optional symbol)
+  "Customize SYMBOL, which should be a face name or nil.
+If SYMBOL is nil, customize all faces."
+  (interactive (list (completing-read "Customize face: (default all) " 
 				      obarray 'custom-facep)))
-  (if (stringp symbol)
-      (setq symbol (intern symbol)))
-  (unless (symbolp symbol)
-    (error "Should be a symbol %S" symbol))
-  (custom-buffer-create (list (list symbol 'custom-face))))
+  (if (or (null symbol) (and (stringp symbol) (zerop (length symbol))))
+      (let ((found nil))
+	(message "Looking for faces...")
+	(mapcar (lambda (symbol)
+		  (setq found (cons (list symbol 'custom-face) found)))
+		(face-list))
+	(message "Creating customization buffer...")
+	(custom-buffer-create found))
+    (if (stringp symbol)
+	(setq symbol (intern symbol)))
+    (unless (symbolp symbol)
+      (error "Should be a symbol %S" symbol))
+    (custom-buffer-create (list (list symbol 'custom-face)))))
 
 ;;;###autoload
 (defun customize-customized ()

lisp/custom/custom-xmas.el

 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: help, faces
-;; Version: 1.44
+;; Version: 1.46
 ;; X-URL: http://www.dina.kvl.dk/~abraham/custom/
 
 ;;; Commentary:
     (color-instance-rgb-components (make-color-instance color))))
 
 ;; Overwrite Emacs definition.
-(defun custom-facep (face) 
-  "Face symbol or object."
-  (or (facep face)
-      (find-face face)))
+(defalias 'custom-facep 'find-face)
 
 ;; Support for special XEmacs font attributes.
 (autoload 'font-create-object "font" nil)

lisp/custom/custom.el

 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: help, faces
-;; Version: 1.44
+;; Version: 1.46
 ;; X-URL: http://www.dina.kvl.dk/~abraham/custom/
 
 ;;; Commentary:
 
 ;;; Meta Customization
 
-(defgroup emacs nil
-  "Customization of the One True Editor."
-  :link '(custom-manual "(emacs)Top"))
-
-(defgroup customize '((widgets custom-group))
-  "Customization of the Customization support."
-  :link '(custom-manual "(custom)Top")
-  :link '(url-link :tag "Development Page" 
-		   "http://www.dina.kvl.dk/~abraham/custom/")
-  :prefix "custom-"
-  :group 'emacs)
-
 (defcustom custom-define-hook nil
   "Hook called after defining each customize option."
   :group 'customize

lisp/custom/widget-browse.el

 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: extensions
-;; Version: 1.44
+;; Version: 1.46
 ;; X-URL: http://www.dina.kvl.dk/~abraham/custom/
 
 ;;; Commentary:

lisp/custom/widget-edit.el

 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: extensions
-;; Version: 1.44
+;; Version: 1.46
 ;; X-URL: http://www.dina.kvl.dk/~abraham/custom/
 
 ;;; Commentary:
   :link '(url-link :tag "Development Page" 
 		   "http://www.dina.kvl.dk/~abraham/custom/")
   :prefix "widget-"
-  :group 'emacs)
+  :group 'help
+  :group 'extensions
+  :group 'faces
+  :group 'hypermedia)
 
 (defface widget-documentation-face '((((class color)
 				       (background dark))
     (if (and (fboundp 'make-gui-button)
 	     (fboundp 'make-glyph)
 	     widget-push-button-gui
+	     (fboundp 'device-on-window-system-p)
+	     (device-on-window-system-p)
 	     (string-match "XEmacs" emacs-version))
 	(progn 
 	  (unless gui

lisp/custom/widget-example.el

 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: help, extensions, faces, hypermedia
-;; Version: 1.44
+;; Version: 1.46
 ;; X-URL: http://www.dina.kvl.dk/~abraham/custom/
 
 (require 'widget)

lisp/custom/widget.el

 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: help, extensions, faces, hypermedia
-;; Version: 1.44
+;; Version: 1.46
 ;; X-URL: http://www.dina.kvl.dk/~abraham/custom/
 
 ;;; Commentary:

lisp/ediff/ediff-init.el

 
 ;;; In-line functions
 
-(or (fboundp 'ediff-file-remote-p) ; user supplied his own function
+(or (fboundp 'ediff-file-remote-p) ; user supplied his own function: use it
     (defun ediff-file-remote-p (file-name)
-      (car (cond ((featurep 'efs) (efs-ftp-path file-name))
-		 ((fboundp 'file-remote-p) (efs-ftp-path file-name))
+      (car (cond ((featurep 'efs-auto) (efs-ftp-path file-name))
+		 ((fboundp 'file-remote-p) (file-remote-p file-name))
 		 (t (require 'ange-ftp)
 		    ;; Can happen only in Emacs, since XEmacs has file-remote-p
 		    (ange-ftp-ftp-name file-name))))))

lisp/efs/ange-ftp.el

+;;; ange-ftp.el --- Stub for EFS-enabled XEmacs
+
+;; Copyright (C) 1997 by Steven L Baur
+
+;; Author: Steven L Baur <steve@altair.xemacs.org>
+;; Keywords: extensions
+
+;; This file is part of XEmacs.
+
+;; XEmacs 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 2, or (at your option)
+;; any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with XEmacs; see the file COPYING.  If not, write to the Free
+;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+;; 02111-1307, USA.
+
+;;; Synched up with: Not in FSF
+
+;;; Commentary:
+
+;; Compatibility module for users who still attempt to reference the
+;; obsolete ange-ftp.
+
+;;; Code:
+
+(require 'efs-auto)
+(warn "ange-ftp is obsolete, using efs-auto")
+
+(provide 'ange-ftp)
+
+;;; ange-ftp.el ends here

lisp/hm--html-menus/ANNOUNCEMENT

 Hello,
 
-I've written a new version (5.2) of my html package for the XEmacs 
+I've written a new version (5.3) of my html package for the XEmacs 
 and the GNU Emacs 19. The name of the package is:
 
-		 hm--html-menus-5.2.tar.gz
+		 hm--html-menus-5.3.tar.gz
 
 With this package it is very easy to write html pages for the World Wide 
 Web (WWW). Eg: In most cases the user gets help to construct a specific 
 - a lot of bug fixes
 Read the NEWS file to see news in detail...
 
-You should find hm--html-menus-5.2.tar.gz on the following ftp server:
+You should find hm--html-menus-5.3.tar.gz on the following ftp server:
 	sunsite.unc.edu in /pub/Linux/apps/editors/emacs/
 	ftp.rrzn.uni-hannover.de in /pub/unix/editors/lemacs/contrib
 	ftp.tnt.uni-hannover.de in /pub/editors/xemacs/contrib
 There is also a html documentation about the package. You can find it on:
 http://www.tnt.uni-hannover.de/~muenkel/software/own/hm--html-menus/overview.html
 
+This package provides also a minor mode (hm--html-minor-mode), which
+can be used together with another html major mode, like the psgml-html
+mode in the XEmacs 19.14.
+
 NOTE: This version is not tested with the Emacs 19. One of the next
 releases in the near future will be a bug fix only release for the
 Emacs 19. So please report any bugs to muenkel@tnt.uni-hannover.de.

lisp/hm--html-menus/NEWS

+25.02.97
+	Fixed two bugs, which occured during loading the mode
+	after the psgml-html-mode.
+	In the minor mode, the HM--HTML menu will now be added before
+	the HTML menu.
+	Due to a patch of psgm-html.el it is now possible to call the minor
+	mode from a hook variable in the html-mode and the html3-mode.
+	-- BUILDED the version 5.3 of the package --
+22.02.97
+	Fixed 'hm--html-add-strikethru-to-region'.
+	Changed `hm--html-view-www-package-docu' for the new location
+	of the package documentation.
+	Moved all functions, which added obsolete or non HTML 3.2 elements,
+	to hm--html-not-standard.el. This file is not used by default.
+	Therefore this mode fulfils now the whole HTML 3.2 standard!
+	Added keybindings for new html functions.
+	Changed some old keybindings.
+	Moved the menu items for inserting HTML comments to the
+	"Formating Paragraphs" menu.
+	Fixed a bug in the function `hm--html-add-meta'.
+	The variable `indent-line-function' is now local in all
+	hm--html-mode buffers. This fixed the bug, that the hm--html-mode
+	had set the indentation function to `hm--html-indent-line' global.
+	Added the html elements STYLE and SCRIPT.
+	-- 23:20: My doughter Sarah Madeleine is born! --
 18.02.97
 	Fixed a compilation bug.
-	-- BUILDED the version 5.2 of the package
+	-- BUILDED the version 5.2 of the package --
 17.02.97
 	Changed the function `hm--html-read-alignment' according to the
 	HTML version 3.2.
 	variable `hm--html-disable-indentation' to t.
 	Fixed the long annoying bug, that the directory in the pop up
 	frame for selecting the template file was wrong in most cases.
-	-- BUILDED the version 5.1 of the package
+	-- BUILDED the version 5.1 of the package --
 11.02.97:
 	Changed the whole indentation stuff. It is now all working -
 	with the exceptions, that the list `hm--html-tag-name-alist'
 	Added the drag and drop command to the pop up menus.
 15.08.96:
 	The items of the menu "Set popup menu" are now radio items.
-	-- BUILDED the version 5.0 of the package
+	-- BUILDED the version 5.0 of the package --
 03.08.96:
 	Applied a patch from Jerry G. DeLapp <jgd@lanl.gov> to
 	`html-font-lock-keywords'.
 01.03.96:
 	Added the function `tmpl-insert-template-file'.
 18.02.96:
-	-- BUILDED the version 4.16 of the package
+	-- BUILDED the version 4.16 of the package --
 17.02.96:
 	Added the mailto link.
 03.02.96:

lisp/hm--html-menus/README

-This README file describes the emacs lisp package hm--html-menus-5.2.
+This README file describes the emacs lisp package hm--html-menus-5.3.
 
 The package provides functions and various popup and pulldown menus
 for a html mode called hm--html-mode, a mode for writing html pages.
+It provides also a minor mode (hm--html-minor-mode), which can be used
+together with another html major mode, like the psgml-html mode in the
+XEmacs 19.14.
 
 It has an interface to view the html documents in a W3 browser with
 Netscape, the w3-package from William M. Perry and Mosaic with the
 only UNIX ?) platforms.
 
 NOTE: The current release isn't tested with the Emacs 19 (5.0 is but
-5.1 and 5.2 are not). One of the next releases in the near future :-) will be a
+5.1 to 5.3 are not). One of the next releases in the near future :-) will be a
 bug fix only release for the Emacs 19. So please report any bugs to
 muenkel@tnt.uni-hannover.de to shorten the time until the Emacs 19
 related bugs are fixed.
 adapt.el			: provides functions to use this package 
 				  with the GNU Emacs 19
 hm--html.el			: provides functions to write html pages;
-				  some of these functions are similar to
-				  functions of the html-mode.el;
+				  in this file are all commands defined,
+				  which inserts html elements and entities;
 hm--html-indentation.el		: provides the indentation stuff;
 hm--html-keys.el		: provides the keybindings;
 hm--html-menu.el		: provides the menus;
 hm--html-mode.el		: provides the functions for the definition
 				  of the hm--html-mode; this is now the
 				  main file of the package;
+hm--html-not-standard.el	: provides functions to insert some
+				  non standard hteml elements;
+				  this file is not evaluated by default;
 hm--html-configuration.el	: configuration file for the html mode;
 				  choose this as system configuration file;
 hm--html-drag-and-drop.el	: defines the HTML- specific functions
 Note: In this version the setting of the environment variables 
 HTML_CONFIG_FILE and HTML_USER_CONFIG_FILE are no longer necessary,
 if you put the user configuration file in the home directrory and
-the system (site) configuration file in one of the load path directories
-of your xemacs or GNU Emacs 19.
+the system configuration file in one of the load path directories
+of your XEmacs or Emacs 19.
 
 1. 	Put all the *.el files in one of your xemacs (or emacs) lisp load
         directories (i.e. lisp/packages).
 	It could also be, that you've already the autoload lines for
         the w3 package in your emacs.
 
+	If you want to use this the hm--html-minor-mode together
+	with the psgml-html modes, then you should add the following
+	line (works only in XEmacs version >= 19.15 and != 20.0)
+	(add-hook 'html-mode-hook 'hm--html-minor-mode)
+
 3.	Set (if you want) the environment variable HTML_CONFIG_FILE 
 	to the html system configuration file i.e.:	
 	setenv HTML_CONFIG_FILE /usr/xemacs/lisp/hm--html-configuration.el

lisp/hm--html-menus/command-description.tmpl

Binary file removed.

lisp/hm--html-menus/frame.tmpl

Binary file removed.

lisp/hm--html-menus/hm--html-configuration.el

 ;;; hm--html-configuration.el - Configurationfile for the html-mode
 ;;;
-;;; $Id: hm--html-configuration.el,v 1.3 1997/02/24 01:13:26 steve Exp $
+;;; $Id: hm--html-configuration.el,v 1.4 1997/02/27 06:08:08 steve Exp $
 ;;;
 ;;; Copyright (C) 1993 - 1997  Heiko Muenkel
 ;;; email: muenkel@tnt.uni-hannover.de
      (:hm--html-optional-attributes (size color)))
     ("map" (:hm--html-two-element-tag t)
      (:hm--html-required-attributes (name)))
+    ("style" (:hm--html-two-element-tag t))
+    ("script" (:hm--html-two-element-tag t))
     )
   "An alist with tag names known by the `hm--html-mode'.
 CURRENTLY THIS LIST CONTAINS NOT ALL TAGS!!!!.

lisp/hm--html-menus/hm--html-keys.el

-;;; $Id: hm--html-keys.el,v 1.3 1997/02/24 01:13:27 steve Exp $
+;;; $Id: hm--html-keys.el,v 1.4 1997/02/27 06:08:09 steve Exp $
 ;;; 
 ;;; Copyright (C) 1995, 1996, 1997 Heiko Muenkel
 ;;; email: muenkel@tnt.uni-hannover.de
   (define-key hm--html-noregion-anchor-map "\C-f" 'hm--html-add-ftp-link)
   (define-key hm--html-noregion-anchor-map "n" 'hm--html-add-news-link)
   (define-key hm--html-noregion-anchor-map "m" 'hm--html-add-mail-link)
-;  (define-key hm--html-noregion-anchor-map "\C-m" 'hm--html-add-mailto-link)
   (define-key hm--html-noregion-anchor-map 
     [(control m)] 'hm--html-add-mailto-link)
   (define-key hm--html-noregion-anchor-map "w" 'hm--html-add-direct-wais-link)
     "\C-f" 'hm--html-add-ftp-link-to-region)
   (define-key hm--html-region-anchor-map "n" 'hm--html-add-news-link-to-region)
   (define-key hm--html-region-anchor-map "m" 'hm--html-add-mail-link-to-region)
-;  (define-key hm--html-region-anchor-map 
-;    "\C-m" 'hm--html-add-mailto-link-to-region)
   (define-key hm--html-region-anchor-map
     [(control m)] 'hm--html-add-mailto-link-to-region)
   (define-key hm--html-region-anchor-map 
     ()
   (setq	hm--html-noregion-frame-map (make-sparse-keymap))
   (define-key hm--html-noregion-frame-map "f" 'hm--html-add-full-html-frame)
+  (define-key hm--html-noregion-frame-map [(control d)] 'hm--html-add-doctype)
   (define-key hm--html-noregion-frame-map [(control h)] 'hm--html-add-html) 
   (define-key hm--html-noregion-frame-map [(meta h)] 'hm--html-add-head)
   (define-key hm--html-noregion-frame-map "b" 'hm--html-add-body)
     [(control t)] 'hm--html-add-title-and-header)
   (define-key hm--html-noregion-frame-map "t" 'hm--html-add-title)
   (define-key hm--html-noregion-frame-map "h" 'hm--html-add-header)
+  (define-key hm--html-noregion-frame-map "m" 'hm--html-add-meta)
   (define-key hm--html-noregion-frame-map "n" 'hm--html-add-normal-node-link)
+  (define-key hm--html-noregion-frame-map "i" 'hm--html-add-isindex)
+  (define-key hm--html-noregion-frame-map [(meta d)] 'hm--html-add-base)
   (define-key hm--html-noregion-frame-map "a" 'hm--html-add-address)
   (define-key hm--html-noregion-frame-map "s" 'hm--html-add-signature)
   (define-key hm--html-noregion-frame-map 
   (define-key hm--html-noregion-structure-map "p" 'hm--html-add-paragraph)
   (define-key hm--html-noregion-structure-map 
     "\C-p" 'hm--html-add-paragraph-separator)
+  (define-key hm--html-noregion-structure-map
+    [(meta d)] 'hm--html-add-document-division)
   (define-key hm--html-noregion-structure-map "\C-m" 'hm--html-add-line-break)
   (define-key hm--html-noregion-structure-map 
     "h" 'hm--html-add-horizontal-rule)
   (define-key hm--html-region-structure-map 
     "o" 'hm--html-add-numberlist-to-region)
   (define-key hm--html-region-structure-map 
-    "d" 'hm--html-add-directory-list-to-region)
+    "d" 'hm--html-add-directorylist-to-region)
   (define-key hm--html-region-structure-map 
     "\C-dl" 'hm--html-add-description-list-to-region)
   (define-key hm--html-region-structure-map 
     "\C-dt" 'hm--html-add-description-title-to-region)
   (define-key hm--html-region-structure-map 
     "\C-de" 'hm--html-add-description-entry-to-region)
-;  (define-key hm--html-region-structure-map 
-;    "\C-d\C-t" 'html-add-description-title-and-entry-to-region))
   (define-key hm--html-region-structure-map
     "\C-tt" 'hm--html-add-table-to-region)
   (define-key hm--html-region-structure-map 
     "\C-t\C-t" 'hm--html-add-table-title-to-region)
   (define-key hm--html-region-structure-map 
     "p" 'hm--html-add-paragraph-to-region)
+  (define-key hm--html-region-structure-map
+    [(meta d)] 'hm--html-add-document-division-to-region)
   )
 
 (defvar hm--html-noregion-formating-paragraph-map nil
 (if hm--html-noregion-formating-paragraph-map
     ()
   (setq hm--html-noregion-formating-paragraph-map (make-sparse-keymap))
+;  (define-key hm--html-noregion-formating-paragraph-map
+;    "o" 'hm--html-add-plaintext)
   (define-key hm--html-noregion-formating-paragraph-map
-    "o" 'hm--html-add-plaintext)
-  (define-key hm--html-noregion-formating-paragraph-map
-    "w" 'hm--html-add-preformated)
+    "p" 'hm--html-add-preformated)
   (define-key hm--html-noregion-formating-paragraph-map
     "b" 'hm--html-add-blockquote)
   (define-key hm--html-noregion-formating-paragraph-map
-    "l" 'hm--html-add-listing)
+    "C-b" 'hm--html-add-basefont)
   (define-key hm--html-noregion-formating-paragraph-map
-    "a" 'hm--html-add-abstract)
+    "f" 'hm--html-add-font)
+  (define-key hm--html-noregion-formating-paragraph-map
+    "c" 'hm--html-add-center)
+  (define-key hm--html-noregion-formating-paragraph-map
+    "C-c" 'hm--html-add-comment-to-region)
+;  (define-key hm--html-noregion-formating-paragraph-map
+;    "l" 'hm--html-add-listing)
+;  (define-key hm--html-noregion-formating-paragraph-map
+;    "a" 'hm--html-add-abstract)
   )
 
 (defvar hm--html-region-formating-paragraph-map nil
 (if hm--html-region-formating-paragraph-map
     ()
   (setq hm--html-region-formating-paragraph-map (make-sparse-keymap))
+;  (define-key hm--html-region-formating-paragraph-map
+;    "o" 'hm--html-add-plaintext-to-region)
   (define-key hm--html-region-formating-paragraph-map
-    "o" 'hm--html-add-plaintext-to-region)
-  (define-key hm--html-region-formating-paragraph-map
-    "w" 'hm--html-add-preformated-to-region)
+    "p" 'hm--html-add-preformated-to-region)
   (define-key hm--html-region-formating-paragraph-map
     "b" 'hm--html-add-blockquote-to-region)
   (define-key hm--html-region-formating-paragraph-map
-    "l" 'hm--html-add-listing-to-region)
+    "C-b" 'hm--html-add-basefont-to-region)
   (define-key hm--html-region-formating-paragraph-map
-    "a" 'hm--html-add-abstract-to-region)
+    "f" 'hm--html-add-font-to-region)
+  (define-key hm--html-region-formating-paragraph-map
+    "c" 'hm--html-add-center-to-region)
+  (define-key hm--html-region-formating-paragraph-map
+    "C-c" 'hm--html-add-comment-to-region)
+;  (define-key hm--html-region-formating-paragraph-map
+;    "l" 'hm--html-add-listing-to-region)
+;  (define-key hm--html-region-formating-paragraph-map
+;    "a" 'hm--html-add-abstract-to-region)
   )
 
 (defvar hm--html-noregion-formating-word-map nil
 (if hm--html-noregion-include-map
     ()
   (setq hm--html-noregion-include-map (make-sparse-keymap))
-  (define-key hm--html-noregion-include-map "t" 'hm--html-add-image-top)
-  (define-key hm--html-noregion-include-map "m" 'hm--html-add-image-middle)
-  (define-key hm--html-noregion-include-map "b" 'hm--html-add-image-bottom)
+  (define-key hm--html-noregion-include-map
+    [(control i) (t)] 'hm--html-add-image-top)
+  (define-key hm--html-noregion-include-map
+    [(control i) (m)] 'hm--html-add-image-middle)
+  (define-key hm--html-noregion-include-map
+    [(control i) (b)] 'hm--html-add-image-bottom)
+  (define-key hm--html-noregion-include-map "i" 'hm--html-add-image)
+  (define-key hm--html-noregion-include-map [(meta i)] 'hm--html-add-image-map)
+  (define-key hm--html-noregion-include-map "m" 'hm--html-add-map)
+  (define-key hm--html-noregion-include-map [(control a)] 'hm--html-add-area)
   (define-key hm--html-noregion-include-map "a" 'hm--html-add-applet)
-  (define-key hm--html-noregion-include-map "p" 'hm--html-add-applet)
+  (define-key hm--html-noregion-include-map "p" 'hm--html-add-applet-parameter)
   )
 
 (defvar hm--html-region-include-map nil
 (if hm--html-region-include-map
     ()
   (setq hm--html-region-include-map (make-sparse-keymap))
+  (define-key hm--html-region-include-map "m" 'hm--html-add-map-to-region)
+  (define-key hm--html-region-include-map "a" 'hm--html-add-applet-to-region)
   )
 
 ;(defvar hm--html-noregion-text-elements-map nil

lisp/hm--html-menus/hm--html-menu.el

 ;;;  hm--html-menu ---  A menu for the hm--html-mode.
 ;;;  
-;;;  $Id: hm--html-menu.el,v 1.3 1997/02/24 01:13:27 steve Exp $
+;;;  $Id: hm--html-menu.el,v 1.4 1997/02/27 06:08:09 steve Exp $
 ;;;
 ;;;  Copyright (C) 1993 - 1997  Heiko Muenkel
 ;;;  email: muenkel@tnt.uni-hannover.de
 	  ["Horizontal rule" hm--html-add-horizontal-rule t]
 	  )
 	 ("Formating Paragraphs"
-	  ["Without links" hm--html-add-plaintext t]
-	  ["With links" hm--html-add-preformated t]
+;	  ["Without links" hm--html-add-plaintext t]
+	  ["Preformated" hm--html-add-preformated t]
+          ["Blockquote" hm--html-add-blockquote t]
 	  "----"
 	  ["Basefont..." hm--html-add-basefont t]
 	  ["Font..." hm--html-add-font t]
-          ["Blockquote" hm--html-add-blockquote t]
-	  ["Listing" hm--html-add-listing t]
-	  ["Abstract" hm--html-add-abstract t]
+	  ["Center" hm--html-add-center t]
+	  ["Style" hm--html-add-style t]
 	  "----"
-	  ["Center" hm--html-add-center t]
+	  ["HTML Comment" hm--html-add-comment t]
+;	  ["Listing" hm--html-add-listing t]
+;	  ["Abstract" hm--html-add-abstract t]
 	  )
 	 ("Formatting Words"
 	  ["Bold" hm--html-add-bold t]
 	  "----"
 	  ["Underline" hm--html-add-underline t]
 	  ["Strikethru" hm--html-add-strikethru t]
-	  ;;	  ["Render" hm--html-add-render t]
 	  "----"
 ;          ["Emphasized" hm--html-add-emphasized t]
 ;          ["Strong" hm--html-add-strong t]
 	   )
 ;; All the following commands are still implemented, but most
 ;; of them are not defined in HTM 3.2
+;; You've to load hm--html-not-standard.el to use them
 ;	  ("Computing"
 ;	   ["Definition" hm--html-add-definition t]
 ;	   ["Keyboard" hm--html-add-keyboard t]
 ;	  "----"
 ;	  ["Footnote" hm--html-add-footnote t]
 ;	  ["Margin" hm--html-add-margin t]
-	  "----"
-	  ["HTML Comment" hm--html-add-comment t]
+;	  "----"
+;	  ["HTML Comment" hm--html-add-comment t]
 	  )
 	 ("Include"
 	  ["Top aligned image..." hm--html-add-image-top t]
 	  "----"
 	  ["Applet..." hm--html-add-applet t]
 	  ["Parameter..." hm--html-add-applet-parameter t]
+	  ["Script" hm--html-add-script t]
 ;	  "----"
 ;	  ["File..."  hm--html-add-server-side-include-file t]
 ;	  ["Command..." hm--html-add-server-side-include-command t]
 	  ["Paragraph Container" hm--html-add-paragraph t]
 	  )
 	 ("Formating Paragraphs"
-	  ["Without links" hm--html-add-plaintext t]
-	  ["With links" hm--html-add-preformated t]
+;	  ["Without links" hm--html-add-plaintext t]
+	  ["Preformated" hm--html-add-preformated t]
 	  )
 	 ("Formatting Words"
 	  ["Bold" hm--html-add-bold t]
 	  ["Document division" hm--html-add-document-division-to-region t]
 	  )
 	 ("Formatting Paragraphs"
-	  ["Without links" hm--html-add-plaintext-to-region t]
-	  ["With links" hm--html-add-preformated-to-region t]
+;	  ["Without links" hm--html-add-plaintext-to-region t]
+	  ["Preformated" hm--html-add-preformated-to-region t]
+          ["Blockquote" hm--html-add-blockquote-to-region t]
 	  "----"
 	  ["Font..." hm--html-add-font-to-region t]
-          ["Blockquote" hm--html-add-blockquote-to-region t]
-	  ["Listing" hm--html-add-listing-to-region t]
-	  ["Abstract" hm--html-add-abstract-to-region t]
+	  ["Center" hm--html-add-center-to-region t]
+	  ["Style" hm--html-add-style-to-region t]
 	  "----"
-	  ["Center" hm--html-add-center-to-region t]
+	  ["HTML Comment" hm--html-add-comment-to-region t]
+;	  ["Listing" hm--html-add-listing-to-region t]
+;	  ["Abstract" hm--html-add-abstract-to-region t]
 	  )
 	 ("Formatting Words"
 	  ["Bold" hm--html-add-bold-to-region t]
 ;	  "----"
 ;	  ["Footnote" hm--html-add-footnote-to-region t]
 ;	  ["Margin" hm--html-add-margin-to-region t]
-	  "----"
-	  ["HTML Comment" hm--html-add-comment-to-region t]
+;	  "----"
+;	  ["HTML Comment" hm--html-add-comment-to-region t]
 	  )
 	 ("Include"
 	  ["Map..." hm--html-add-map-to-region t]
 	  "----"
 	  ["Applet..." hm--html-add-applet-to-region t]
+	  ["Script" hm--html-add-script-to-region t]
 	  )
 	 ("Forms"
 	  ["Form..." hm--html-add-form-to-region t])
 	  ["Menu" hm--html-add-menu-to-region t]
 	  )
 	 ("Formatting Paragraphs"
-	  ["Without links" hm--html-add-plaintext-to-region t]
-	  ["With links" hm--html-add-preformated-to-region t]
+;	  ["Without links" hm--html-add-plaintext-to-region t]
+	  ["Preformated" hm--html-add-preformated-to-region t]
 	  )
 	 ("Formatting Words"
 	  ["Bold" hm--html-add-bold-to-region t]
 	  :active t
 	  :style radio
 	  :selected hm--html-expert]
-;	 ["Marcs menu" hm--html-use-marcs-menu t]
 	 )
 	["Reload config files" hm--html-load-config-files t]
 	["Templates (fixed dirs) ..."
       (if (and current-menubar (not (assoc menu-name current-menubar)))
 	  (progn
 	    (set-buffer-menubar (copy-sequence current-menubar))
-	    (add-menu nil menu-name (cdr hm--html-pulldown-menu))))) 
+	    (add-submenu nil (cons menu-name (cdr hm--html-pulldown-menu)) "HTML"))))
 
   (defun hm--install-html-menu (menu-name)
     (if (eq major-mode 'hm--html-mode)
 			"The hm--html-minor-mode pulldown menu."
 			(cons menu-name
 			      (cdr hm--html-pulldown-menu))))
-;    (easy-menu-define hm--html-region-menu-map
-;		      hm--html-region-mode-map
-;		      "The hm--html-mode pulldown menu, if a region is active."
-;		      (cons menu-name
-;			    (cdr hm--html-pulldown-menu)))
-;    (if (and current-menubar (not (assoc "HTML" current-menubar)))
-;	(progn
-;	  (set-buffer-menubar current-menubar)
-;	  ))
-;    (add-menu nil "HTML" (cdr hm--html-pulldown-menu))
     ))
 
 (if (adapt-emacs19p)
 	(x-popup-menu nil hm--html-menu-region-novice-map))
 
 
-;      (defun hm--html-emacs19-popup-menu (menu event)
-;	(let ((pos (posn-x-y (event-end event)))
-;	      (window (posn-window (event-start event)))
-;	      (answer))
-;	  (while menu
-;	    (setq answer (x-popup-menu (list (list (car pos) (cdr pos))
-;					     window)
-;				       menu))
-;	    (setq cmd (lookup-key menu (apply 'vector answer)))
-;	    (setq menu nil)
-;	    (and cmd
-;		 (if (keymapp cmd)
-;		     (setq menu cmd)
-;		   (call-interactively cmd))))))
-
-;      (defun hm--html-popup-menu (event)
-;	"Pops the HTML- menu up, if no region is active."
-;	(interactive "@e")
-;	(if hm--html-expert
-;	    (hm--html-emacs19-popup-menu hm--html-menu-noregion-expert-map
-;					 event)
-;	  (hm--html-emacs19-popup-menu hm--html-menu-noregion-novice-map
-;				       event)))
-
-;      (defun hm--html-popup-menu-region (event)
-;	"Pops the HTML- menu up, if a region is active."
-;	(interactive "@e")
-;	(if hm--html-expert
-;	    (hm--html-emacs19-popup-menu hm--html-menu-region-expert-map
-;					 event)
-;	  (hm--html-emacs19-popup-menu hm--html-menu-region-novice-map
-;				       event)))
       )
 
   (defun hm--html-popup-menu (event)
     "Pops the HTML- menu up, if no region is active."
     (interactive "@e")
-;  (if hm--html-marc
-;      (popup-menu html-menu)
     (if hm--html-expert
 	(popup-menu hm--html-menu-noregion-expert)
       (popup-menu hm--html-menu-noregion-novice)))
-;)
 
 
   (defun hm--html-popup-menu-region (event)
     "Pops the HTML- menu up, if a region is active."
     (interactive "@e")
-;  (if hm--html-marc
-;      (popup-menu html-menu)
     (if hm--html-expert
 	(popup-menu hm--html-menu-region-expert)
       (popup-menu hm--html-menu-region-novice)))
-;)
   )
 
 
 	"Changes the HTML popup menu to the novice menu."
 	(interactive)
 	(setq hm--html-expert nil)
-;  (setq hm--html-marc nil)
-;  (define-key html-mode-map '(button3) 'hm--popup-html-menu)
-;  (define-key html-region-mode-map '(button3) 'hm--popup-html-menu)
 	)	
 
 
 	"Changes the HTML popup menu to the expert menu."
 	(interactive)
 	(setq hm--html-expert t)
-;  (setq hm--html-marc nil)
-;  (define-key html-mode-map '(button3) 'hm--popup-html-menu)
-;  (define-key html-region-mode-map '(button3) 'hm--popup-html-menu)
 	)
       )
 
     )
   )
 
-;(defun hm--html-use-marcs-menu ()
-;  "Changes the HTML popup menu to Marc Andreessens menu."
-;  (interactive)
-;  (setq hm--html-marc t)
-;  )
-
-
-;(define-key html-mode-map '(button3) 'hm--popup-html-menu)
-;(define-key html-region-mode-map '(button3) 'hm--popup-html-menu)
-
-;(add-hook 'html-mode-hook 'hm--install-html-menu)
-
-
-;(defun sgml-popup-menu (event title entries)
-;  "Display a popup menu."
-;  (setq entries
-;	(loop for ent in entries collect
-;	      (vector (car ent)
-;		      (list 'setq 'value (list 'quote (cdr ent)))
-;		      t)))
-;  (cond ((> (length entries) sgml-max-menu-size)
-;	 (setq entries
-;	       (loop for i from 1 while entries collect
-;		     (let ((submenu
-;			    (subseq entries 0 (min (length entries)
-;						   sgml-max-menu-size))))
-;		       (setq entries (nthcdr sgml-max-menu-size
-;					     entries))
-;		       (cons
-;			(format "%s '%s'-'%s'"
-;				title
-;				(sgml-range-indicator (aref (car submenu) 0))
-;				(sgml-range-indicator
-;				 (aref (car (last submenu)) 0)))
-;			submenu))))))  
-;;  (sgml-xemacs-get-popup-value (cons title entries)))
-;  (sgml-xemacs-get-popup-value (append hm--html-popup-menu
-;				       (list "--" "--" title "==")
-;				       entries)))
 
 (defvar hm--html-use-psgml t
   "Set this to t, if functions from the psgml-mode should be used.")
       ))
 
 
-;(defvar hm--html-menu-load-hook nil
-;  "*Hook variable to execute functions after loading the file hm--html-menu.")
-
-
 (run-hooks 'hm--html-menu-load-hook)
 
 

lisp/hm--html-menus/hm--html-mode.el

 ;;;
 ;;; Keywords: hypermedia languages help docs wp
 ;;;
-;;; $Id: hm--html-mode.el,v 1.3 1997/02/24 01:13:27 steve Exp $
+;;; $Id: hm--html-mode.el,v 1.4 1997/02/27 06:08:09 steve Exp $
 ;;;
 ;;; Copyright (C) 1996, 1997 Heiko Muenkel
 ;;; email: muenkel@tnt.uni-hannover.de
 ;;;	(setq auto-mode-alist (cons '("\\.html$" . hm--html-mode) 
 ;;;				        auto-mode-alist))
 ;;;
+;;;	But you can also use the hm--html-minor-mode as an addition to
+;;;	the psgml html modes. For that you've to put the following line in
+;;;	your .emacs:
+;;;	(add-hook 'html-mode-hook 'hm--html-minor-mode)
+;;;
+;;;	Note: This works only in an XEmacs version greater than 19.14 and
+;;;	also not in the XEmacs 20.0.
+;;;
 ;;;	Look at the file hm--html-configuration for further installation
 ;;;     points.
 ;;;	
 (require 'adapt)
 (require 'hm--date)
 (require 'hm--html)
+
 (eval-when-compile
   (require 'hm--html-configuration))
+
 (hm--html-load-config-files)
 (require 'hm--html-indentation)
+(require 'hm--html-keys)
+
+(defvar hm--html-minor-mode nil
+  "Non-nil, if the `hm--html-minor-mode' is active.")
+
 (require 'hm--html-menu)
 (require 'hm--html-drag-and-drop)
-(require 'hm--html-keys)
 
 
 ;;; The package version
 
 (defconst hm--html-menus-package-name "hm--html-menus")
 
-(defconst hm--html-menus-package-version "5.2")
+(defconst hm--html-menus-package-version "5.3")
   
 
 ;;; Generate the help buffer faces
   (setq comment-start "<!--" comment-end "-->")
   (make-local-variable 'sentence-end)
   (setq sentence-end "[<>.?!][]\"')}]*\\($\\| $\\|\t\\|  \\)[ \t\n]*")
+  (make-local-variable 'indent-line-function)
   (setq indent-line-function 'hm--html-indent-line)
   (setq idd-actions hm--html-idd-actions)
   (hm--install-html-menu hm--html-mode-pulldown-menu-name)
 
 
 ;;; hm--html-minor-mode
-
-(defvar hm--html-minor-mode nil
-  "Non-nil, if the `hm--html-minor-mode' is active.")
-
 (make-variable-buffer-local 'hm--html-minor-mode)
 
 (add-minor-mode 'hm--html-minor-mode " HM-HTML" hm--html-minor-mode-map)

lisp/hm--html-menus/hm--html.el

-;;; $Id: hm--html.el,v 1.3 1997/02/24 01:13:28 steve Exp $
+;;; $Id: hm--html.el,v 1.4 1997/02/27 06:08:10 steve Exp $
 ;;;
 ;;; Copyright (C) 1993 - 1997  Heiko Muenkel
 ;;; email: muenkel@tnt.uni-hannover.de
       (goto-char end)
       (eval (list function-insert-end-tag end-tag))
       (goto-char start)
-;      (backward-char (+ (length end-tag) (- end start)))
       (eval (list function-insert-start-tag start-tag))
       (if function-insert-middle-tag
 	  (eval (list function-insert-middle-tag middle-tag)))
   (let ((start (point)))
     (insert tag)
     (hm--html-indent-region start (point))))
-;    (html-maybe-deemphasize-region start (- (point) 1))))
 
 
 (defun hm--html-insert-end-tag (tag)
   (let ((start (point)))
     (insert tag)
     (hm--html-indent-region start (point))))
-;    (html-maybe-deemphasize-region start (- (point) 1))))
 
 
 (defun hm--html-insert-start-tag-with-newline (tag)
       (setq head-end-point (when (re-search-forward
 				  "\\(</head\\)\\|\\(<body\\)\\|\\(</html\\)")
 			     (beginning-of-line)
-			     (point))))
-    (goto-char point)
-    (hm--html-search-place-for-element-in-head head-end-point)
-    (hm--html-add-tags 'hm--html-insert-start-tag
-		       (concat "<META "
-			       (if name-instead-of-http-equiv
-				   "NAME=\""
-				 "HTTP-EQUIV=\"")
-			       name
-			       "\" CONTENT=\""
-			       content
-			       "\">"))))
+			     (point)))
+      (goto-char point)
+      (hm--html-search-place-for-element-in-head head-end-point)
+      (hm--html-add-tags 'hm--html-insert-start-tag
+			 (concat "<META "
+				 (if name-instead-of-http-equiv
+				     "NAME=\""
+				   "HTTP-EQUIV=\"")
+				 name
+				 "\" CONTENT=\""
+				 content
+				 "\">")))))
 
 
 ;;; Functions which include something in HTML- documents
     (if (string= file "")
 	(error "ERROR: No filename specified !")
       (insert "<INC SRV \"" file "\">"))))
-;      (html-maybe-deemphasize-region (1+ start) (1- (point))))))
   
 
 (defun hm--html-add-server-side-include-command-with-isindex-parameter 
       (if (= ?| (string-to-char command))
 	  (insert "<INC " attribute" \"" command "\">")
 	(insert "<INC " attribute " \"|" command "\">")))))
-;	(html-maybe-deemphasize-region (1+ start) (1- (point)))))))
-  
-
-;(defun hm--html-add-server-side-include-command-with-parameter (command 
-;								parameter)
-;  "This function adds a server side include command directive in the buffer.
-;The directive is only supported by the NCSA http daemon."
-;  (interactive (list 
-;		(completing-read 
-;		 "Include Command: "
-;		 hm--html-server-side-include-command-with-parameter-alist)
-;		(read-string "Parameterlist sepearted by '?': ")))
-;  (let ((start (point)))
-;    (if (string= command "")
-;	(error "ERROR: No command specified !")
-;      (if (string= parameter "")
-;	  (error "ERROR: No parameter specified !")
-;	(if (= ?| (string-to-char command))
-;	    (if (= ?? (string-to-char parameter))
-;		(insert "<INC SRVURL \"" command parameter "\">")
-;	      (insert "<INC SRVURL \"" command "?" parameter "\">"))
-;	  (if (= ?? (string-to-char parameter))
-;	      (insert "<INC SRVURL \"|" command parameter "\">")
-;	    (insert "<INC SRVURL \"|" command "?" parameter "\">")))
-;	(html-maybe-deemphasize-region (1+ start) (1- (point)))))))
-  
 
 
 ;;; Functions, which adds tags of the form <starttag> ... </endtag>
 			       "</PRE>"))
 
 
-(defun hm--html-add-plaintext ()
-  "Adds the HTML tags for plaintext."
-  (interactive)
-  (hm--html-add-tags 'hm--html-insert-start-tag-with-newline
-		     "<XMP>"
-		     'hm--html-insert-end-tag-with-newline
-		     "</XMP>"))
-
-
-(defun hm--html-add-plaintext-to-region ()
-  "Adds the HTML tags for plaintext to the region."