summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog13
-rw-r--r--lisp/cus-load.el8
-rw-r--r--lisp/loaddefs.el14
3 files changed, 26 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e5202a0d83c..175d5afffc6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2000-03-24 Gerd Moellmann <gerd@gnu.org>
+
+ * mail/rmail.el (rmail-confirm-expunge): New user-option.
+ (rmail-expunge): Ask for confirmation depending on the setting
+ of rmail-confirm-expunge.
+
+2000-03-23 Gerd Moellmann <gerd@gnu.org>
+
+ * Makefile (bootstrap-clean): If $(emacs) exists, build
+ loaddefs.el first. A loaddefs.el that's not up-to-date might
+ cause a bootstrap failure because things don't autoload as
+ expected.
+
2000-03-23 Dave Love <fx@gnu.org>
* net/browse-url.el: Restore previous use of
diff --git a/lisp/cus-load.el b/lisp/cus-load.el
index 32fe289ed45..cf0c724f6e6 100644
--- a/lisp/cus-load.el
+++ b/lisp/cus-load.el
@@ -183,7 +183,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-macro" "help" "apropos" "cus-edit" "info-look" "info" "man" "tooltip"))
+(put 'help 'custom-loads '("help" "apropos" "cus-edit" "help-macro" "info-look" "info" "man" "tooltip"))
(put 'forms 'custom-loads '("forms"))
(put 'widget-documentation 'custom-loads '("wid-edit"))
(put 'gnus-score-various 'custom-loads '("gnus-score" "gnus"))
@@ -278,7 +278,7 @@
(put 'rmail-summary 'custom-loads '("rmail" "rmailsum"))
(put 'metamail 'custom-loads '("metamail"))
(put 'winner 'custom-loads '("winner"))
-(put 'wp 'custom-loads '("view" "cus-edit" "enriched" "lpr" "ps-print" "ebnf2ps" "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"))
@@ -290,7 +290,7 @@
(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 '("ccl" "cus-edit" "double" "iso-acc" "iso-ascii" "ogonek"))
+(put 'i18n 'custom-loads '("cus-edit" "double" "ccl" "iso-acc" "iso-ascii" "ogonek"))
(put 'sh 'custom-loads '("sh-script"))
(put 'message-headers 'custom-loads '("message"))
(put 'idlwave-code-formatting 'custom-loads '("idlwave"))
@@ -426,7 +426,7 @@
(put 'message-sending 'custom-loads '("message"))
(put 'archive-arc 'custom-loads '("arc-mode"))
(put 'rmail-output 'custom-loads '("rmailout"))
-(put 'editing 'custom-loads '("simple" "view" "indent" "paragraphs" "auto-show" "cus-edit" "faces" "outline" "hl-line" "hscroll" "vcursor" "picture"))
+(put 'editing 'custom-loads '("simple" "indent" "paragraphs" "auto-show" "cus-edit" "faces" "outline" "hl-line" "hscroll" "vcursor" "view" "picture"))
(put 'crisp 'custom-loads '("crisp"))
(put 'nroff 'custom-loads '("nroff-mode"))
(put 'executable 'custom-loads '("executable"))
diff --git a/lisp/loaddefs.el b/lisp/loaddefs.el
index 265d78931af..20127ec416c 100644
--- a/lisp/loaddefs.el
+++ b/lisp/loaddefs.el
@@ -11832,11 +11832,12 @@ variable." t nil)
;;;***
;;;### (autoloads (rmail-set-pop-password rmail-input rmail-mode
-;;;;;; rmail rmail-enable-mime rmail-secondary-file-regexp rmail-secondary-file-directory
-;;;;;; rmail-mail-new-frame rmail-primary-inbox-list rmail-delete-after-output
-;;;;;; rmail-highlight-face rmail-highlighted-headers rmail-retry-ignored-headers
-;;;;;; rmail-displayed-headers rmail-ignored-headers rmail-dont-reply-to-names)
-;;;;;; "rmail" "mail/rmail.el" (14525 4986))
+;;;;;; rmail rmail-enable-mime rmail-confirm-expunge rmail-secondary-file-regexp
+;;;;;; rmail-secondary-file-directory rmail-mail-new-frame rmail-primary-inbox-list
+;;;;;; rmail-delete-after-output rmail-highlight-face rmail-highlighted-headers
+;;;;;; rmail-retry-ignored-headers rmail-displayed-headers rmail-ignored-headers
+;;;;;; rmail-dont-reply-to-names) "rmail" "mail/rmail.el" (14555
+;;;;;; 23001))
;;; Generated autoloads from mail/rmail.el
(defvar rmail-dont-reply-to-names nil "\
@@ -11894,6 +11895,9 @@ and the value of the environment variable MAIL overrides it).")
(defvar rmail-secondary-file-regexp "\\.xmail$" "\
*Regexp for which files are secondary Rmail files.")
+(defvar rmail-confirm-expunge (quote yes-or-no-p) "\
+*Whether and how to ask for confirmation before expunging deleted messages.")
+
(defvar rmail-mode-hook nil "\
List of functions to call when Rmail is invoked.")