use lisp-mode-shared-map instead of shared-lisp-mode-map

7 files changed, 178 insertions, 90 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2db82cabe4d..b2583bba11c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-10  Sam Steingold  <sds@gnu.org>
+
+        * chistory.el, ielm.el, ledit.el:
+        * progmodes/inf-lisp.el, progmodes/scheme.el:
+        Use `lisp-mode-shared-map' instead of `shared-lisp-mode-map'.
+
 2000-10-10  Dave Love  <fx@gnu.org>
 
         * toolbar/tool-bar.el (tool-bar-add-item)
diff --git a/lisp/chistory.el b/lisp/chistory.el
index 6c5eaba8b72..a32720a40ce 100644
--- a/lisp/chistory.el
+++ b/lisp/chistory.el
@@ -145,10 +145,9 @@ The buffer is left in Command History mode."
   :group 'chistory)
 
 (defvar command-history-map nil)
-(if command-history-map
-    nil
-  (setq command-history-map
-        (nconc (make-sparse-keymap) shared-lisp-mode-map))
+(unless command-history-map
+  (setq command-history-map (make-sparse-keymap))
+  (set-keymap-parent command-history-map lisp-mode-shared-map)
   (suppress-keymap command-history-map)
   (define-key command-history-map "x" 'command-history-repeat)
   (define-key command-history-map "\n" 'next-line)
diff --git a/lisp/cus-load.el b/lisp/cus-load.el
index f73ad3fbf33..10d54e676d5 100644
--- a/lisp/cus-load.el
+++ b/lisp/cus-load.el
@@ -2,6 +2,7 @@
 ;;
 ;;; Code:
 
+(put 'mime-display 'custom-loads '("mm-decode"))
 (put 'holidays 'custom-loads '("calendar"))
 (put 'SQL 'custom-loads '("sql"))
 (put 'refbib 'custom-loads '("refbib"))
@@ -18,6 +19,7 @@
 (put 'footnote 'custom-loads '("footnote"))
 (put 'pcomplete 'custom-loads '("pcmpl-cvs" "pcmpl-gnu" "pcmpl-linux" "pcmpl-rpm" "pcomplete" "em-cmpl"))
 (put 'calendar-tex 'custom-loads '("cal-tex"))
+(put 'fancy-splash-screen 'custom-loads '("startup"))
 (put 'hi-lock-interactive-text-highlighting 'custom-loads '("hi-lock"))
 (put 'mail-hist 'custom-loads '("mail-hist"))
 (put 'gnus-article-emphasis 'custom-loads '("gnus-art"))
@@ -49,9 +51,9 @@
 (put 'gnus-score-kill 'custom-loads '("gnus-kill" "gnus"))
 (put 'ldap 'custom-loads '("ldap"))
 (put 'remote-compile 'custom-loads '("rcompile"))
-(put 'gnus-visual 'custom-loads '("earcon" "gnus-art" "gnus"))
+(put 'gnus-visual 'custom-loads '("earcon" "gnus-art" "gnus" "smiley-ems"))
 (put 'dabbrev 'custom-loads '("dabbrev"))
-(put 'completion 'custom-loads '("completion"))
+(put 'completion 'custom-loads '("completion" "iswitchb"))
 (put 'cpp 'custom-loads '("cpp"))
 (put 'ps-print-background 'custom-loads '("ps-print"))
 (put 'auto-show 'custom-loads '("auto-show"))
@@ -103,6 +105,7 @@
 (put 'mouse-sel 'custom-loads '("mouse-sel"))
 (put 'sort 'custom-loads '("sort"))
 (put 'antlr 'custom-loads '("antlr-mode"))
+(put 'mail-source 'custom-loads '("mail-source"))
 (put 'trace 'custom-loads '("trace"))
 (put 'gnus-article-washing 'custom-loads '("gnus-art"))
 (put 'mh-hook 'custom-loads '("mh-e"))
@@ -134,12 +137,12 @@
 (put 'development 'custom-loads '("cus-edit"))
 (put 'ediff 'custom-loads '("ediff-diff" "ediff-init" "ediff-mult" "ediff-ptch" "ediff-wind" "ediff"))
 (put 'feedmail-spray 'custom-loads '("feedmail"))
-(put 'gnus-treading 'custom-loads '("gnus-sum"))
 (put 'idlwave-external-programs 'custom-loads '("idlwave"))
 (put 'strokes 'custom-loads '("strokes"))
 (put 'mouse 'custom-loads '("faces" "mouse" "menu-bar" "avoid" "mouse-sel" "msb" "mwheel" "strokes" "tooltip" "goto-addr"))
 (put 'nnmail-various 'custom-loads '("nnmail"))
-(put 'extensions 'custom-loads '("generic" "iswitchb" "time-stamp" "wid-edit" "cust-print" "eldoc" "page-ext"))
+(put 'smiley 'custom-loads '("smiley-ems"))
+(put 'extensions 'custom-loads '("generic" "time-stamp" "wid-edit" "cust-print" "eldoc" "page-ext"))
 (put 'ebnf-displacement 'custom-loads '("ebnf2ps"))
 (put 'appt 'custom-loads '("appt"))
 (put 'snmp 'custom-loads '("snmp-mode"))
@@ -151,9 +154,9 @@
 (put 'message-various 'custom-loads '("message"))
 (put 'term 'custom-loads '("terminal" "term"))
 (put 'gnus-summary-exit 'custom-loads '("gnus-sum" "gnus"))
-(put 'news 'custom-loads '("gnus" "message" "supercite"))
+(put 'news 'custom-loads '("gnus" "message" "mm-decode" "supercite"))
 (put 'ada 'custom-loads '("ada-mode" "ada-xref"))
-(put 'gnus 'custom-loads '("gnus-art" "gnus" "gnus-demon" "gnus-dup" "gnus-eform" "gnus-undo" "gnus-uu" "gnus-win" "nnmail"))
+(put 'gnus 'custom-loads '("gnus-art" "gnus-async" "gnus-demon" "gnus-dup" "gnus-eform" "gnus-undo" "gnus-uu" "gnus-win" "gnus" "mail-source" "nnmail" "rfc1843"))
 (put 'cperl-affected-by-hairy 'custom-loads '("cperl-mode"))
 (put 'eudc-ldap 'custom-loads '("eudc-vars"))
 (put 'reftex-making-and-inserting-labels 'custom-loads '("reftex-vars"))
@@ -164,6 +167,7 @@
 (put 'paren-showing 'custom-loads '("paren"))
 (put 'dos-fns 'custom-loads '("dos-vars"))
 (put 'display-time 'custom-loads '("time"))
+(put 'multimedia 'custom-loads '("mm-decode"))
 (put 'reftex 'custom-loads '("reftex-vars"))
 (put 'makemode 'custom-loads '("make-mode"))
 (put 'hexl 'custom-loads '("hexl"))
@@ -191,6 +195,7 @@
 (put 'vip 'custom-loads '("vip"))
 (put 'smerge 'custom-loads '("smerge-mode"))
 (put 'spell 'custom-loads '("spell"))
+(put 'electric-help 'custom-loads '("ehelp"))
 (put 'align 'custom-loads '("align"))
 (put 'rmail-headers 'custom-loads '("rmail"))
 (put 'timeclock 'custom-loads '("timeclock"))
@@ -198,7 +203,7 @@
 (put 'idlwave-shell-initial-commands 'custom-loads '("idlw-shell"))
 (put 'tildify 'custom-loads '("tildify"))
 (put 'cperl-autoinsert-details 'custom-loads '("cperl-mode"))
-(put 'help 'custom-loads '("help" "apropos" "cus-edit" "help-macro" "info-look" "info" "man" "tooltip" "woman"))
+(put 'help 'custom-loads '("help-macro" "help" "apropos" "cus-edit" "ehelp" "info-look" "info" "man" "tooltip" "woman"))
 (put 'forms 'custom-loads '("forms"))
 (put 'widget-documentation 'custom-loads '("wid-edit"))
 (put 'eshell-banner 'custom-loads '("em-banner"))
@@ -222,6 +227,7 @@
 (put 'feedmail-queue 'custom-loads '("feedmail"))
 (put 'idlwave-misc 'custom-loads '("idlwave"))
 (put 'cmuscheme 'custom-loads '("cmuscheme" "xscheme"))
+(put 'ansi-colors 'custom-loads '("ansi-color"))
 (put 'file-cache 'custom-loads '("filecache"))
 (put 'uce 'custom-loads '("uce"))
 (put 'boolean 'custom-loads '("bookmark"))
@@ -259,6 +265,7 @@
 (put 'tags 'custom-loads '("speedbar"))
 (put 'eshell-proc 'custom-loads '("esh-proc"))
 (put 'custom-browse 'custom-loads '("cus-edit"))
+(put 'mime 'custom-loads '("mm-bodies"))
 (put 'generic-x 'custom-loads '("generic-x"))
 (put 'partial-completion 'custom-loads '("complete"))
 (put 'whitespace 'custom-loads '("whitespace"))
@@ -287,12 +294,12 @@
 (put 'apropos 'custom-loads '("apropos"))
 (put 'gomoku 'custom-loads '("gomoku"))
 (put 'eshell-pred 'custom-loads '("em-pred"))
-(put 'tools 'custom-loads '("add-log" "calculator" "compare-w" "diff-mode" "diff" "ediff" "elide-head" "emerge" "gud" "pcvs-defs" "smerge-mode" "speedbar" "tempo" "tooltip" "vc" "which-func" "copyright" "compile" "ebrowse" "etags" "glasses" "make-mode" "rcompile"))
+(put 'tools 'custom-loads '("add-log" "calculator" "compare-w" "diff-mode" "diff" "ediff" "elide-head" "emerge" "gud" "pcvs-defs" "smerge-mode" "speedbar" "tempo" "tooltip" "vc" "which-func" "rcompile" "copyright" "compile" "ebrowse" "etags" "glasses" "make-mode"))
 (put 'gnus-topic 'custom-loads '("gnus-topic"))
 (put 'sgml 'custom-loads '("sgml-mode"))
 (put 'keyboard 'custom-loads '("simple" "chistory" "type-break"))
-(put 'eshell-hist 'custom-loads '("em-hist"))
 (put 'viper-mouse 'custom-loads '("viper-mous"))
+(put 'eshell-hist 'custom-loads '("em-hist"))
 (put 'ps-print-horizontal 'custom-loads '("ps-print"))
 (put 'woman 'custom-loads '("woman"))
 (put 'decipher 'custom-loads '("decipher"))
@@ -302,19 +309,19 @@
 (put 'metamail 'custom-loads '("metamail"))
 (put 'winner 'custom-loads '("winner"))
 (put 'ebrowse-faces 'custom-loads '("ebrowse"))
-(put 'wp 'custom-loads '("cus-edit" "enriched" "lpr" "ps-print" "view" "ebnf2ps" "bib-mode" "nroff-mode" "refbib" "refer" "scribe" "tildify"))
+(put 'wp 'custom-loads '("view" "cus-edit" "enriched" "lpr" "ps-print" "ebnf2ps" "bib-mode" "nroff-mode" "refbib" "refer" "scribe" "tildify"))
 (put 'reftex-citation-support 'custom-loads '("reftex-vars"))
 (put 'gnus-summary-choose 'custom-loads '("gnus-sum"))
 (put 'widget-browse 'custom-loads '("wid-browse"))
 (put 'feedmail-misc 'custom-loads '("feedmail"))
 (put 'diff 'custom-loads '("diff-mode" "diff"))
-(put 'unix 'custom-loads '("gud" "shell" "term" "sh-script" "rlogin"))
+(put 'unix 'custom-loads '("gud" "shell" "term" "rlogin" "sh-script"))
 (put 'external 'custom-loads '("bib-mode" "cus-edit" "locate" "server"))
 (put 'vc 'custom-loads '("files" "vc-hooks" "vc-cvs" "vc-rcs" "vc-sccs" "vc"))
 (put 'vhdl-highlight-faces 'custom-loads '("vhdl-mode"))
 (put 'which-func 'custom-loads '("which-func"))
 (put 'pc-select 'custom-loads '("pc-select"))
-(put 'i18n 'custom-loads '("cus-edit" "double" "ccl" "iso-acc" "iso-ascii" "ogonek"))
+(put 'i18n 'custom-loads '("ccl" "cus-edit" "double" "iso-acc" "iso-ascii" "latin1-disp" "ogonek"))
 (put 'sh 'custom-loads '("sh-script"))
 (put 'message-headers 'custom-loads '("message"))
 (put 'idlwave-code-formatting 'custom-loads '("idlwave"))
@@ -329,6 +336,7 @@
 (put 'environment 'custom-loads '("cus-edit" "dired" "faces" "dos-vars"))
 (put 'perl 'custom-loads '("perl-mode"))
 (put 'vhdl-port 'custom-loads '("vhdl-mode"))
+(put 'gnus-charset 'custom-loads '("gnus-group" "gnus-msg" "gnus-sum" "gnus"))
 (put 'calculator 'custom-loads '("calculator"))
 (put 'custom-menu 'custom-loads '("cus-edit"))
 (put 'comm 'custom-loads '("eudc-vars" "ldap" "net-utils"))
@@ -338,7 +346,7 @@
 (put 'lm 'custom-loads '("landmark"))
 (put 'idlwave-routine-info 'custom-loads '("idlwave"))
 (put 'm4 'custom-loads '("m4-mode"))
-(put 'gnus-article-mime 'custom-loads '("gnus-art" "gnus-sum"))
+(put 'gnus-article-mime 'custom-loads '("gnus-art" "mm-uu"))
 (put 'emulations 'custom-loads '("crisp" "tpu-edt" "vip" "viper"))
 (put 'compression 'custom-loads '("jka-compr"))
 (put 'games 'custom-loads '("5x5" "bruce" "decipher" "dunnet" "fortune" "gametree" "gomoku" "handwrite" "hanoi" "landmark" "mpuz" "pong" "solitaire" "spook" "yow"))
@@ -352,10 +360,10 @@
 (put 'log-view 'custom-loads '("log-view"))
 (put 'PostScript 'custom-loads '("ps-mode"))
 (put 'abbrev-mode 'custom-loads '("abbrev" "cus-edit" "mailabbrev"))
-(put 'eshell-term 'custom-loads '("em-term"))
 (put 'earcon 'custom-loads '("earcon"))
+(put 'eshell-term 'custom-loads '("em-term"))
 (put 'feedmail-headers 'custom-loads '("feedmail"))
-(put 'hypermedia 'custom-loads '("wid-edit" "metamail" "browse-url" "goto-addr"))
+(put 'hypermedia 'custom-loads '("wid-edit" "browse-url" "goto-addr" "metamail"))
 (put 'ff 'custom-loads '("find-file"))
 (put 'prolog 'custom-loads '("prolog"))
 (put 'follow 'custom-loads '("follow"))
@@ -403,12 +411,13 @@
 (put 'ispell 'custom-loads '("ispell"))
 (put 'auto-revert 'custom-loads '("autorevert"))
 (put 'advice 'custom-loads '("advice"))
-(put 'eshell-util 'custom-loads '("esh-util"))
 (put 'picture 'custom-loads '("picture"))
+(put 'eshell-util 'custom-loads '("esh-util"))
 (put 'gnus-group 'custom-loads '("gnus-topic" "gnus"))
 (put 'eudc-bbdb 'custom-loads '("eudc-vars"))
 (put 'reftex-referencing-labels 'custom-loads '("reftex-vars"))
 (put 'gnus-article-various 'custom-loads '("gnus-art" "gnus-sum"))
+(put 'imap 'custom-loads '("imap"))
 (put 'ediff-diff 'custom-loads '("ediff-diff"))
 (put 'ebnf-repeat 'custom-loads '("ebnf2ps"))
 (put 'supercite 'custom-loads '("supercite"))
@@ -433,13 +442,12 @@
 (put 'message-mail 'custom-loads '("message"))
 (put 'modeline 'custom-loads '("faces" "time"))
 (put 'archive-zoo 'custom-loads '("arc-mode"))
-(put 'gnus-group-level 'custom-loads '("gnus"))
 (put 'idlwave-completion 'custom-loads '("idlwave"))
 (put 'eshell-rebind 'custom-loads '("em-rebind"))
 (put 'bibtex 'custom-loads '("bibtex"))
 (put 'faces 'custom-loads '("loaddefs" "faces" "facemenu" "cus-edit" "font-lock" "hilit-chg" "paren" "ps-print" "speedbar" "time" "wid-edit" "woman" "gnus" "message" "cwarn" "make-mode"))
 (put 'gnus-summary-various 'custom-loads '("gnus-sum"))
-(put 'applications 'custom-loads '("calendar" "cus-edit" "uniquify" "spell" "eshell"))
+(put 'applications 'custom-loads '("calendar" "cus-edit" "uniquify" "eshell" "spell"))
 (put 'ebrowse-member 'custom-loads '("ebrowse"))
 (put 'terminal 'custom-loads '("terminal"))
 (put 'shadow 'custom-loads '("shadowfile" "shadow"))
@@ -459,9 +467,10 @@
 (put 'message-sending 'custom-loads '("message"))
 (put 'archive-arc 'custom-loads '("arc-mode"))
 (put 'rmail-output 'custom-loads '("rmailout"))
-(put 'editing 'custom-loads '("simple" "indent" "paragraphs" "auto-show" "cus-edit" "faces" "outline" "hl-line" "hscroll" "vcursor" "view" "picture"))
+(put 'editing 'custom-loads '("simple" "view" "indent" "paragraphs" "auto-show" "cus-edit" "faces" "outline" "hl-line" "hscroll" "vcursor" "picture"))
 (put 'crisp 'custom-loads '("crisp"))
 (put 'nroff 'custom-loads '("nroff-mode"))
+(put 'gnus-group-icons 'custom-loads '("gnus-group"))
 (put 'executable 'custom-loads '("executable"))
 (put 'gnus-score-adapt 'custom-loads '("gnus-score" "gnus"))
 (put 'copyright 'custom-loads '("copyright"))
@@ -474,8 +483,8 @@
 (put 'reftex-index-support 'custom-loads '("reftex-vars"))
 (put 'pascal 'custom-loads '("pascal"))
 (put 'rmail-retrieve 'custom-loads '("rmail" "rmailsum"))
-(put 'data 'custom-loads '("text-mode" "arc-mode" "forms" "hexl" "jka-compr" "saveplace" "sort" "tar-mode" "time-stamp" "timeclock" "snmp-mode"))
-(put 'mail 'custom-loads '("simple" "startup" "time" "gnus" "message" "emacsbug" "feedmail" "mail-extr" "mail-hist" "mail-utils" "mailalias" "metamail" "mh-e" "mspools" "rmail" "sendmail" "smtpmail" "supercite" "uce" "fortune" "eudc-vars"))
+(put 'data 'custom-loads '("text-mode" "arc-mode" "forms" "hexl" "jka-compr" "saveplace" "sort" "tar-mode" "time-stamp" "snmp-mode" "timeclock"))
+(put 'mail 'custom-loads '("simple" "startup" "time" "eudc-vars" "gnus" "imap" "message" "mm-decode" "emacsbug" "feedmail" "mail-extr" "mail-hist" "mail-utils" "mailalias" "metamail" "mh-e" "mspools" "rmail" "sendmail" "smtpmail" "supercite" "uce" "fortune"))
 (put 'paren-blinking 'custom-loads '("simple"))
 (put 'gnus-summary-sort 'custom-loads '("gnus-sum"))
 (put 'fast-lock 'custom-loads '("fast-lock"))
@@ -486,6 +495,7 @@
 (put 'recentf 'custom-loads '("recentf"))
 (put 'fill 'custom-loads '("simple" "newcomment" "fill" "align"))
 (put 'outlines 'custom-loads '("allout" "outline"))
+(put 'latin1-display 'custom-loads '("latin1-disp"))
 (put 'paragraphs 'custom-loads '("paragraphs"))
 (put 'ebrowse 'custom-loads '("ebrowse"))
 (put 'nnmail-split 'custom-loads '("nnmail"))
@@ -494,7 +504,7 @@
 (put 'fortune 'custom-loads '("fortune"))
 (put 'diff-mode 'custom-loads '("diff-mode"))
 (put 'isearch-lazy-highlight 'custom-loads '("isearch"))
-(put 'gnus-asynchronous 'custom-loads '("gnus" "gnus-async"))
+(put 'gnus-asynchronous 'custom-loads '("gnus-async"))
 (put 'woman-formatting 'custom-loads '("woman"))
 (put 'vcursor 'custom-loads '("vcursor"))
 (put 'iso-ascii 'custom-loads '("iso-ascii"))
@@ -512,13 +522,13 @@
 (put 'time-stamp 'custom-loads '("time-stamp"))
 (put 'todo 'custom-loads '("todo-mode"))
 (put 'ebnf-special 'custom-loads '("ebnf2ps"))
-(put 'gnus-article-highlight 'custom-loads '("gnus-art" "gnus"))
+(put 'gnus-article-highlight 'custom-loads '("gnus-art"))
 (put 'tooltip 'custom-loads '("tooltip"))
 (put 'gud 'custom-loads '("gud"))
 (put 'c-macro 'custom-loads '("cmacexp"))
 (put 'gnus-cache 'custom-loads '("gnus-cache" "gnus"))
 (put 'eshell-module 'custom-loads '("esh-groups" "esh-module"))
-(put 'gnus-extract 'custom-loads '("gnus" "gnus-uu"))
+(put 'gnus-extract 'custom-loads '("gnus" "gnus-uu" "uudecode"))
 (put 'quickurl 'custom-loads '("quickurl"))
 (put 'browse-url 'custom-loads '("browse-url"))
 (put 'cust-print 'custom-loads '("cust-print"))
@@ -549,7 +559,7 @@
 (put 'tempo 'custom-loads '("tempo"))
 (put 'c 'custom-loads '("tooltip" "cc-vars" "cmacexp" "cpp" "hideif"))
 (put 'nnmail-prepare 'custom-loads '("nnmail"))
-(put 'processes 'custom-loads '("comint" "cus-edit" "executable" "pcomplete" "shell" "term" "metamail" "compile" "sql" "flyspell" "rcompile" "rlogin"))
+(put 'processes 'custom-loads '("ansi-color" "comint" "cus-edit" "executable" "pcomplete" "shell" "term" "rcompile" "rlogin" "metamail" "compile" "sql" "flyspell"))
 (put 'ebnf2ps 'custom-loads '("ebnf2ps"))
 (put 'sendmail 'custom-loads '("sendmail"))
 (put 'gnus-article-signature 'custom-loads '("gnus-art"))
@@ -557,6 +567,7 @@
 (put 'idlwave 'custom-loads '("idlw-shell" "idlwave"))
 (put 'viper-ex 'custom-loads '("viper-ex"))
 (put 'gulp 'custom-loads '("gulp"))
+(put 'leim 'custom-loads '("quail"))
 (put 'ielm 'custom-loads '("ielm"))
 (put 'find-dired 'custom-loads '("find-dired"))
 (put 'delphi 'custom-loads '("delphi"))
@@ -586,14 +597,22 @@
   `(unless (get ,symbol ,propname)
      (put ,symbol ,propname ,value)))
 
+(custom-put-if-not 'mime-display 'custom-version "21.1")
+(custom-put-if-not 'mime-display 'group-documentation "Display of MIME in mail and news articles.")
 (custom-put-if-not 'SQL 'custom-version "20.4")
 (custom-put-if-not 'SQL 'group-documentation "Running a SQL interpreter from within Emacs buffers")
+(custom-put-if-not 'sql-postgres-options 'custom-version "20.8")
+(custom-put-if-not 'sql-postgres-options 'standard-value t)
+(custom-put-if-not 'speedbar-reconfigure-keymaps-hook 'custom-version "21.1")
+(custom-put-if-not 'speedbar-reconfigure-keymaps-hook 'standard-value t)
 (custom-put-if-not 'highlight-changes 'custom-version "20.4")
 (custom-put-if-not 'highlight-changes 'group-documentation "Highlight Changes mode.")
 (custom-put-if-not 'query-replace-from-history-variable 'custom-version "20.3")
 (custom-put-if-not 'query-replace-from-history-variable 'standard-value t)
 (custom-put-if-not 'footnote 'custom-version "21.1")
 (custom-put-if-not 'footnote 'group-documentation "Support for footnotes in mail and news messages.")
+(custom-put-if-not 'fancy-splash-screen 'custom-version "21.1")
+(custom-put-if-not 'fancy-splash-screen 'group-documentation "Fancy splash screen when Emacs starts.")
 (custom-put-if-not 'custom-variable-default-form 'custom-version "20.3")
 (custom-put-if-not 'custom-variable-default-form 'standard-value t)
 (custom-put-if-not 'mode-line 'custom-version "21.1")
@@ -608,24 +627,40 @@
 (custom-put-if-not 'browse-url-lynx-input-field 'standard-value t)
 (custom-put-if-not 'help-highlight-face 'custom-version "20.3")
 (custom-put-if-not 'help-highlight-face 'standard-value t)
+(custom-put-if-not 'vc-cvs-header 'custom-version "21.1")
+(custom-put-if-not 'vc-cvs-header 'standard-value t)
 (custom-put-if-not 'speedbar 'custom-version "20.3")
 (custom-put-if-not 'speedbar 'group-documentation "File and tag browser frame.")
 (custom-put-if-not 'custom-button-face 'custom-version "21.1")
 (custom-put-if-not 'custom-button-face 'group-documentation nil)
 (custom-put-if-not 'cursor 'custom-version "21.1")
 (custom-put-if-not 'cursor 'group-documentation "Displaying text cursors.")
+(custom-put-if-not 'change-log-date-face 'custom-version "21.1")
+(custom-put-if-not 'change-log-date-face 'group-documentation nil)
 (custom-put-if-not 'find-tag-marker-ring-length 'custom-version "20.3")
 (custom-put-if-not 'find-tag-marker-ring-length 'standard-value t)
 (custom-put-if-not 'input-mode-8-bit 'custom-version "21.1")
 (custom-put-if-not 'input-mode-8-bit 'standard-value t)
 (custom-put-if-not 'elide-head 'custom-version "21.1")
 (custom-put-if-not 'elide-head 'group-documentation "Eliding copyright headers and the like in source files.")
+(custom-put-if-not 'vc-rcs-checkout-switches 'custom-version "21.1")
+(custom-put-if-not 'vc-rcs-checkout-switches 'standard-value t)
+(custom-put-if-not 'change-log-conditionals-face 'custom-version "21.1")
+(custom-put-if-not 'change-log-conditionals-face 'group-documentation nil)
+(custom-put-if-not 'mail-source 'custom-version "21.1")
+(custom-put-if-not 'mail-source 'group-documentation "The mail-fetching library.")
+(custom-put-if-not 'speedbar-visiting-tag-hook 'custom-version "21.1")
+(custom-put-if-not 'speedbar-visiting-tag-hook 'standard-value t)
 (custom-put-if-not 'compilation-scroll-output 'custom-version "20.3")
 (custom-put-if-not 'compilation-scroll-output 'standard-value t)
 (custom-put-if-not 'vc-dired-recurse 'custom-version "20.3")
 (custom-put-if-not 'vc-dired-recurse 'standard-value t)
+(custom-put-if-not 'change-log-email-face 'custom-version "21.1")
+(custom-put-if-not 'change-log-email-face 'group-documentation nil)
 (custom-put-if-not 'mouse 'custom-version "21.1")
 (custom-put-if-not 'mouse 'group-documentation "Input from the mouse.")
+(custom-put-if-not 'ansi-color-for-shell-mode 'custom-version "20.8")
+(custom-put-if-not 'ansi-color-for-shell-mode 'standard-value t)
 (custom-put-if-not 'snmp 'custom-version "20.4")
 (custom-put-if-not 'snmp 'group-documentation "Mode for editing SNMP MIB files.")
 (custom-put-if-not 'widget-image-enable 'custom-version "21.1")
@@ -634,6 +669,8 @@
 (custom-put-if-not 'help-highlight-p 'standard-value t)
 (custom-put-if-not 'browse-url-mosaic-program 'custom-version "20.3")
 (custom-put-if-not 'browse-url-mosaic-program 'standard-value t)
+(custom-put-if-not 'vc-cvs-register-switches 'custom-version "21.1")
+(custom-put-if-not 'vc-cvs-register-switches 'standard-value t)
 (custom-put-if-not 'sql-oracle-options 'custom-version "20.8")
 (custom-put-if-not 'sql-oracle-options 'standard-value t)
 (custom-put-if-not 'find-function-regexp 'custom-version "21.1")
@@ -644,16 +681,41 @@
 (custom-put-if-not 'custom-face-default-form 'standard-value t)
 (custom-put-if-not 'hexl-follow-ascii 'custom-version "20.3")
 (custom-put-if-not 'hexl-follow-ascii 'standard-value t)
+(custom-put-if-not 'vc-cvs-use-edit 'custom-version "21.1")
+(custom-put-if-not 'vc-cvs-use-edit 'standard-value t)
+(custom-put-if-not 'electric-help 'custom-version "21.1")
+(custom-put-if-not 'electric-help 'group-documentation "Electric help facility.")
 (custom-put-if-not 'browse-url-filename-alist 'custom-version "20.3")
 (custom-put-if-not 'browse-url-filename-alist 'standard-value t)
 (custom-put-if-not 'align 'custom-version "21.1")
 (custom-put-if-not 'align 'group-documentation "Align text to a specific column, by regexp.")
+(custom-put-if-not 'tildify 'custom-version "21.1")
+(custom-put-if-not 'tildify 'group-documentation "Adding missing hard spaces or other text fragments into texts.")
+(custom-put-if-not 'vc-rcs-checkin-switches 'custom-version "21.1")
+(custom-put-if-not 'vc-rcs-checkin-switches 'standard-value t)
+(custom-put-if-not 'region 'custom-version "21.1")
+(custom-put-if-not 'region 'group-documentation nil)
 (custom-put-if-not 'change-log-version-info-enabled 'custom-version "21.1")
 (custom-put-if-not 'change-log-version-info-enabled 'standard-value t)
+(custom-put-if-not 'find-file-suppress-same-file-warnings 'custom-version "21.1")
+(custom-put-if-not 'find-file-suppress-same-file-warnings 'standard-value t)
+(custom-put-if-not 'change-log-name-face 'custom-version "21.1")
+(custom-put-if-not 'change-log-name-face 'group-documentation nil)
 (custom-put-if-not 'sql-electric-stuff 'custom-version "20.8")
 (custom-put-if-not 'sql-electric-stuff 'standard-value t)
+(custom-put-if-not 'ansi-colors 'custom-version "20.7")
+(custom-put-if-not 'ansi-colors 'group-documentation "Translating SGR control sequences to text-properties.
+This translation effectively colorizes strings and regions based upon
+SGR control sequences embedded in the text.  SGR (Select Graphic
+Rendition) control sequences are defined in section 3.8.117 of the
+ECMA-48 standard (identical to ISO/IEC 6429), which is freely available
+as a PDF file <URL:http://www.ecma.ch/ecma1/STAND/ECMA-048.HTM>.")
+(custom-put-if-not 'vc-sccs-register-switches 'custom-version "21.1")
+(custom-put-if-not 'vc-sccs-register-switches 'standard-value t)
 (custom-put-if-not 'midnight 'custom-version "20.3")
 (custom-put-if-not 'midnight 'group-documentation "Run something every day at midnight.")
+(custom-put-if-not 'speedbar-use-images 'custom-version "21.1")
+(custom-put-if-not 'speedbar-use-images 'standard-value t)
 (custom-put-if-not 'automatic-hscrolling 'custom-version "21.1")
 (custom-put-if-not 'automatic-hscrolling 'standard-value t)
 (custom-put-if-not 'custom-buffer-done-function 'custom-version "21.1")
@@ -676,16 +738,22 @@
 (custom-put-if-not 'fortran-comment-line-start 'standard-value t)
 (custom-put-if-not 'fringe 'custom-version "21.1")
 (custom-put-if-not 'fringe 'group-documentation nil)
+(custom-put-if-not 'vc-rcs-header 'custom-version "21.1")
+(custom-put-if-not 'vc-rcs-header 'standard-value t)
 (custom-put-if-not 'vhdl 'custom-version "20.4")
 (custom-put-if-not 'vhdl 'group-documentation "Customizations for VHDL Mode.")
 (custom-put-if-not 'show-paren-priority 'custom-version "21.1")
 (custom-put-if-not 'show-paren-priority 'standard-value t)
-(custom-put-if-not 'vc-handled-backends 'custom-version "20.5")
+(custom-put-if-not 'vc-handled-backends 'custom-version "21.1")
 (custom-put-if-not 'vc-handled-backends 'standard-value t)
 (custom-put-if-not 'find-function-recenter-line 'custom-version "20.3")
 (custom-put-if-not 'find-function-recenter-line 'standard-value t)
 (custom-put-if-not 'tags-tag-face 'custom-version "21.1")
 (custom-put-if-not 'tags-tag-face 'standard-value t)
+(custom-put-if-not 'change-log-list-face 'custom-version "21.1")
+(custom-put-if-not 'change-log-list-face 'group-documentation nil)
+(custom-put-if-not 'vc-rcs-register-switches 'custom-version "21.1")
+(custom-put-if-not 'vc-rcs-register-switches 'standard-value t)
 (custom-put-if-not 'mail-citation-prefix-regexp 'custom-version "20.3")
 (custom-put-if-not 'mail-citation-prefix-regexp 'standard-value t)
 (custom-put-if-not 'diary-mail-days 'custom-version "20.3")
@@ -716,6 +784,8 @@
 (custom-put-if-not 'finger-X.500-host-regexps 'standard-value t)
 (custom-put-if-not 'uce-mail-reader 'custom-version "20.3")
 (custom-put-if-not 'uce-mail-reader 'standard-value t)
+(custom-put-if-not 'gnus-charset 'custom-version "21.1")
+(custom-put-if-not 'gnus-charset 'group-documentation "Group character set issues.")
 (custom-put-if-not 'calculator 'custom-version "21.1")
 (custom-put-if-not 'calculator 'group-documentation "Simple pocket calculator.")
 (custom-put-if-not 'custom-button-pressed-face 'custom-version "21.1")
@@ -744,10 +814,18 @@
 (custom-put-if-not 'pcl-cvs 'group-documentation "Special support for the CVS versioning system.")
 (custom-put-if-not 'windmove 'custom-version "21.1")
 (custom-put-if-not 'windmove 'group-documentation "Directional selection of windows in a frame.")
+(custom-put-if-not 'strokes-char-face 'custom-version "21.1")
+(custom-put-if-not 'strokes-char-face 'group-documentation nil)
+(custom-put-if-not 'vc-cvs-stay-local 'custom-version "21.1")
+(custom-put-if-not 'vc-cvs-stay-local 'standard-value t)
 (custom-put-if-not 'fortran-comment-line-start-skip 'custom-version "21.1")
 (custom-put-if-not 'fortran-comment-line-start-skip 'standard-value t)
 (custom-put-if-not 'checkdoc 'custom-version "20.3")
 (custom-put-if-not 'checkdoc 'group-documentation "Support for doc string checking in Emacs Lisp.")
+(custom-put-if-not 'imap 'custom-version "21.1")
+(custom-put-if-not 'imap 'group-documentation "Low-level IMAP issues.")
+(custom-put-if-not 'change-log-acknowledgement-face 'custom-version "21.1")
+(custom-put-if-not 'change-log-acknowledgement-face 'group-documentation nil)
 (custom-put-if-not 'mail-abbrevs-mode 'custom-version "20.3")
 (custom-put-if-not 'mail-abbrevs-mode 'standard-value t)
 (custom-put-if-not 'scrolling 'custom-version "21.1")
@@ -758,6 +836,8 @@
 (custom-put-if-not 'temp-buffer-max-height 'standard-value t)
 (custom-put-if-not 'border 'custom-version "21.1")
 (custom-put-if-not 'border 'group-documentation nil)
+(custom-put-if-not 'speedbar-indentation-width 'custom-version "21.1")
+(custom-put-if-not 'speedbar-indentation-width 'standard-value t)
 (custom-put-if-not 'hl-line 'custom-version "21.1")
 (custom-put-if-not 'hl-line 'group-documentation "Highliight the current line.")
 (custom-put-if-not 'find-file-wildcards 'custom-version "20.4")
@@ -770,7 +850,7 @@
 (custom-put-if-not 'show-paren-ring-bell-on-mismatch 'standard-value t)
 (custom-put-if-not 'rmail-default-body-file 'custom-version "20.3")
 (custom-put-if-not 'rmail-default-body-file 'standard-value t)
-(custom-put-if-not 'vc-dired-listing-switches 'custom-version "21.0")
+(custom-put-if-not 'vc-dired-listing-switches 'custom-version "21.1")
 (custom-put-if-not 'vc-dired-listing-switches 'standard-value t)
 (custom-put-if-not 'rmail-movemail-flags 'custom-version "20.3")
 (custom-put-if-not 'rmail-movemail-flags 'standard-value t)
@@ -784,6 +864,8 @@
 (custom-put-if-not 'diff-mode 'group-documentation "Major-mode for viewing/editing diffs")
 (custom-put-if-not 'dabbrev-ignored-buffer-names 'custom-version "20.3")
 (custom-put-if-not 'dabbrev-ignored-buffer-names 'standard-value t)
+(custom-put-if-not 'change-log-file-face 'custom-version "21.1")
+(custom-put-if-not 'change-log-file-face 'group-documentation nil)
 (custom-put-if-not 'diary-unknown-time 'custom-version "20.3")
 (custom-put-if-not 'diary-unknown-time 'standard-value t)
 (custom-put-if-not 'browse-url-lynx-emacs-args 'custom-version "20.3")
@@ -798,6 +880,8 @@
 (custom-put-if-not 'vc-default-init-version 'standard-value t)
 (custom-put-if-not 'gametree 'custom-version "20.3")
 (custom-put-if-not 'gametree 'group-documentation "Manage game analysis trees in Emacs.")
+(custom-put-if-not 'change-log-function-face 'custom-version "21.1")
+(custom-put-if-not 'change-log-function-face 'group-documentation nil)
 (custom-put-if-not 'hscroll-global-mode 'custom-version "20.3")
 (custom-put-if-not 'hscroll-global-mode 'standard-value t)
 (custom-put-if-not 'auto-save-file-name-transforms 'custom-version "21.1")
@@ -822,12 +906,14 @@
 (custom-put-if-not 'vc-dired-terse-display 'standard-value t)
 (custom-put-if-not 'server-kill-new-buffers 'custom-version "21.1")
 (custom-put-if-not 'server-kill-new-buffers 'standard-value t)
+(custom-put-if-not 'speedbar-hide-button-brackets-flag 'custom-version "21.1")
+(custom-put-if-not 'speedbar-hide-button-brackets-flag 'standard-value t)
 (custom-put-if-not 'delphi 'custom-version "21.1")
 (custom-put-if-not 'delphi 'group-documentation "Major mode for editing Delphi source in Emacs")
 (custom-put-if-not 'eval-expression-print-level 'custom-version "21.1")
 (custom-put-if-not 'eval-expression-print-level 'standard-value t)
 
-(defvar custom-versions-load-alist '(("21.0" "vc") ("20.3.3" "dos-vars") (21.1 "ange-ftp") ("20.4" "files" "sh-script" "help" "compile") ("20.5" "vc-hooks") ("20.8" "sql") ("21.1" "server" "debug" "dabbrev" "files" "paths" "sgml-mode" "net-utils" "font-lock" "paren" "fortran" "etags" "cus-edit" "frame" "add-log" "find-func" "wid-edit" "simple") ("20.3" "desktop" "easymenu" "hscroll" "dabbrev" "ffap" "rmail" "paren" "mailabbrev" "frame" "uce" "mouse" "diary-lib" "sendmail" "debug" "hexl" "vcursor" "vc" "compile" "etags" "help" "browse-url" "add-log" "find-func" "cus-edit" "replace"))
+(defvar custom-versions-load-alist '(("20.3.3" "dos-vars") (21.1 "ange-ftp") ("20.4" "files" "sh-script" "help" "compile") ("20.3" "desktop" "easymenu" "hscroll" "dabbrev" "ffap" "rmail" "paren" "mailabbrev" "frame" "uce" "mouse" "diary-lib" "sendmail" "debug" "hexl" "vcursor" "vc" "compile" "etags" "help" "browse-url" "add-log" "find-func" "cus-edit" "replace") ("21.1" "server" "debug" "dabbrev" "vc" "paths" "sgml-mode" "net-utils" "font-lock" "vc-hooks" "paren" "fortran" "etags" "cus-edit" "frame" "vc-sccs" "files" "add-log" "find-func" "wid-edit" "vc-rcs" "vc-cvs" "simple" "speedbar") ("20.8" "ansi-color" "sql"))
  "For internal use by custom.")
 
 (provide 'cus-load)
diff --git a/lisp/ielm.el b/lisp/ielm.el
index a0973800271..8194a653e24 100644
--- a/lisp/ielm.el
+++ b/lisp/ielm.el
@@ -42,12 +42,12 @@
 ;;    (setq ielm-mode-hook
 ;;          '(lambda nil
 ;;               (define-key ielm-map "\t"
-;;                  '(lambda nil (interactive) (or (ielm-tab) 
+;;                  '(lambda nil (interactive) (or (ielm-tab)
 ;;                                                 (lisp-complete-symbol))))))
 
 ;; To start: M-x ielm.  Type C-h m in the *ielm* buffer for more info.
 
-;; The latest version is available by WWW from 
+;; The latest version is available by WWW from
 ;;      http://mathssun5.lancs.ac.uk:2080/~maa036/elisp/dir.html
 ;; or by anonymous FTP from
 ;;      /anonymous@wingra.stat.wisc.edu:pub/src/emacs-lisp/ielm.el.gz
@@ -102,14 +102,14 @@ such as `edebug-defun' to work with such inputs."
 
 (defvar *** nil
   "Third-most-recent value evaluated in IELM.")
-  
+
 ;;; System variables
 
 (defvar ielm-working-buffer nil
   "Buffer in which IELM sexps will be evaluated.
 This variable is buffer-local.")
 
-(defvar ielm-header 
+(defvar ielm-header
   "*** Welcome to IELM ***  Type (describe-mode) for help.\n"
   "Message to display when IELM is started.")
 
@@ -127,9 +127,9 @@ This variable is buffer-local.")
   (define-key ielm-map "\C-j" 'ielm-send-input)
   (define-key ielm-map "\e\C-x" 'eval-defun)         ; for consistency with
   (define-key ielm-map "\e\t" 'lisp-complete-symbol) ; lisp-interaction-mode
-  ;; These bindings are from shared-lisp-mode-map -- can you inherit
+  ;; These bindings are from `lisp-mode-shared-map' -- can you inherit
   ;; from more than one keymap??
-  (define-key ielm-map "\e\C-q" 'indent-sexp)      
+  (define-key ielm-map "\e\C-q" 'indent-sexp)
   (define-key ielm-map "\177" 'backward-delete-char-untabify)
   ;; Some convenience bindings for setting the working buffer
   (define-key ielm-map "\C-c\C-b" 'ielm-change-working-buffer)
@@ -137,13 +137,13 @@ This variable is buffer-local.")
   (define-key ielm-map "\C-c\C-v" 'ielm-print-working-buffer))
 
 (defvar ielm-font-lock-keywords
-  (list 
+  (list
    (cons (concat "^" (regexp-quote ielm-prompt)) 'font-lock-keyword-face)
    '("\\(^\\*\\*\\*[^*]+\\*\\*\\*\\)\\(.*$\\)"
      (1 font-lock-comment-face)
      (2 font-lock-constant-face)))
   "Additional expressions to highlight in ielm buffers.")
-        
+
 ;;; Completion stuff
 
 (defun ielm-tab nil
@@ -154,7 +154,7 @@ This variable is buffer-local.")
       (progn
         (ielm-indent-line)
         t)))
-  
+
 (defun ielm-complete-symbol nil
   "Complete the lisp symbol before point."
   ;; A wrapper for lisp-complete symbol that returns non-nil if
@@ -164,9 +164,9 @@ This variable is buffer-local.")
          (ctick (and cbuffer (buffer-modified-tick cbuffer))))
     (lisp-complete-symbol)
      ;; completion has occurred if:
-    (or 
+    (or
      ;; the buffer has been modified
-     (not (= btick (buffer-modified-tick))) 
+     (not (= btick (buffer-modified-tick)))
      ;; a completions buffer has been modified or created
      (if cbuffer
          (not (= ctick (buffer-modified-tick cbuffer)))
@@ -176,7 +176,7 @@ This variable is buffer-local.")
   "Dynamically complete filename before point, if in a string."
   (if (nth 3 (parse-partial-sexp comint-last-input-start (point)))
       (comint-dynamic-complete-filename)))
-     
+
 (defun ielm-indent-line nil
   "Indent the current line as Lisp code if it is not a prompt line."
   (when (save-excursion (comint-bol) (bolp))
@@ -214,8 +214,8 @@ Complete sexps are evaluated; for incomplete sexps inserts a newline
 and indents.  If however `ielm-dynamic-return' is nil, this always
 simply inserts a newline."
   (interactive)
-  (if ielm-dynamic-return 
-      (let ((state       
+  (if ielm-dynamic-return
+      (let ((state
              (save-excursion
                (end-of-line)
                (parse-partial-sexp (ielm-pm)
@@ -235,7 +235,7 @@ simply inserts a newline."
 (defvar ielm-input)
 
 (defun ielm-input-sender (proc input)
-  ;; Just sets the variable ielm-input, which is in the scope of 
+  ;; Just sets the variable ielm-input, which is in the scope of
   ;; `ielm-send-input's call.
   (setq ielm-input input))
 
@@ -392,7 +392,7 @@ Uses the interface provided by `comint-mode' (which see).
   Inputs longer than one line are moved to the line following the
   prompt (but see variable `ielm-dynamic-multiline-inputs').
 
-* \\[comint-dynamic-complete] completes Lisp symbols (or filenames, within strings), 
+* \\[comint-dynamic-complete] completes Lisp symbols (or filenames, within strings),
   or indents the line if there is nothing to complete.
 
 During evaluations, the values of the variables `*', `**', and `***'
@@ -425,7 +425,7 @@ Customised bindings may be defined in `ielm-map', which currently contains:
   (setq paragraph-start comint-prompt-regexp)
   (setq comint-input-sender 'ielm-input-sender)
   (setq comint-process-echoes nil)
-  (setq comint-dynamic-complete-functions 
+  (setq comint-dynamic-complete-functions
         '(ielm-tab comint-replace-by-expanded-history ielm-complete-filename ielm-complete-symbol))
   (setq comint-get-old-input 'ielm-get-old-input)
   (make-local-variable 'comint-completion-addsuffix)
@@ -454,9 +454,9 @@ Customised bindings may be defined in `ielm-map', which currently contains:
 
   ;; font-lock support
   (make-local-variable 'font-lock-defaults)
-  (setq font-lock-defaults 
+  (setq font-lock-defaults
         '(ielm-font-lock-keywords nil nil ((?: . "w") (?- . "w") (?* . "w"))))
-  
+
   ;; A dummy process to keep comint happy. It will never get any input
   (if (comint-check-proc (current-buffer)) nil
     (start-process "ielm" (current-buffer) "cat")
diff --git a/lisp/ledit.el b/lisp/ledit.el
index a54e976cf85..66ebe146a23 100644
--- a/lisp/ledit.el
+++ b/lisp/ledit.el
@@ -39,7 +39,7 @@
 (defconst ledit-read-file
   (expand-file-name (concat (user-login-name) ".l2") temporary-file-directory)
   "File name for data sent to Ledit by Lisp.")
-(defconst ledit-compile-file 
+(defconst ledit-compile-file
   (expand-file-name (concat (user-login-name) ".l4") temporary-file-directory)
   "File name for data sent to Lisp compiler by Ledit.")
 (defconst ledit-buffer "*LEDIT*"
@@ -120,9 +120,9 @@
 
 (defun ledit-setup ()
   "Set up key bindings for the Lisp/Emacs interface."
-  (if (not ledit-mode-map)
-      (progn (setq ledit-mode-map (nconc (make-sparse-keymap) 
-                                         shared-lisp-mode-map))))
+  (unless ledit-mode-map
+    (setq ledit-mode-map (make-sparse-keymap))
+    (set-keymap-parent ledit-mode-map lisp-mode-shared-map))
   (define-key ledit-mode-map "\e\^d" 'ledit-save-defun)
   (define-key ledit-mode-map "\e\^r" 'ledit-save-region)
   (define-key ledit-mode-map "\^xz" 'ledit-go-to-lisp)
diff --git a/lisp/progmodes/inf-lisp.el b/lisp/progmodes/inf-lisp.el
index 63d63612075..c1b3a5e58bc 100644
--- a/lisp/progmodes/inf-lisp.el
+++ b/lisp/progmodes/inf-lisp.el
@@ -33,7 +33,7 @@
 ;; and Zwei (the Lisp Machine emacs).
 
 ;; Since this mode is built on top of the general command-interpreter-in-
-;; a-buffer mode (comint mode), it shares a common base functionality, 
+;; a-buffer mode (comint mode), it shares a common base functionality,
 ;; and a common set of bindings, with all modes derived from comint mode.
 ;; This makes these modes easier to use.
 
@@ -55,7 +55,7 @@
 ;; would be reflected in the transcript with suitable comments, e.g.
 ;; ";;; redefining fact". Several ways to do this. Which is right?
 ;;
-;; When sending text from a source file to a subprocess, the process-mark can 
+;; When sending text from a source file to a subprocess, the process-mark can
 ;; move off the window, so you can lose sight of the process interactions.
 ;; Maybe I should ensure the process mark is in the window when I send
 ;; text to the process? Switch selectable?
@@ -70,24 +70,22 @@
 (defvar inferior-lisp-filter-regexp "\\`\\s *\\(:\\(\\w\\|\\s_\\)\\)?\\s *\\'"
   "*What not to save on inferior Lisp's input history.
 Input matching this regexp is not saved on the input history in Inferior Lisp
-mode.  Default is whitespace followed by 0 or 1 single-letter colon-keyword 
+mode.  Default is whitespace followed by 0 or 1 single-letter colon-keyword
 \(as in :a, :c, etc.)")
 
 (defvar inferior-lisp-mode-map nil)
-(cond ((not inferior-lisp-mode-map)
-       (setq inferior-lisp-mode-map
-             (copy-keymap comint-mode-map))
-       (setq inferior-lisp-mode-map
-             (nconc inferior-lisp-mode-map shared-lisp-mode-map))
-       (define-key inferior-lisp-mode-map "\C-x\C-e" 'lisp-eval-last-sexp)
-       (define-key inferior-lisp-mode-map "\C-c\C-l" 'lisp-load-file)
-       (define-key inferior-lisp-mode-map "\C-c\C-k" 'lisp-compile-file)
-       (define-key inferior-lisp-mode-map "\C-c\C-a" 'lisp-show-arglist)
-       (define-key inferior-lisp-mode-map "\C-c\C-d" 'lisp-describe-sym)
-       (define-key inferior-lisp-mode-map "\C-c\C-f"
-         'lisp-show-function-documentation)
-       (define-key inferior-lisp-mode-map "\C-c\C-v"
-         'lisp-show-variable-documentation)))
+(unless inferior-lisp-mode-map
+  (setq inferior-lisp-mode-map (copy-keymap comint-mode-map))
+  (set-keymap-parent inferior-lisp-mode-map lisp-mode-shared-map)
+  (define-key inferior-lisp-mode-map "\C-x\C-e" 'lisp-eval-last-sexp)
+  (define-key inferior-lisp-mode-map "\C-c\C-l" 'lisp-load-file)
+  (define-key inferior-lisp-mode-map "\C-c\C-k" 'lisp-compile-file)
+  (define-key inferior-lisp-mode-map "\C-c\C-a" 'lisp-show-arglist)
+  (define-key inferior-lisp-mode-map "\C-c\C-d" 'lisp-describe-sym)
+  (define-key inferior-lisp-mode-map "\C-c\C-f"
+    'lisp-show-function-documentation)
+  (define-key inferior-lisp-mode-map "\C-c\C-v"
+    'lisp-show-variable-documentation))
 
 ;;; These commands augment Lisp mode, so you can process Lisp code in
 ;;; the source files.
@@ -126,7 +124,7 @@ mode.  Default is whitespace followed by 0 or 1 single-letter colon-keyword
   (define-key lisp-mode-map "\C-cd" 'lisp-describe-sym)
   (define-key lisp-mode-map "\C-cf" 'lisp-show-function-documentation)
   (define-key lisp-mode-map "\C-cv" 'lisp-show-variable-documentation)
-  
+
   (define-key inferior-lisp-mode-map "\C-cl" 'lisp-load-file)
   (define-key inferior-lisp-mode-map "\C-ck" 'lisp-compile-file)
   (define-key inferior-lisp-mode-map "\C-ca" 'lisp-show-arglist)
@@ -154,7 +152,7 @@ but it works only in Common Lisp.")
 (defvar inferior-lisp-prompt "^[^> \n]*>+:? *"
   "Regexp to recognise prompts in the Inferior Lisp mode.
 Defaults to \"^[^> \\n]*>+:? *\", which works pretty good for Lucid, kcl,
-and franz.  This variable is used to initialize `comint-prompt-regexp' in the 
+and franz.  This variable is used to initialize `comint-prompt-regexp' in the
 Inferior Lisp buffer.
 
 This variable is only used if the variable
@@ -187,10 +185,10 @@ have three inferior Lisps running:
     foo                 inferior-lisp
     bar                 inferior-lisp<2>
     *inferior-lisp*     inferior-lisp<3>
-If you do a \\[lisp-eval-defun] command on some Lisp source code, 
+If you do a \\[lisp-eval-defun] command on some Lisp source code,
 what process do you send it to?
 
-- If you're in a process buffer (foo, bar, or *inferior-lisp*), 
+- If you're in a process buffer (foo, bar, or *inferior-lisp*),
   you send it to that process.
 - If you're in some other buffer (e.g., a source file), you
   send it to the process attached to buffer `inferior-lisp-buffer'.
@@ -208,8 +206,8 @@ buffer with \\[set-variable].")
 
 (put 'inferior-lisp-mode 'mode-class 'special)
 
-(defun inferior-lisp-mode () 
-  "Major mode for interacting with an inferior Lisp process.  
+(defun inferior-lisp-mode ()
+  "Major mode for interacting with an inferior Lisp process.
 Runs a Lisp interpreter as a subprocess of Emacs, with Lisp I/O through an
 Emacs buffer.  Variable `inferior-lisp-program' controls which Lisp interpreter
 is run.  Variables `inferior-lisp-prompt', `inferior-lisp-filter-regexp' and
@@ -225,7 +223,7 @@ Customisation: Entry to this mode runs the hooks on `comint-mode-hook' and
 `inferior-lisp-mode-hook' (in that order).
 
 You can send text to the inferior Lisp process from other buffers containing
-Lisp source.  
+Lisp source.
     switch-to-lisp switches the current buffer to the Lisp process buffer.
     lisp-eval-defun sends the current defun to the Lisp process.
     lisp-compile-defun compiles the current defun.
@@ -237,7 +235,7 @@ Lisp source.
     the text.
 
 Commands:
-Return after the end of the process' output sends the text from the 
+Return after the end of the process' output sends the text from the
     end of process to point.
 Return before the end of the process' output copies the sexp ending at point
     to the end of the process' output, and sends it.
@@ -321,7 +319,7 @@ Prefix argument means switch to the Lisp buffer afterwards."
   (interactive "P")
   (lisp-eval-region (save-excursion (backward-sexp) (point)) (point) and-go))
 
-;;; Common Lisp COMPILE sux. 
+;;; Common Lisp COMPILE sux.
 (defun lisp-compile-region (start end &optional and-go)
   "Compile the current region in the inferior Lisp process.
 Prefix argument means switch to the Lisp buffer afterwards."
@@ -404,7 +402,7 @@ With argument, positions cursor at end of buffer."
 ;;;                             (buffer-substring body-start (point))))
 ;;;      (process-send-string "inferior-lisp" ")\n"))
 ;;;     (t (lisp-eval-region start end)))))
-;;; 
+;;;
 ;;; (defun lisp-compile-region (start end)
 ;;;   "Each s-expression in the current region is compiled (if a DEFUN)
 ;;; or evaluated (if not) in the inferior lisp."
@@ -420,7 +418,7 @@ With argument, positions cursor at end of buffer."
 ;;;     (setq s (point))
 ;;;     (end-of-defun))
 ;;;       (if (< s end) (lisp-compile-sexp s end)))))
-;;; 
+;;;
 ;;; End of HS-style code
 
 
@@ -588,7 +586,7 @@ This is a good place to put keybindings.")
 ;;;   this is now the official inferior lisp package.  Use the global
 ;;;   ChangeLog from now on.
 ;;; 5/24/90 Olin
-;;; - Split cmulisp and cmushell modes into separate files. 
+;;; - Split cmulisp and cmushell modes into separate files.
 ;;;   Not only is this a good idea, it's apparently the way it'll be rel 19.
 ;;; - Upgraded process sends to use comint-send-string instead of
 ;;;   process-send-string.
@@ -612,7 +610,7 @@ This is a good place to put keybindings.")
 ;;; supposed to be reserved for the user to bind. This affected
 ;;; mainly the compile/eval-defun/region[-and-go] commands.
 ;;; This was painful, but necessary to adhere to the gnumacs standard.
-;;; For some backwards compatibility, see the 
+;;; For some backwards compatibility, see the
 ;;;     cmulisp-install-letter-bindings
 ;;; function.
 ;;;
diff --git a/lisp/progmodes/scheme.el b/lisp/progmodes/scheme.el
index 94dfbf53dd7..f1bd51309d9 100644
--- a/lisp/progmodes/scheme.el
+++ b/lisp/progmodes/scheme.el
@@ -174,13 +174,12 @@
 
 (defvar scheme-mode-map nil
   "Keymap for Scheme mode.
-All commands in `shared-lisp-mode-map' are inherited by this map.")
+All commands in `lisp-mode-shared-map' are inherited by this map.")
 
-(if scheme-mode-map
-    ()
+(unless scheme-mode-map
   (let ((map (make-sparse-keymap "Scheme")))
-    (setq scheme-mode-map
-          (nconc (make-sparse-keymap) shared-lisp-mode-map))
+    (setq scheme-mode-map (make-sparse-keymap))
+    (set-keymap-parent scheme-mode-map shared-lisp-mode-map)
     (define-key scheme-mode-map [menu-bar] (make-sparse-keymap))
     (define-key scheme-mode-map [menu-bar scheme]
       (cons "Scheme" map))