*** empty log message ***

3 files changed, 41 insertions, 17 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3f2b5e72d37..b7ef0c44eee 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,8 +3,7 @@
         * emacs-lisp/helper.el (Helper-describe-mode): Make buffer
         writable.
 
-        * frame.el (show-cursor-in-non-selected-windows): New option.
-        (busy-cursor-delay-seconds): New option.
+        * frame.el (busy-cursor-delay-seconds): New option.
 
 2000-02-24  Gerd Moellmann  <gerd@gnu.org>
 
diff --git a/lisp/cus-load.el b/lisp/cus-load.el
index fe5327fa89c..41c60959d52 100644
--- a/lisp/cus-load.el
+++ b/lisp/cus-load.el
@@ -53,12 +53,14 @@
 (put 'dirtrack 'custom-loads '("dirtrack"))
 (put 'ediff-window 'custom-loads '("ediff-wind"))
 (put 'bruce 'custom-loads '("bruce"))
-(put 'windows 'custom-loads '("window" "follow"))
+(put 'windows 'custom-loads '("window" "follow" "windmove"))
 (put 'gnus-exit 'custom-loads '("gnus-group" "gnus"))
 (put 'speedbar 'custom-loads '("speedbar"))
 (put 'etags 'custom-loads '("etags"))
 (put 'f90-indent 'custom-loads '("f90"))
 (put 'octave-inferior 'custom-loads '("octave-inf" "octave-mod"))
+(put 'ebnf-non-terminal 'custom-loads '("ebnf2ps"))
+(put 'ebnf-terminal 'custom-loads '("ebnf2ps"))
 (put 'gnus-summary-maneuvering 'custom-loads '("gnus-sum"))
 (put 'gnus-start 'custom-loads '("gnus-group" "gnus-int" "gnus-start" "gnus-util" "gnus"))
 (put 'dcl 'custom-loads '("dcl-mode"))
@@ -73,7 +75,7 @@
 (put 'fortran-comment 'custom-loads '("fortran"))
 (put 'viper 'custom-loads '("viper-ex" "viper-init" "viper-keym" "viper-macs" "viper-mous" "viper"))
 (put 'ps-print-page 'custom-loads '("ps-print"))
-(put 'postscript 'custom-loads '("ps-print"))
+(put 'postscript 'custom-loads '("ps-print" "ebnf2ps"))
 (put 'gnus-undo 'custom-loads '("gnus-undo"))
 (put 'widget-faces 'custom-loads '("wid-edit"))
 (put 'resize-minibuffer 'custom-loads '("rsz-mini"))
@@ -86,6 +88,7 @@
 (put 'flyspell 'custom-loads '("flyspell"))
 (put 'ange-ftp 'custom-loads '("ange-ftp"))
 (put 'font-lock-extra-types 'custom-loads '("font-lock"))
+(put 'ebnf-shape 'custom-loads '("ebnf2ps"))
 (put 'minibuffer 'custom-loads '("simple" "complete" "icomplete"))
 (put 'gnus-meta 'custom-loads '("gnus"))
 (put 'mouse-sel 'custom-loads '("mouse-sel"))
@@ -123,13 +126,14 @@
 (put 'gnus-treading 'custom-loads '("gnus-sum"))
 (put 'idlwave-external-programs 'custom-loads '("idlwave"))
 (put 'strokes 'custom-loads '("strokes"))
-(put 'mouse 'custom-loads '("mouse" "menu-bar" "avoid" "goto-addr" "mouse-sel" "msb" "mwheel" "strokes" "tooltip"))
+(put 'mouse 'custom-loads '("faces" "mouse" "menu-bar" "avoid" "goto-addr" "mouse-sel" "msb" "mwheel" "strokes" "tooltip"))
 (put 'nnmail-various 'custom-loads '("nnmail"))
 (put 'extensions 'custom-loads '("generic" "iswitchb" "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"))
 (put 'speedbar-faces 'custom-loads '("speedbar" "vhdl-mode"))
-(put 'rmail 'custom-loads '("paths" "rmail"))
+(put 'rmail 'custom-loads '("paths" "rmail" "undigest"))
 (put 'ps-print-n-up 'custom-loads '("ps-print"))
 (put 'ps-print-printer 'custom-loads '("ps-print"))
 (put 'message-various 'custom-loads '("message"))
@@ -143,7 +147,7 @@
 (put 'reftex-making-and-inserting-labels 'custom-loads '("reftex-vars"))
 (put 'calendar-hooks 'custom-loads '("calendar"))
 (put 'mailalias 'custom-loads '("mailalias"))
-(put 'frames 'custom-loads '("frame" "scroll-bar" "menu-bar" "desktop" "ediff-wind" "imenu" "rsz-mini" "two-column"))
+(put 'frames 'custom-loads '("frame" "faces" "scroll-bar" "menu-bar" "desktop" "ediff-wind" "imenu" "rsz-mini" "two-column"))
 (put 'gnus-server 'custom-loads '("gnus"))
 (put 'paren-showing 'custom-loads '("paren"))
 (put 'dos-fns 'custom-loads '("dos-vars"))
@@ -188,7 +192,7 @@
 (put 'gnus-nocem 'custom-loads '("gnus-nocem"))
 (put 'gnus-group-visual 'custom-loads '("gnus-group" "gnus"))
 (put 'paren-matching 'custom-loads '("simple" "paren"))
-(put 'font-lock 'custom-loads '("font-lock" "frame"))
+(put 'font-lock 'custom-loads '("font-lock" "frame" "faces"))
 (put 'auto-save 'custom-loads '("files" "startup"))
 (put 'tpu 'custom-loads '("tpu-edt" "tpu-extras"))
 (put 'gnus-cite 'custom-loads '("gnus-cite"))
@@ -209,6 +213,7 @@
 (put 'matching 'custom-loads '("simple" "isearch" "replace" "bookmark" "completion" "ffap" "imenu"))
 (put 'custom-faces 'custom-loads '("cus-edit"))
 (put 'smtpmail 'custom-loads '("smtpmail"))
+(put 'ebnf-syntatic 'custom-loads '("ebnf2ps"))
 (put 'lisp-indent 'custom-loads '("cl-indent"))
 (put 'midnight 'custom-loads '("midnight"))
 (put 'tex 'custom-loads '("bibtex" "reftex-vars" "tex-mode"))
@@ -230,6 +235,7 @@
 (put 'view 'custom-loads '("view" "calendar"))
 (put 'cwarn 'custom-loads '("cwarn"))
 (put 'gnus-score-default 'custom-loads '("gnus-score" "gnus-sum"))
+(put 'ebnf-except 'custom-loads '("ebnf2ps"))
 (put 'nnmail-duplicate 'custom-loads '("nnmail"))
 (put 'handwrite 'custom-loads '("handwrite"))
 (put 'tags 'custom-loads '("speedbar"))
@@ -249,7 +255,7 @@
 (put 'gnus-edit-form 'custom-loads '("gnus-eform"))
 (put 'modula2 'custom-loads '("modula2"))
 (put 'ps-print-color 'custom-loads '("ps-print"))
-(put 'emacs 'custom-loads '("cus-edit" "ps-print"))
+(put 'emacs 'custom-loads '("cus-edit" "ebnf2ps"))
 (put 'comint 'custom-loads '("comint"))
 (put 'isearch 'custom-loads '("isearch"))
 (put 'reftex-fontification-configurations 'custom-loads '("reftex-vars"))
@@ -258,9 +264,10 @@
 (put 'ediff-merge 'custom-loads '("ediff-init" "ediff-merg"))
 (put 'vhdl 'custom-loads '("vhdl-mode"))
 (put 'gnus-summary-mail 'custom-loads '("gnus-sum"))
+(put 'ebnf-optimization 'custom-loads '("ebnf2ps"))
 (put 'apropos 'custom-loads '("apropos"))
 (put 'gomoku 'custom-loads '("gomoku"))
-(put 'tools 'custom-loads '("add-log" "compare-w" "diff-mode" "diff" "ediff" "elide-head" "emerge" "gud" "rcompile" "smerge-mode" "speedbar" "tempo" "tooltip" "vc" "which-func" "copyright" "compile" "etags" "make-mode"))
+(put 'tools 'custom-loads '("add-log" "calculator" "compare-w" "diff-mode" "diff" "ediff" "elide-head" "emerge" "gud" "rcompile" "smerge-mode" "speedbar" "tempo" "tooltip" "vc" "which-func" "copyright" "compile" "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"))
@@ -271,7 +278,7 @@
 (put 'rmail-summary 'custom-loads '("rmail" "rmailsum"))
 (put 'metamail 'custom-loads '("metamail"))
 (put 'winner 'custom-loads '("winner"))
-(put 'wp 'custom-loads '("cus-edit" "enriched" "lpr" "ps-print" "view" "bib-mode" "nroff-mode" "refbib" "refer" "scribe" "tildify"))
+(put 'wp 'custom-loads '("cus-edit" "enriched" "lpr" "ps-print" "view" "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"))
@@ -293,16 +300,16 @@
 (put 'pp 'custom-loads '("pp"))
 (put 'two-column 'custom-loads '("two-column"))
 (put 'message-forwarding 'custom-loads '("message"))
-(put 'ph 'custom-loads '("ph"))
 (put 'message-faces 'custom-loads '("message"))
 (put 'environment 'custom-loads '("cus-edit" "dired" "faces" "dos-vars"))
 (put 'perl 'custom-loads '("perl-mode"))
 (put 'vhdl-port 'custom-loads '("vhdl-mode"))
+(put 'calculator 'custom-loads '("calculator"))
 (put 'custom-menu 'custom-loads '("cus-edit"))
-(put 'comm 'custom-loads '("net-utils" "ph" "eudc-vars" "ldap"))
+(put 'comm 'custom-loads '("net-utils" "eudc-vars" "ldap"))
 (put 'type-break 'custom-loads '("type-break"))
 (put 'mh 'custom-loads '("mh-comp" "mh-e" "mh-utils"))
-(put 'convenience 'custom-loads '("abbrev" "autoinsert" "autorevert" "bs" "complete" "completion" "dabbrev" "ffap" "filecache" "follow" "hippie-exp" "imenu" "iswitchb" "repeat" "speedbar" "pc-select"))
+(put 'convenience 'custom-loads '("abbrev" "autoinsert" "autorevert" "bs" "calculator" "complete" "completion" "dabbrev" "ffap" "filecache" "follow" "hippie-exp" "imenu" "iswitchb" "repeat" "speedbar" "windmove" "pc-select"))
 (put 'lm 'custom-loads '("landmark"))
 (put 'idlwave-routine-info 'custom-loads '("idlwave"))
 (put 'm4 'custom-loads '("m4-mode"))
@@ -313,7 +320,7 @@
 (put 'nnmail-retrieve 'custom-loads '("nnmail"))
 (put 'gnus-duplicate 'custom-loads '("gnus-dup"))
 (put 'find-function 'custom-loads '("find-func"))
-(put 'menu 'custom-loads '("tmm" "easymenu"))
+(put 'menu 'custom-loads '("faces" "tmm" "easymenu"))
 (put 'vhdl-highlight 'custom-loads '("vhdl-mode"))
 (put 'widgets 'custom-loads '("wid-browse" "wid-edit"))
 (put 'PostScript 'custom-loads '("ps-mode"))
@@ -343,10 +350,12 @@
 (put 'files 'custom-loads '("files" "ange-ftp" "autoinsert" "autorevert" "cus-edit" "filecache" "recentf" "shadow"))
 (put 'rmail-files 'custom-loads '("rmail"))
 (put 'gnus-summary-format 'custom-loads '("gnus-sum" "gnus"))
+(put 'windmove 'custom-loads '("windmove"))
 (put 'terminals 'custom-loads '("terminal"))
 (put 'avoid 'custom-loads '("avoid"))
 (put 'compare-w 'custom-loads '("compare-w"))
 (put 'sh-indentation 'custom-loads '("sh-script"))
+(put 'ebnf-production 'custom-loads '("ebnf2ps"))
 (put 'gnus-files 'custom-loads '("gnus" "nnmail"))
 (put 'gnus-windows 'custom-loads '("gnus-win"))
 (put 'reftex-label-support 'custom-loads '("reftex-vars"))
@@ -370,6 +379,7 @@
 (put 'reftex-referencing-labels 'custom-loads '("reftex-vars"))
 (put 'gnus-article-various 'custom-loads '("gnus-art" "gnus-sum"))
 (put 'ediff-diff 'custom-loads '("ediff-diff"))
+(put 'ebnf-repeat 'custom-loads '("ebnf2ps"))
 (put 'supercite 'custom-loads '("supercite"))
 (put 'font-selection 'custom-loads '("faces"))
 (put 'gnus-summary-marks 'custom-loads '("gnus-sum" "gnus"))
@@ -388,7 +398,7 @@
 (put 'hippie-expand 'custom-loads '("hippie-exp"))
 (put 'refer 'custom-loads '("refer"))
 (put 'message-mail 'custom-loads '("message"))
-(put 'modeline 'custom-loads '("time"))
+(put 'modeline 'custom-loads '("faces" "time"))
 (put 'archive-zoo 'custom-loads '("arc-mode"))
 (put 'gnus-group-level 'custom-loads '("gnus"))
 (put 'bibtex 'custom-loads '("bibtex"))
@@ -428,7 +438,7 @@
 (put 'pascal 'custom-loads '("pascal"))
 (put 'rmail-retrieve 'custom-loads '("rmail"))
 (put 'data 'custom-loads '("text-mode" "arc-mode" "forms" "hexl" "jka-compr" "saveplace" "snmp-mode" "sort" "tar-mode" "time-stamp"))
-(put 'mail 'custom-loads '("simple" "startup" "ph" "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 '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 'paren-blinking 'custom-loads '("simple"))
 (put 'gnus-summary-sort 'custom-loads '("gnus-sum"))
 (put 'fast-lock 'custom-loads '("fast-lock"))
@@ -460,6 +470,7 @@
 (put 'spook 'custom-loads '("spook"))
 (put 'tex-file 'custom-loads '("tex-mode"))
 (put 'time-stamp 'custom-loads '("time-stamp"))
+(put 'ebnf-special 'custom-loads '("ebnf2ps"))
 (put 'gnus-article-highlight 'custom-loads '("gnus-art" "gnus"))
 (put 'tooltip 'custom-loads '("tooltip"))
 (put 'gud 'custom-loads '("gud"))
@@ -490,11 +501,13 @@
 (put 'viper-search 'custom-loads '("viper-init"))
 (put 'C 'custom-loads '("cpp"))
 (put 'mule 'custom-loads '("mule-cmds"))
+(put 'glasses 'custom-loads '("glasses"))
 (put 'vhdl-style 'custom-loads '("vhdl-mode"))
 (put 'tempo 'custom-loads '("tempo"))
 (put 'c 'custom-loads '("tooltip" "cc-vars" "cmacexp" "hideif"))
 (put 'nnmail-prepare 'custom-loads '("nnmail"))
 (put 'processes 'custom-loads '("comint" "cus-edit" "rcompile" "rlogin" "shell" "term" "metamail" "compile" "executable" "sql" "flyspell"))
+(put 'ebnf2ps 'custom-loads '("ebnf2ps"))
 (put 'sendmail 'custom-loads '("sendmail"))
 (put 'gnus-article-signature 'custom-loads '("gnus-art"))
 (put 'idlwave 'custom-loads '("idlw-shell" "idlwave"))
@@ -532,6 +545,8 @@
 (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 'custom-variable-default-form 'custom-version "20.3")
 (custom-put-if-not 'custom-variable-default-form 'standard-value t)
 (custom-put-if-not 'vc-ignore-vc-files 'custom-version "20.3")
@@ -652,6 +667,8 @@
 (custom-put-if-not 'jit-lock 'group-documentation "Font Lock support mode to fontify just-in-time.")
 (custom-put-if-not 'temp-buffer-resize-mode 'custom-version "20.4")
 (custom-put-if-not 'temp-buffer-resize-mode 'standard-value t)
+(custom-put-if-not 'bs 'custom-version "21.1")
+(custom-put-if-not 'bs 'group-documentation "Buffer Selection: Maintaining buffers by buffer menu.")
 (custom-put-if-not 'rmail-file-name 'custom-version "21.1")
 (custom-put-if-not 'rmail-file-name 'standard-value t)
 (custom-put-if-not 'cperl 'custom-version "20.3")
@@ -682,6 +699,8 @@
 (custom-put-if-not 'rmail-default-body-file 'standard-value t)
 (custom-put-if-not 'rmail-movemail-flags 'custom-version "20.3")
 (custom-put-if-not 'rmail-movemail-flags 'standard-value t)
+(custom-put-if-not 'recentf 'custom-version "21.1")
+(custom-put-if-not 'recentf 'group-documentation "Maintain a menu of recently opened files.")
 (custom-put-if-not 'dired-at-point-require-prefix 'custom-version "20.3")
 (custom-put-if-not 'dired-at-point-require-prefix 'standard-value t)
 (custom-put-if-not 'dabbrev-ignored-buffer-names 'custom-version "20.3")
@@ -692,6 +711,8 @@
 (custom-put-if-not 'browse-url-lynx-emacs-args 'standard-value t)
 (custom-put-if-not 'tooltip 'custom-version "21.1")
 (custom-put-if-not 'tooltip 'group-documentation "Customization group for the `tooltip' package.")
+(custom-put-if-not 'quickurl 'custom-version "21.1")
+(custom-put-if-not 'quickurl 'group-documentation "Insert an URL based on text at point in buffer.")
 (custom-put-if-not 'tool-bar 'custom-version "21.1")
 (custom-put-if-not 'tool-bar 'group-documentation nil)
 (custom-put-if-not 'vc-default-init-version 'custom-version "20.3")
@@ -714,6 +735,8 @@
 (custom-put-if-not 'desktop-enable 'standard-value t)
 (custom-put-if-not 'vc-dired-terse-display 'custom-version "20.3")
 (custom-put-if-not 'vc-dired-terse-display '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)
 
diff --git a/src/ChangeLog b/src/ChangeLog
index 178dd598c74..3acdb357088 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2000-02-25  Gerd Moellmann  <gerd@gnu.org>
 
+        * keyboard.c (recursive_edit_1): Cancel busy-cursor.
+
         * xfns.c (inhibit_busy_cursor, busy_count): Removed.
         (Fx_show_busy_cursor, Fx_hide_busy_cursor): Removed.
         (busy_cursor_atimer, busy_cursor_shown_p, Vbusy_cursor_delay): New