merge trunk

7 files changed, 563 insertions, 286 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 70e002f0f9e..84754efb148 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-13  Michael Albinus  <michael.albinus@gmx.de>
+
+        * NEWS: Some Tramp methods are discontinued.
+
+2010-09-11  Glenn Morris  <rgm@gnu.org>
+
+        * emacs.bash, emacs.csh, ms-kermit: Remove obsolete files (use
+        emacsclient -a instead of the first two).
+
+2010-09-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * NEWS: Mention the new libxml2 functions.
+
 2010-08-25  Kenichi Handa  <handa@m17n.org>
 
         * HELLO: Change designation sequences for Arabic text.
diff --git a/etc/NEWS b/etc/NEWS
index 72075945f62..6689bbb4bd6 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -113,21 +113,17 @@ The frame-parameter tool-bar-position controls this.  It takes the values
 top, left, right or bottom.  The Options => Show/Hide menu has entries
 for this.
 
-** ImageMagick support
+** ImageMagick support.
 It is now possible to use the Imagemagick library to load many new
-image formats in Emacs.
+image formats in Emacs.  To enable this, use the configure option
+`--with-imagemagick'.
 
-To enable, use the following configure option:
---with-imagemagick
+The new function `imagemagick-types' returns a list of image file
+extensions that your installation of ImageMagick supports.  The
+function `imagemagick-register-types' enables ImageMagick support for
+these imaeg types, minus those listed in `imagemagick-types-inhibit'.
 
-The new function (imagemagick-types) returns a list of image file
-extensions that your installation of imagemagick supports.
-
-The function (imagemagick-register-types) will enable the imagemagick
-support for the extensions in imagemagick-types minus the types listed
-in imagemagick-types-inhibit.
-
-See the Emacs Manual for more information.
+See the Emacs Lisp Reference Manual for more information.
 
 ** The colors for selected text (the region face) are taken from the GTK
 theme when Emacs is built with GTK.
@@ -321,10 +317,24 @@ For example, adding "(diff-mode . ((mode . whitespace)))" to your
 variables `sql-product', `sql-user', `sql-server', `sql-database' and
 `sql-port' can now be safely used as local variables.
 
+*** `sql-dialect' is a synonym for `sql-product'.
+
 *** Added ability to login with a port on MySQL.
 The custom variable `sql-port' can be specified for connection to
 MySQL servers.
 
+*** Dynamic selection of product in an SQL interactive session.
+If you use `sql-product-interactive' to start an SQL interactive
+session it uses the current value of `sql-product'.  Preceding the
+invocation with C-u will force it to ask for the product before
+creating the session.
+
+*** Renaming a SQL interactive buffer when it is created.
+Prefixing the SQL interactive commands (`sql-sqlite', `sql-postgres',
+`sql-mysql', etc.) with C-u will force a new interactive session to be
+started and will prompt for the new name.  This will reduce the need
+for `sql-rename-buffer' is most common use cases.
+
 *** Command continuation prompts in SQL interactive mode are suppressed.
 Multiple line commands in SQL interactive mode, generate command
 continuation prompts which needlessly confuse the output.  These
@@ -424,6 +434,11 @@ threads simultaneously.
 *** It is possible now, to access alternative buses than the default
 system or session bus.
 
+** Tramp
+
+*** The following access methods are discontinued: "ssh1_old",
+"ssh2_old", "scp1_old", "scp2_old" and "fish".
+
 
 * New Modes and Packages in Emacs 24.1
 
@@ -470,8 +485,19 @@ has now been removed.
 
 * Lisp changes in Emacs 24.1
 
+** New variable syntax-propertize-function to set syntax-table properties.
+Replaces font-lock-syntactic-keywords which are now obsolete.
+This allows syntax-table properties to be set independently from font-lock:
+just call syntax-propertize to make sure the text is propertized.
+Together with this new variable come a new hook
+syntax-propertize-extend-region-functions, as well as two helper functions:
+syntax-propertize-via-font-lock to reuse old font-lock-syntactic-keywords
+as-is; and syntax-propertize-rules which provides a new way to specify
+syntactic rules.
+
 ** New hook post-self-insert-hook run at the end of self-insert-command.
 
++++
 ** Syntax tables support a new "comment style c" additionally to style b.
 ** frame-local variables cannot be let-bound any more.
 ** prog-mode is a new major-mode meant to be the parent of programming mode.
@@ -497,6 +523,14 @@ by the Graphic Control Extension of the image.
 
 *** `image-extension-data' is renamed to `image-metadata'.
 
+** XML and HTML parsing
+
+*** If Emacs is compiled with libxml2 support (which is the default),
+two new Emacs Lisp-level functions are defined: `html-parse-string'
+(which will parse "real world" HTML) and `xml-parse-string' (which
+parses XML).  Both return an Emacs Lisp parse tree.  See the Emacs
+Lisp Reference Manual for details.
+
 ** Isearch
 
 *** New hook `isearch-update-post-hook' that runs in `isearch-update'.
diff --git a/etc/NEWS.23 b/etc/NEWS.23
index 74291bab8ab..e63767d891c 100644
--- a/etc/NEWS.23
+++ b/etc/NEWS.23
@@ -40,6 +40,8 @@ This can be used in place of the default appt-message-warning-time.
 
 * Lisp changes in Emacs 23.3
 
+** The use of unintern without an obarray arg is declared obsolete.
+
 ** New function byte-to-string, like char-to-string but for bytes.
 
 
diff --git a/etc/TODO b/etc/TODO
index d58eb8be3d8..966d3eb6976 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -625,6 +625,508 @@ http://lists.gnu.org/archive/html/emacs-devel/2008-02/msg02234.html
    the window associated with that modeline.
    http://lists.gnu.org/archive/html/emacs-devel/2007-09/msg02416.html
 
+* Things to be done for specific packages or features
+
+** ImageMagick support
+
+*** image-type-header-regexps priorities the jpeg loader over the
+ImageMagick one.  This is not wrong, but how should a user go about
+prefering the ImageMagick loader?  The user might like zooming etc in jpegs.
+
+Try (setq image-type-header-regexps nil) for a quick hack to prefer
+ImageMagick over the jpg loader.
+
+*** For some reason its unbearably slow to look at a page in a large
+image bundle using the :index feature.  The ImageMagick "display"
+command is also a bit slow, but nowhere near as slow as the Emacs
+code.  It seems ImageMagick tries to unpack every page when loading the
+bundle.  This feature is not the primary usecase in Emacs though.
+
+ImageMagick 6.6.2-9 introduced a bugfix for single page djvu load.  It
+is now much faster to use the :index feature, but still not very fast.
+
+*** Try to cache the num pages calculation.  It can take a while to
+calculate the number of pages, and if you need to do it for each page
+view, page-flipping becomes uselessly slow.
+
+*** Integrate with image-dired.
+
+*** Integrate with docview. 
+  
+*** Integrate with image-mode.
+Some work has been done, e.g. M-x image-transform-fit-to-height will
+fit the image to the height of the Emacs window.
+
+*** Look for optimizations for handling images with low depth.
+Currently the code seems to default to 24 bit RGB which is costly for
+images with lower bit depth.
+
+*** Decide what to do with some uncommitted imagemagick support
+functions for image size etc.
+
+*** Test with more systems.
+Tested on Fedora 12, 14, and the libmagick that ships with it.
+I also tried using an ImageMagick compiled from their SVN, in
+parallel with the one packaged by Fedora, it worked well.
+Ubuntu 8.04 was tested, but it seems it ships a broken ImageMagick.
+
+** nxml mode
+
+*** High priority
+
+**** Command to insert an element template, including all required
+attributes and child elements.  When there's a choice of elements
+possible, we could insert a comment, and put an overlay on that
+comment that makes it behave like a button with a pop-up menu to
+select the appropriate choice.
+
+**** Command to tag a region.  With a schema should complete using legal
+tags, but should work without a schema as well.
+
+**** Provide a way to conveniently rename an element.  With a schema should
+complete using legal tags, but should work without a schema as well.
+
+*** Outlining
+
+**** Implement C-c C-o C-q.
+
+**** Install pre/post command hook for moving out of invisible section.
+
+**** Put a modify hook on invisible sections that expands them.
+
+**** Integrate dumb folding somehow.
+
+**** An element should be able to be its own heading.
+
+**** Optimize to avoid complete buffer scan on each command.
+
+**** Make it work with HTML-style headings (i.e. level indicated by
+name of heading element rather than depth of section nesting).
+
+**** Recognize root element as a section provided it has a title, even
+if it doesn't match section-element-name-regex.
+
+**** Support for incremental search automatically making hidden text visible.
+
+**** Allow title to be an attribute.
+
+**** Command that says to recognize the tag at point as a section/heading.
+
+**** Explore better ways to determine when an element is a section
+or a heading.
+
+**** rng-next-error needs to either ignore invisible portion or reveal it
+(maybe use isearch oriented text properties).
+
+**** Errors within hidden section should be highlighted by underlining the
+ellipsis.
+
+**** Make indirect buffers work.
+
+**** How should nxml-refresh outline recover from non well-formed tags?
+
+**** Hide tags in title elements?
+
+**** Use overlays instead of text properties for holding outline state?
+Necessary for indirect buffers to work?
+
+**** Allow an outline to go in the speedbar.
+
+**** Split up outlining manual section into subsections.
+
+**** More detail in the manual about each outlining command.
+
+**** More menu entries for hiding/showing?
+
+**** Indication of many lines have been hidden?
+
+*** Locating schemas
+
+**** Should rng-validate-mode give the user an opportunity to specify a
+schema if there is currently none? Or should it at least give a hint
+to the user how to specify a non-vacuous schema?
+
+**** Support for adding new schemas to schema-locating files.
+Add documentElement and namespace elements.
+
+**** C-c C-w should be able to report current type id.
+
+**** Implement doctypePublicId.
+
+**** Implement typeIdBase.
+
+**** Implement typeIdProcessingInstruction.
+
+**** Support xml:base.
+
+**** Implement group.
+
+**** Find preferred prefix from schema-locating files.  Get rid of
+rng-preferred-prefix-alist.
+
+**** Inserting document element with vacuous schema should complete using
+document elements declared in schema locating files, and set schema
+appropriately.
+
+**** Add a ruleType attribute to the <include> element?
+
+**** Allow processing instruction in prolog to contain the compact syntax
+schema directly.
+
+**** Use RDDL to locate a schema based on the namespace URI.
+
+**** Should not prompt to add redundant association to schema locating file.
+
+**** Command to reload current schema.
+
+*** Schema-sensitive features
+
+**** Should filter dynamic markup possibilities using schema validity, by
+adding hook to nxml-mode.
+
+**** Dynamic markup word should (at least optionally) be able to look in
+other buffers that are using nxml-mode.
+
+**** Should clicking on Invalid move to next error if already on an error?
+
+**** Take advantage of a:documentation.  Needs change to schema format.
+
+**** Provide feasible validation (as in Jing) toggle.
+
+**** Save the validation state as a property on the error overlay to enable
+more detailed diagnosis.
+
+**** Provide an Error Summary buffer showing all the validation errors.
+
+**** Pop-up menu.  What is useful?  Tag a region (should be greyed out if
+the region is not balanced).  Suggestions based on error messages.
+
+**** Have configurable list of namespace URIs so that we can provide
+namespace URI completion on extension elements or with schema-less documents.
+
+**** Allow validation to handle XInclude.
+
+**** ID/IDREF support.
+
+*** Completion
+
+**** Make it work with icomplete.  Only use a function to complete when
+some of the possible names have undeclared namespaces.
+
+**** How should C-return in mixed text work?
+
+**** When there's a vacuous schema, C-return after < will insert the end-tag.
+Is this a bug or a feature?
+
+**** After completing start-tag, ensure we don't get unhelpful message
+from validation
+
+**** Syntax table for completion.
+
+**** Should complete start-tag name with a space if namespace attributes
+are required.
+
+**** When completing start-tag name with no prefix and it doesn't match
+should try to infer namespace from local name.
+
+**** Should completion pay attention to characters after point?  If so, how?
+
+**** When completing start-tag name, add required atts if only one required
+attribute.
+
+**** When completing attribute name, add attribute value if only one value
+is possible.
+
+**** After attribute-value completion, insert space after close delimiter
+if more attributes are required.
+
+**** Complete on enumerated data values in elements.
+
+**** When in context that allows only elements, should get tag
+completion without having to type < first.
+
+**** When immediately after start-tag name, and name is valid and not
+prefix of any other name, should C-return complete on attribute names?
+
+**** When completing attributes, more consistent to ignore all attributes
+after point.
+
+**** Inserting attribute value completions needs to be sensitive to what
+delimiter is used so that it quotes the correct character.
+
+**** Complete on encoding-names in XML decl.
+
+**** Complete namespace declarations by searching for all namespaces
+mentioned in the schema.
+
+*** Well-formed XML support
+
+**** Deal better with Mule-UCS
+
+**** Deal with UTF-8 BOM when reading.
+
+**** Complete entity names.
+
+**** Provide some support for entity names for MathML.
+
+**** Command to repeat the last tag.
+
+**** Support for changing between character references and characters.
+Need to check that context is one in which character references are
+allowed.  xmltok prolog parsing will need to distinguish parameter
+literals from other kinds of literal.
+
+**** Provide a comment command to bind to M-; that works better than the
+normal one.
+
+**** Make indenting in a multi-line comment work.
+
+**** Structure view.  Separate buffer displaying element tree.
+Be able to navigate from structure view to document and vice-versa.
+
+**** Flash matching >.
+
+**** Smart selection command that selects increasingly large syntactically
+coherent chunks of XML.  If point is in an attribute value, first
+select complete value; then if command is repeated, select value plus
+delimiters, then select attribute name as well, then complete
+start-tag, then complete element, then enclosing element, etc.
+
+**** ispell integration.
+
+**** Block-level items in mixed content should be indented, e.g:
+  <para>This is list:
+    <ul>
+      <li>item</li>
+
+**** Provide option to indent like this:
+    <para>This is a paragraph
+     occupying multiple lines.</para>
+
+**** Option to add make a / that closes a start-tag electrically insert a
+space for the XHTML guys.
+
+**** C-M-q should work.
+
+*** Datatypes
+
+**** Figure out workaround for CJK characters with regexps.
+
+**** Does category C contain Cn?
+
+**** Do ENTITY datatype properly.
+
+*** XML Parsing Library
+
+**** Parameter entity parsing option, nil (never), t (always),
+unless-standalone (unless standalone="yes" in XML declaration).
+
+**** When a file is currently being edited, there should be an option to
+use its buffer instead of the on-disk copy.
+
+*** Handling all XML features
+
+**** Provide better support for editing external general parsed entities.
+Perhaps provide a way to force ignoring undefined entities; maybe turn
+this on automatically with <?xml encoding=""?> (with no version
+pseudo-att).
+
+**** Handle internal general entity declarations containing elements.
+
+**** Handle external general entity declarations.
+
+**** Handle default attribute declarations in internal subset.
+
+**** Handle parameter entities (including DTD).
+
+*** RELAX NG
+
+**** Do complete schema checking, at least optionally.
+
+**** Detect include/external loops during schema parse.
+
+**** Coding system detection for schemas.  Should use utf-8/utf-16 per the
+spec.  But also need to allow encodings other than UTF-8/16 to support
+CJK charsets that Emacs cannot represent in Unicode.
+
+*** Catching XML errors
+
+**** Check public identifiers.
+
+**** Check default attribute values.
+
+*** Performance
+
+**** Explore whether overlay-recenter can cure overlays performance problems.
+
+**** Cache schemas.  Need to have list of files and mtimes.
+
+**** Make it possible to reduce rng-validate-chunk-size significantly,
+perhaps to 500 bytes, without bad performance impact: don't do
+redisplay on every chunk; pass continue functions on other uses of
+rng-do-some-validation.
+
+**** Cache after first tag.
+
+**** Introduce a new name class that is a choice between names (so that
+we can use member)
+
+**** intern-choice should simplify after patterns with same 1st/2nd args
+
+**** Large numbers of overlays slow things down dramatically.  Represent
+errors using text properties.  This implies we cannot incrementally
+keep track of the number of errors, in order to determine validity.
+Instead, when validation completes, scan for any characters with an
+error text property; this seems to be fast enough even with large
+buffers.  Problem with error at end of buffer, where there's no
+character; need special variable for this.  Need to merge face from
+font-lock with the error face: use :inherit attribute with list of two
+faces.  How do we avoid making rng-valid depend on nxml-mode?
+
+*** Error recovery
+
+**** Don't stop at newline in looking for close of start-tag.
+
+**** Use indentation to guide recovery from mismatched end-tags
+
+**** Don't keep parsing when currently not well-formed but previously
+well-formed
+
+**** Try to recover from a bad start-tag by popping an open element if
+there was a mismatched end-tag unaccounted for.
+
+**** Try to recover from a bad start-tag open on the hypothesis that there
+was an error in the namespace URI.
+
+**** Better recovery from ill-formed XML declarations.
+
+*** Useability improvements
+
+**** Should print a "Parsing..." message during long movements.
+
+**** Provide better position for reference to undefined pattern error.
+
+**** Put Well-formed in the mode-line when validating against any-content.
+
+**** Trim marking of illegal data for leading and trailing whitespace.
+
+**** Show Invalid status as soon as we are sure it's invalid, rather than
+waiting for everything to be completely up to date.
+
+**** When narrowed, Valid or Invalid status should probably consider only
+validity of narrowed region.
+
+*** Bug fixes
+
+**** Need to give an error for a document like: <foo/><![CDATA[  ]]>
+
+**** Make nxml-forward-balanced-item work better for the prolog.
+
+**** Make filling and indenting comments work in the prolog.
+
+**** Should delete RNC Input buffers.
+
+**** Figure out what regex use for NCName and use it consistently,
+
+**** Should have not-well-formed tokens in ref.
+
+**** Require version in XML declaration? Probably not because prevents
+use for external parsed entities.  At least forbid standalone without version.
+
+**** Reject schema that compiles to rng-not-allowed-ipattern.
+
+**** Move point backwards on schema parse error so that it's on the right token.
+
+*** Internal
+
+**** Use rng-quote-string consistently.
+
+**** Use parsing library for XML to texinfo conversion.
+
+**** Rename xmltok.el to nxml-token.el.  Use nxml-t- prefix instead of
+xmltok-.  Change nxml-t-type to nxml-t-token-type, nxml-t-start to
+nxml-t-token-start.
+
+**** Can we set fill-prefix to nil and rely on indenting?
+
+**** xmltok should make available replacement text of entities containing
+elements
+
+**** In rng-valid, instead of using modification-hooks and
+insert-behind-hooks on dependent overlays, use same technique as nxml-mode.
+
+**** Port to XEmacs.  Issues include: Unicode (XEmacs seems to be based on
+Mule-UCS); overlays/text properties vs extents; absence of
+fontification-functions hook.
+
+*** Fontification
+
+**** Allow face to depend on element qname, attribute qname, attribute
+value.  Use list with pairs of (R . F), where R specifies regexps and
+F specifies faces.  How can this list be made to depend on the document type?
+
+*** Other
+
+**** Support RELAX NG XML syntax (use XML parsing library).
+
+**** Support W3C XML Schema (use XML parsing library).
+
+**** Command to infer schema from current document (like trang).
+
+*** Schemas
+
+**** XSLT schema should take advantage of RELAX NG to express cooccurrence
+constraints on attributes (e.g. xsl:template).
+
+*** Documentation
+
+**** Move material from README to manual.
+
+**** Document encodings.
+
+*** Notes
+
+**** How can we allow an error to be displayed on a different token from
+where it is detected?  In particular, for a missing closing ">" we
+will need to display it at the beginning of the following token.  At the
+moment, when we parse the following token the error overlay will get cleared.
+
+**** How should rng-goto-next-error deal with narrowing?
+
+**** Perhaps should merge errors having same start position even if they
+have different ends.
+
+**** How to handle surrogates? One possibility is to be compatible with
+utf8.e: represent as sequence of 4 chars.  But utf-16 is incompatible
+with this.
+
+**** Should we distinguish well-formedness errors from invalidity errors?
+(I think not: we may want to recover from a bad start-tag by implying
+an end-tag.)
+
+**** Seems to be a bug with Emacs, where a mouse movement that causes
+help-echo text to appear counts as pending input but does not cause
+idle timer to be restarted.
+
+**** Use XML to represent this file.
+
+**** I had a TODO which said simply "split-string".  What did I mean?
+
+**** Investigate performance on large files all on one line.
+
+*** Issues for Emacs versions >= 22
+
+**** Take advantage of UTF-8 CJK support.
+
+**** Supply a next-error-function.
+
+**** Investigate this NEWS item "Emacs now tries to set up buffer coding
+systems for HTML/XML files automatically."
+
+**** Take advantage of the pointer text property.
+
+**** Leverage char-displayable-p.
+
 * Internal changes
 
 ** Cleanup all the GC_ mark bit stuff -- there is no longer any distinction
diff --git a/etc/emacs.bash b/etc/emacs.bash
deleted file mode 100644
index 5cebee1227d..00000000000
--- a/etc/emacs.bash
+++ /dev/null
@@ -1,71 +0,0 @@
-### emacs.bash --- contact/resume an existing Emacs, or start a new one
-
-## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-##   Free Software Foundation, Inc.
-
-## Author: Noah Friedman
-
-## This file is part of GNU Emacs.
-
-## 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 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
-## 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 GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-### Commentary:
-
-## This file is obsolete.  Use emacsclient -a instead.
-
-## This defines a bash command named `edit' which contacts/resumes an
-## existing emacs or starts a new one if none exists.
-
-## One way or another, any arguments are passed to emacs to specify files
-## (provided you have loaded `resume.el').
-
-## This function assumes the emacs program is named `emacs' and is somewhere
-## in your load path.  If either of these is not true, the most portable
-## (and convenient) thing to do is to make an alias called emacs which
-## refers to the real program, e.g.
-##
-##        alias emacs=/usr/local/bin/gemacs
-
-function edit ()
-{
- local windowsys="${WINDOW_PARENT+sun}"
-
- windowsys="${windowsys:-${DISPLAY+x}}"
-
- if [ -n "${windowsys:+set}" ]; then
-    # Do not just test if these files are sockets.  On some systems
-    # ordinary files or fifos are used instead.  Just see if they exist.
-    if [ -e "${HOME}/.emacs_server" -o -e "/tmp/emacs${UID}/server" ]; then
-       emacsclient "$@"
-       return $?
-    else
-       echo "edit: starting emacs in background..." 1>&2
-    fi
-
-    case "${windowsys}" in
-      x ) (emacs "$@" &) ;;
-      sun ) echo "unsupported window system"; return 1 ;;
-    esac
- else
-    if jobs %emacs 2> /dev/null ; then
-       echo "$(pwd)" "$@" >| ${HOME}/.emacs_args && fg %emacs
-    else
-       emacs "$@"
-    fi
- fi
-}
-
-
-# arch-tag: 1e1b74b9-bf2c-4b23-870f-9eebff7515cb
-### emacs.bash ends here
diff --git a/etc/emacs.csh b/etc/emacs.csh
deleted file mode 100644
index ef860727284..00000000000
--- a/etc/emacs.csh
+++ /dev/null
@@ -1,31 +0,0 @@
-### emacs.csh
-
-## Add legal notice if non-trivial amounts of code are added.
-
-## Author: Michael DeCorte
-
-### Commentary:
-
-## This file is obsolete.  Use emacsclient -a instead.
-
-## This defines a csh command named `edit' which resumes an
-## existing Emacs or starts a new one if none exists.
-## One way or another, any arguments are passed to Emacs to specify files
-## (provided you have loaded `resume.el').
-
-## These are the possible values of $whichjob
-## 1 = new ordinary emacs (the -nw is so that it doesn't try to do X)
-## 2 = resume emacs
-## 3 = new emacs under X (-i is so that you get a reasonable icon)
-## 4 = resume emacs under X
-set EMACS_PATTERN="^\[[0-9]\]  . Stopped ............ $EMACS"
-
-alias edit 'set emacs_command=("emacs -nw \!*" "fg %emacs" "emacs -i \!* &"\
- "emacsclient \!* &") ; \
- jobs >! $HOME/.jobs; grep "$EMACS_PATTERN" < $HOME/.jobs >& /dev/null; \
- @ isjob = ! $status; \
- @ whichjob = 1 + $isjob + $?DISPLAY * 2 + $?WINDOW_PARENT * 4; \
- test -S ~/.emacs_server && emacsclient \!* \
- || echo `pwd` \!* >! ~/.emacs_args && eval $emacs_command[$whichjob]'
-
-# arch-tag: 433d58df-15b9-446f-ad37-f0393e3a23d4
diff --git a/etc/ms-kermit b/etc/ms-kermit
deleted file mode 100644
index ba53add6a78..00000000000
--- a/etc/ms-kermit
+++ /dev/null
@@ -1,172 +0,0 @@
-;;; The code here is forced by the interface, and is not subject to
-;;; copyright, constituting the only possible expression of the algorithm
-;;; in this format.
-
-;;; This file is designed for an 8-bit connection.
-;;; Use the file ms-7bkermit if you have a 7-bit connection.
-
-;; Meta key mappings for EMACS
-;; By Robert Earl (rearl@watnxt3.ucr.edu)
-;; May 13, 1990
-;;
-;; WARNING:
-;;  requires an 8-bit path to host.  many dialups and lans won't pass the
-;;  eighth bit by default and may require a special command to turn this
-;;  off.  `screen' is known to mask the eighth bit of input as well.
-
-set term controls 8-bit
-set translation key off
-
-;; control keys
-set key \3449 \128      ;; m-c-@
-set key \3358 \129      ;; m-c-a
-set key \3376 \130      ;; m-c-b
-set key \3374 \131      ;; m-c-c
-set key \3360 \132      ;; m-c-d
-set key \3346 \133      ;; m-c-e
-set key \3361 \134      ;; m-c-f
-set key \3362 \135      ;; m-c-g
-set key \3342 \136      ;; m-bs
-set key \3363 \136      ;; m-c-h (sends same code as above)
-set key \2469 \137      ;; m-tab
-set key \3351 \137      ;; m-c-i (same as above)
-set key \3364 \138      ;; m-c-j
-set key \3365 \139      ;; m-c-k
-set key \3366 \140      ;; m-c-l
-;set key \3378 \141     ;; m-c-m
-set key \2332 \141      ;; m-ret (sends same code as above)
-set key \3377 \142      ;; m-c-n
-set key \3352 \143      ;; m-c-o
-set key \3353 \144      ;; m-c-p
-set key \3344 \145      ;; m-c-q
-set key \3347 \146      ;; m-c-r
-set key \3359 \147      ;; m-c-s
-set key \3348 \148      ;; m-c-t
-set key \3350 \149      ;; m-c-u
-set key \3375 \150      ;; m-c-v
-set key \3345 \151      ;; m-c-w
-set key \3373 \152      ;; m-c-x
-set key \3349 \153      ;; m-c-y
-set key \3372 \154      ;; m-c-z
-
-;; misc keys
-;set key \3354 \155     ;; m-c-[
-set key \2305 \155      ;; m-esc (sends same as above)
-set key \3371 \156      ;; m-c-\
-set key \3355 \157      ;; m-c-]
-set key \3453 \158      ;; m-c-^
-set key \3458 \159      ;; m-c-_
-
-;; \160 is conspicuously missing here--
-;; alt-spc doesn't generate a distinct scan code...
-;; neither do shift-spc and ctrl-spc.
-;; no idea why.
-
-set key \2936 \161      ;; m-!
-set key \2856 \162      ;; m-"
-set key \2938 \163      ;; m-#
-set key \2939 \164      ;; m-$
-set key \2940 \165      ;; m-%
-set key \2942 \166      ;; m-&
-set key \2344 \167      ;; m-'
-set key \2944 \168      ;; m-(
-set key \2945 \169      ;; m-)
-set key \2943 \170      ;; m-*
-set key \2947 \171      ;; m-+
-set key \2355 \172      ;; m-,
-set key \2434 \173      ;; m--
-set key \2356 \174      ;; m-.
-set key \2357 \175      ;; m-/
-
-;; number keys
-set key \2433 \176      ;; m-0
-set key \2424 \177      ;; m-1
-set key \2425 \178
-set key \2426 \179
-set key \2427 \180
-set key \2428 \181
-set key \2429 \182
-set key \2430 \183
-set key \2431 \184
-set key \2432 \185      ;; m-9
-
-set key \2855 \186      ;; m-:
-set key \2343 \187      ;; m-;
-set key \2867 \188      ;; m-<
-set key \2435 \189      ;; m-=
-set key \2868 \190      ;; m->
-set key \2869 \191      ;; m-?
-set key \2937 \192      ;; m-@
-
-;; shifted A-Z
-set key \2846 \193      ;; m-A
-set key \2864 \194
-set key \2862 \195
-set key \2848 \196
-set key \2834 \197
-set key \2849 \198
-set key \2850 \199
-set key \2851 \200
-set key \2839 \201
-set key \2852 \202
-set key \2853 \203
-set key \2854 \204
-set key \2866 \205
-set key \2865 \206
-set key \2840 \207
-set key \2841 \208
-set key \2832 \209
-set key \2835 \210
-set key \2847 \211
-set key \2836 \212
-set key \2838 \213
-set key \2863 \214
-set key \2833 \215
-set key \2861 \216
-set key \2837 \217
-set key \2860 \218      ;; m-Z
-
-set key \2330 \219      ;; m-[
-set key \2347 \220      ;; m-\
-set key \2331 \221      ;; m-]
-set key \2941 \222      ;; m-^
-set key \2946 \223      ;; m-_
-set key \2345 \224      ;; m-`
-
-;; lowercase a-z
-set key \2334 \225      ;; m-a
-set key \2352 \226
-set key \2350 \227
-set key \2336 \228
-set key \2322 \229
-set key \2337 \230
-set key \2338 \231
-set key \2339 \232
-set key \2327 \233
-set key \2340 \234
-set key \2341 \235
-set key \2342 \236
-set key \2354 \237
-set key \2353 \238
-set key \2328 \239
-set key \2329 \240
-set key \2320 \241
-set key \2323 \242
-set key \2335 \243
-set key \2324 \244
-set key \2326 \245
-set key \2351 \246
-set key \2321 \247
-set key \2349 \248
-set key \2325 \249
-set key \2348 \250      ;; m-z
-
-;; more shifted misc. keys
-set key \2842 \251      ;; m-{
-set key \2859 \252      ;; m-|
-set key \2843 \253      ;; m-}
-set key \2857 \254      ;; m-~
-set key \2318 \255      ;; m-del
-
-
-;;; arch-tag: 93cefb0a-2b07-4d09-ae78-4d807b15645d