changeset 191:ecf6ba7b0a10 r20-3b22

Import from CVS: tag r20-3b22
author cvs
date Mon, 13 Aug 2007 09:57:38 +0200
parents e9f9de458416
children 9d35321dd38c
files CHANGES-beta ChangeLog lisp/ChangeLog lisp/comint/custom-load.el lisp/custom/custom-load.el lisp/ediff/custom-load.el lisp/efs/auto-autoloads.el lisp/hyperbole/auto-autoloads.el lisp/ilisp/ilisp-out.el lisp/mel/auto-autoloads.el lisp/modes/custom-load.el lisp/oobr/auto-autoloads.el lisp/packages/custom-load.el lisp/prim/packages.el lisp/psgml/custom-load.el lisp/utils/custom-load.el lisp/x11/custom-load.el src/frame-x.c version.sh
diffstat 19 files changed, 132 insertions(+), 109 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGES-beta	Mon Aug 13 09:57:10 2007 +0200
+++ b/CHANGES-beta	Mon Aug 13 09:57:38 2007 +0200
@@ -1,4 +1,8 @@
 							-*- indented-text -*-
+to 20.3 beta22 "Minsk"
+-- Miscellaneous (small) bug fixes
+-- Autoloads regenerated from scratch
+
 to 20.3 beta21 "Bern"
 -- Artificial event creation from Hrvoje Niksic
 -- cl-extra.elc and cl-seq.elc are now dumped with XEmacs
--- a/ChangeLog	Mon Aug 13 09:57:10 2007 +0200
+++ b/ChangeLog	Mon Aug 13 09:57:38 2007 +0200
@@ -1,3 +1,7 @@
+1997-09-17  SL Baur  <steve@altair.xemacs.org>
+
+	* XEmacs 20.3-beta22 is released.
+
 1997-09-16  SL Baur  <steve@altair.xemacs.org>
 
 	* XEmacs 20.3-beta21 is released.
--- a/lisp/ChangeLog	Mon Aug 13 09:57:10 2007 +0200
+++ b/lisp/ChangeLog	Mon Aug 13 09:57:38 2007 +0200
@@ -1,3 +1,20 @@
+1997-09-17  SL Baur  <steve@altair.xemacs.org>
+
+	* prim/packages.el (locate-library): Simplify regexp for
+	compression suffixes.
+	Suggested by: Hrvoje Niksic <hniksic@srce.hr>
+	
+1997-09-17  Karl M. Hegbloom  <karlheg@inetarena.com>
+
+	* ilisp/ilisp-out.el (ilisp-scroll-output): bind `scroll-in-place'
+ 		  to nil around the call to #'scroll-up so that {C-c v}
+ 		  will properly scroll the *output* buffer.
+
+1997-09-17  Karl M. Hegbloom  <karlheg@inetarena.com>
+
+	* ilisp/ilisp-out.el (ilisp-needed-window-height): make window one
+ 		  line bigger
+
 1997-09-15  Karl M. Hegbloom  <karlheg@inetarena.com>
 
 	* packages/info.el (Info-mouse-track-double-click-hook): follow
--- a/lisp/comint/custom-load.el	Mon Aug 13 09:57:10 2007 +0200
+++ b/lisp/comint/custom-load.el	Mon Aug 13 09:57:38 2007 +0200
@@ -2,7 +2,7 @@
 (custom-put 'telnet 'custom-loads '("telnet"))
 (custom-put 'shell 'custom-loads '("shell"))
 (custom-put 'comint-completion 'custom-loads '("comint"))
-(custom-put 'comint 'custom-loads '("comint" "telnet"))
+(custom-put 'comint 'custom-loads '("comint-xemacs" "comint" "telnet"))
 (custom-put 'rlogin 'custom-loads '("rlogin"))
 (custom-put 'shell-faces 'custom-loads '("shell"))
 (custom-put 'shell-directories 'custom-loads '("shell"))
--- a/lisp/custom/custom-load.el	Mon Aug 13 09:57:10 2007 +0200
+++ b/lisp/custom/custom-load.el	Mon Aug 13 09:57:38 2007 +0200
@@ -9,14 +9,18 @@
 (custom-put 'applications 'custom-loads '("cus-edit"))
 (custom-put 'help 'custom-loads '("cus-edit"))
 (custom-put 'widget-browse 'custom-loads '("wid-browse"))
-(custom-put 'customize 'custom-loads '("wid-edit" "cus-edit" "cus-face"))
+(custom-put 'widget-documentation 'custom-loads '("wid-edit"))
+(custom-put 'customize 'custom-loads '("cus-edit" "wid-edit" "cus-face"))
 (custom-put 'custom-browse 'custom-loads '("cus-edit"))
 (custom-put 'abbrev 'custom-loads '("cus-edit"))
 (custom-put 'programming 'custom-loads '("cus-edit"))
+(custom-put 'widget-button 'custom-loads '("wid-edit"))
 (custom-put 'files 'custom-loads '("cus-edit"))
 (custom-put 'external 'custom-loads '("cus-edit"))
 (custom-put 'development 'custom-loads '("cus-edit"))
+(custom-put 'widget-faces 'custom-loads '("wid-edit"))
 (custom-put 'languages 'custom-loads '("cus-edit"))
+(custom-put 'custom-magic-faces 'custom-loads '("cus-edit"))
 (custom-put 'faces 'custom-loads '("cus-edit" "wid-edit"))
 (custom-put 'emacs 'custom-loads '("cus-edit"))
 (custom-put 'processes 'custom-loads '("cus-edit"))
--- a/lisp/ediff/custom-load.el	Mon Aug 13 09:57:10 2007 +0200
+++ b/lisp/ediff/custom-load.el	Mon Aug 13 09:57:38 2007 +0200
@@ -1,3 +1,4 @@
+(custom-put 'environment 'custom-loads '(("ediff-wind")))
 (custom-put 'tools 'custom-loads '("ediff"))
 (custom-put 'ediff-diff 'custom-loads '("ediff-diff"))
 (custom-put 'frames 'custom-loads '("ediff-wind"))
--- a/lisp/efs/auto-autoloads.el	Mon Aug 13 09:57:10 2007 +0200
+++ b/lisp/efs/auto-autoloads.el	Mon Aug 13 09:57:38 2007 +0200
@@ -1,5 +1,5 @@
 ;;; DO NOT MODIFY THIS FILE
-(if (featurep '-autoloads) (error "Already loaded"))
+(if (featurep 'efs-autoloads) (error "Already loaded"))
 
 ;;;### (autoloads nil "default-dir" "efs/default-dir.el")
 
@@ -265,4 +265,4 @@
 
 ;;;***
 
-(provide '-autoloads)
+(provide 'efs-autoloads)
--- a/lisp/hyperbole/auto-autoloads.el	Mon Aug 13 09:57:10 2007 +0200
+++ b/lisp/hyperbole/auto-autoloads.el	Mon Aug 13 09:57:38 2007 +0200
@@ -1,5 +1,5 @@
 ;;; DO NOT MODIFY THIS FILE
-(if (featurep '-autoloads) (error "Already loaded"))
+(if (featurep 'hyperbole-autoloads) (error "Already loaded"))
 
 ;;;### (autoloads (hmail:compose) "hmail" "hyperbole/hmail.el")
 
@@ -342,82 +342,5 @@
 of a string." t nil)
 
 ;;;***
-
-;;;### (autoloads (kfile:is-p kfile:view kfile:find) "kfile" "kotl/kfile.el")
 
-(autoload 'kfile:find "kfile" "\
-Find a file FILE-NAME containing a kotl or create one if none exists.
-Return the new kview." t nil)
-
-(autoload 'kfile:view "kfile" "\
-View an existing kotl version-2 file FILE-NAME in a read-only mode." t nil)
-
-(autoload 'kfile:is-p "kfile" "\
-Iff current buffer contains an unformatted or formatted koutline, return file format version string, else nil." nil nil)
-
-;;;***
-
-;;;### (autoloads (kimport:text kimport:star-outline kimport:aug-post-outline kimport:file) "kimport" "kotl/kimport.el")
-
-(autoload 'kimport:file "kimport" "\
-Import a buffer or file IMPORT-FROM into the koutline in buffer or file OUTPUT-TO.
-
-Any suffix in IMPORT-FROM's buffer name is used to determine the type of
-importation.  All others are imported as text, one paragraph per cell.
-
-See the documentation for the variable, `kimport:suffix-alist' for
-information on specific importation formats." t nil)
-
-(autoload 'kimport:aug-post-outline "kimport" "\
-Insert Augment outline statements from IMPORT-FROM into koutline OUTPUT-TO.
-Displays and leaves point in OUTPUT-TO.  See documentation for
-`kimport:initialize' for valid values of IMPORT-FROM and OUTPUT-TO and for
-an explanation of where imported cells are placed.
-
-If OUTPUT-TO is a new koutline, the first statement inserted will be the
-first cell.  Otherwise, it will be the successor of the current cell.
-
-Each statement to be imported is delimited by an Augment relative id at the
-end of the statement.  \"1\" = level 1, \"1a\" = level 2 in outline and so
-on." t nil)
-
-(autoload 'kimport:star-outline "kimport" "\
-Insert star outline nodes from IMPORT-FROM into koutline OUTPUT-TO.
-Displays and leaves point in OUTPUT-TO.  See documentation for
-`kimport:initialize' for valid values of IMPORT-FROM and OUTPUT-TO and for
-an explanation of where imported cells are placed.
-
-\"* \" = level 1, \"** \" = level 2 in outline and so on." t nil)
-
-(autoload 'kimport:text "kimport" "\
-Insert text paragraphs from IMPORT-FROM into koutline OUTPUT-TO.
-Displays and leaves point in OUTPUT-TO.  See documentation for
-`kimport:initialize' for valid values of IMPORT-FROM and OUTPUT-TO and for
-an explanation of where imported cells are placed.
-
-Text paragraphs are imported as a sequence of same level cells.  Koutlines
-are imported with their structure intact.
-
-The variable, `paragraph-start,' is used to determine paragraphs." t nil)
-
-;;;***
-
-;;;### (autoloads (klink:create) "klink" "kotl/klink.el")
-
-(autoload 'klink:create "klink" "\
-Insert at point an implicit link to REFERENCE.
-REFERENCE should be a cell-ref or a string containing \"filename, cell-ref\".
-See documentation for `kcell:ref-to-id' for valid cell-ref formats." t nil)
-
-;;;***
-
-;;;### (autoloads (kotl-mode) "kotl-mode" "kotl/kotl-mode.el")
-
-(autoload 'kotl-mode "kotl-mode" "\
-The major mode used to edit and view koutlines.
-It provides the following keys:
-\\{kotl-mode-map}" t nil)
-
-;;;***
-
-(provide '-autoloads)
+(provide 'hyperbole-autoloads)
--- a/lisp/ilisp/ilisp-out.el	Mon Aug 13 09:57:10 2007 +0200
+++ b/lisp/ilisp/ilisp-out.el	Mon Aug 13 09:57:38 2007 +0200
@@ -133,7 +133,10 @@
 	     (progn
 	       (select-window window)
 	       (set-buffer buffer)
-	       (scroll-up lines))
+               ;; it won't hurt to bind this regardless of
+               ;; whether or not `scroll-in-place' is loaded.
+               (let ((scroll-in-place nil))
+                 (scroll-up lines)))
 	  (select-window old-window)))))
 
 
@@ -203,7 +206,7 @@
     (select-window window)
     (save-excursion
       (set-buffer (window-buffer))
-      (+ 2 (save-excursion 
+      (+ 3 (save-excursion 
 	     (goto-char (point-min))
 	     ;; Any upper bound on the height of an emacs window will
 	     ;; do here.  How about 1000.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lisp/mel/auto-autoloads.el	Mon Aug 13 09:57:38 2007 +0200
@@ -0,0 +1,17 @@
+;;; DO NOT MODIFY THIS FILE
+(if (featurep 'mel-autoloads) (error "Already loaded"))
+
+;;;### (autoloads (mime-insert-encoded-file mime-decode-region mime-encode-region) "mel" "mel/mel.el")
+
+(autoload 'mime-encode-region "mel" "\
+Encode region START to END of current buffer using ENCODING." t nil)
+
+(autoload 'mime-decode-region "mel" "\
+Decode region START to END of current buffer using ENCODING." t nil)
+
+(autoload 'mime-insert-encoded-file "mel" "\
+Insert file FILENAME encoded by ENCODING format." t nil)
+
+;;;***
+
+(provide 'mel-autoloads)
--- a/lisp/modes/custom-load.el	Mon Aug 13 09:57:10 2007 +0200
+++ b/lisp/modes/custom-load.el	Mon Aug 13 09:57:38 2007 +0200
@@ -1,6 +1,60 @@
-(custom-put 'extensions 'custom-loads '(("auto-show") "strokes"))
-(custom-put 'mouse 'custom-loads '("strokes"))
+(custom-put 'extensions 'custom-loads '("auto-show" "strokes"))
+(custom-put 'message 'custom-loads '("sendmail"))
+(custom-put 'prolog 'custom-loads '("prolog"))
+(custom-put 'auto-show 'custom-loads '("auto-show"))
+(custom-put 'mouse 'custom-loads '("outl-mouse" "strokes"))
+(custom-put 'mail-abbrevs 'custom-loads '("mail-abbrevs"))
+(custom-put 'pascal 'custom-loads '("pascal"))
+(custom-put 'tex 'custom-loads '("reftex" "texinfo"))
+(custom-put 'tcl 'custom-loads '("tcl"))
 (custom-put 'environment 'custom-loads '(("rsz-minibuf")))
-(custom-put 'lisp 'custom-loads '("strokes"))
+(custom-put 'icon 'custom-loads '("icon"))
+(custom-put 'texinfo 'custom-loads '("texinfo"))
+(custom-put 'xrdb 'custom-loads '("xrdb-mode"))
+(custom-put 'mail 'custom-loads '("mail-abbrevs"))
+(custom-put 'fortran-indent 'custom-loads '("fortran"))
+(custom-put 'docs 'custom-loads '("texinfo"))
+(custom-put 'lisp-indent 'custom-loads '("cl-indent"))
+(custom-put 'tools 'custom-loads '("hideshow" "make-mode"))
+(custom-put 'lisp 'custom-loads '("lisp-mode" "cl-indent" "strokes"))
+(custom-put 'reftex 'custom-loads '("reftex"))
+(custom-put 'outlines 'custom-loads '("hideshow" "outl-mouse" "whitespace-mode"))
+(custom-put 'f90 'custom-loads '("f90"))
+(custom-put 'asm 'custom-loads '("asm-mode"))
+(custom-put 'ada 'custom-loads '("ada-mode"))
+(custom-put 'reftex-label-support 'custom-loads '("reftex"))
+(custom-put 'data 'custom-loads '("arc-mode" "xrdb-mode"))
+(custom-put 'fortran-comment 'custom-loads '("fortran"))
+(custom-put 'outl-mouse 'custom-loads '("outl-mouse"))
+(custom-put 'frames 'custom-loads '("rsz-minibuf"))
+(custom-put 'verilog 'custom-loads '("verilog-mode"))
+(custom-put 'abbrev 'custom-loads '("abbrev"))
+(custom-put 'f90-indent 'custom-loads '("f90"))
 (custom-put 'strokes 'custom-loads '("strokes"))
-(custom-put 'display 'custom-loads '(("auto-show")))
+(custom-put 'archive-lzh 'custom-loads '("arc-mode"))
+(custom-put 'scribe 'custom-loads '("scribe"))
+(custom-put 'archive 'custom-loads '("arc-mode"))
+(custom-put 'c-macro 'custom-loads '("cmacexp"))
+(custom-put 'vrml 'custom-loads '("vrml-mode"))
+(custom-put 'simula 'custom-loads '("simula"))
+(custom-put 'archive-arc 'custom-loads '("arc-mode"))
+(custom-put 'fortran 'custom-loads '("f90" "fortran"))
+(custom-put 'resize-minibuffer 'custom-loads '("rsz-minibuf"))
+(custom-put 'languages 'custom-loads '("ada-mode" "asm-mode" "fortran" "icon" "pascal" "prolog" "rexx-mode" "sh-script" "simula" "tcl" "verilog-mode" "vhdl-mode" "vrml-mode" "winmgr-mode" "xrdb-mode"))
+(custom-put 'archive-zoo 'custom-loads '("arc-mode"))
+(custom-put 'archive-zip 'custom-loads '("arc-mode"))
+(custom-put 'display 'custom-loads '("auto-show"))
+(custom-put 'hideshow 'custom-loads '("hideshow"))
+(custom-put 'vhdl 'custom-loads '("vhdl-mode"))
+(custom-put 'enriched 'custom-loads '("enriched"))
+(custom-put 'processes 'custom-loads '("executable"))
+(custom-put 'rexx 'custom-loads '("rexx-mode"))
+(custom-put 'executable 'custom-loads '("executable"))
+(custom-put 'wp 'custom-loads '("enriched" "scribe" "texinfo"))
+(custom-put 'sh 'custom-loads '("sh-script"))
+(custom-put 'makefile-mode 'custom-loads '("make-mode"))
+(custom-put 'whitespace 'custom-loads '("whitespace-mode"))
+(custom-put 'matching 'custom-loads '("whitespace-mode"))
+(custom-put 'winmgr 'custom-loads '("winmgr-mode"))
+(custom-put 'unix 'custom-loads '("sh-script"))
+(custom-put 'c 'custom-loads '("cmacexp"))
--- a/lisp/oobr/auto-autoloads.el	Mon Aug 13 09:57:10 2007 +0200
+++ b/lisp/oobr/auto-autoloads.el	Mon Aug 13 09:57:38 2007 +0200
@@ -1,5 +1,5 @@
 ;;; DO NOT MODIFY THIS FILE
-(if (featurep '-autoloads) (error "Already loaded"))
+(if (featurep 'oobr-autoloads) (error "Already loaded"))
 
 ;;;### (autoloads (br-env-load br-env-browse) "br-env" "oobr/br-env.el")
 
@@ -130,4 +130,4 @@
 
 ;;;***
 
-(provide '-autoloads)
+(provide 'oobr-autoloads)
--- a/lisp/packages/custom-load.el	Mon Aug 13 09:57:10 2007 +0200
+++ b/lisp/packages/custom-load.el	Mon Aug 13 09:57:38 2007 +0200
@@ -10,7 +10,7 @@
 (custom-put 'igrep 'custom-loads '("igrep"))
 (custom-put 'menu 'custom-loads '("recent-files"))
 (custom-put 'minibuffer 'custom-loads '("icomplete"))
-(custom-put 'environment 'custom-loads '("gnuserv"))
+(custom-put 'environment 'custom-loads '(("balloon-help" "desktop") ("icomplete") "gnuserv"))
 (custom-put 'texinfo 'custom-loads '("texnfo-tex"))
 (custom-put 'terminals 'custom-loads '("gnuserv"))
 (custom-put 'auto-save 'custom-loads '("auto-save"))
@@ -44,6 +44,7 @@
 (custom-put 'generic-sc 'custom-loads '("generic-sc"))
 (custom-put 'local 'custom-loads '("gopher"))
 (custom-put 'keyboard 'custom-loads '("pending-del"))
+(custom-put 'hyper-apropos-faces 'custom-loads '("hyper-apropos"))
 (custom-put 'data 'custom-loads '("auto-save" "jka-compr" "saveplace" "tar-mode" "time-stamp"))
 (custom-put 'ps-print 'custom-loads '("ps-print"))
 (custom-put 'compression 'custom-loads '("jka-compr"))
--- a/lisp/prim/packages.el	Mon Aug 13 09:57:10 2007 +0200
+++ b/lisp/prim/packages.el	Mon Aug 13 09:57:38 2007 +0200
@@ -105,18 +105,7 @@
 		    (and (boundp 'find-file-hooks)
 			 (member 'crypt-find-file-hook find-file-hooks)))
 		".elc:.el:"
-	      ;; The complex expression evaluates to a relatively
-	      ;; short string, so we do it at compile-time.
-	      ;; Nope.  This is run out of temacs and `eval-when-compile' is
-	      ;; a void function.  --sb
-	      (mapconcat #'identity
-			 (apply 'nconc
-				(mapcar (lambda (compelt)
-					  (mapcar (lambda (baselt)
-						    (concat baselt compelt))
-						  '(".elc" ".el" "")))
-					'(".Z" ".gz" "")))
-			 ":")))
+	      ".elc:.elc.gz:elc.Z:.el:.el.gz:.el.Z::.gz:.Z"))
 	  4)))
     (and interactive-call
 	 (if result
--- a/lisp/psgml/custom-load.el	Mon Aug 13 09:57:10 2007 +0200
+++ b/lisp/psgml/custom-load.el	Mon Aug 13 09:57:38 2007 +0200
@@ -2,6 +2,7 @@
 (custom-put 'psgml-dtd 'custom-loads '("psgml"))
 (custom-put 'html 'custom-loads '("psgml-html"))
 (custom-put 'psgml 'custom-loads '("psgml-html" "psgml"))
+(custom-put 'psgml-html 'custom-loads '("psgml-html"))
 (custom-put 'sgml 'custom-loads '("psgml-html" "psgml"))
 (custom-put 'tempo 'custom-loads '("tempo"))
 (custom-put 'languages 'custom-loads '("psgml"))
--- a/lisp/utils/custom-load.el	Mon Aug 13 09:57:10 2007 +0200
+++ b/lisp/utils/custom-load.el	Mon Aug 13 09:57:38 2007 +0200
@@ -1,6 +1,7 @@
 (custom-put 'extensions 'custom-loads '("eldoc"))
 (custom-put 'eldoc 'custom-loads '("eldoc"))
 (custom-put 'minibuffer 'custom-loads '("detached-minibuf" "savehist"))
+(custom-put 'environment 'custom-loads '(("detached-minibuf") ("detached-minibuf" "savehist")))
 (custom-put 'mail 'custom-loads '("highlight-headers" "ph" "smtpmail"))
 (custom-put 'uniquify 'custom-loads '("uniquify"))
 (custom-put 'hypermedia 'custom-loads '("browse-url"))
@@ -8,6 +9,7 @@
 (custom-put 'elp 'custom-loads '("elp"))
 (custom-put 'applications 'custom-loads '("uniquify"))
 (custom-put 'keyboard 'custom-loads '("edmacro"))
+(custom-put 'highlight-headers-faces 'custom-loads '("highlight-headers"))
 (custom-put 'crontab 'custom-loads '("crontab"))
 (custom-put 'comm 'custom-loads '("ph"))
 (custom-put 'id-select 'custom-loads '("id-select"))
--- a/lisp/x11/custom-load.el	Mon Aug 13 09:57:10 2007 +0200
+++ b/lisp/x11/custom-load.el	Mon Aug 13 09:57:38 2007 +0200
@@ -1,1 +1,2 @@
-(custom-put 'environment 'custom-loads '(("x-toolbar")))
+(custom-put 'environment 'custom-loads '("x-toolbar"))
+(custom-put 'toolbar 'custom-loads '("x-toolbar"))
--- a/src/frame-x.c	Mon Aug 13 09:57:10 2007 +0200
+++ b/src/frame-x.c	Mon Aug 13 09:57:38 2007 +0200
@@ -1185,7 +1185,9 @@
 
   if (!DndIsDropMessage(event)) /* the better way */
     {
+#if 0
       stderr_out("DndDropHandler: pseudo drop received (ignore me!)\n");
+#endif
       return;
     }
 
@@ -1195,9 +1197,9 @@
   GCPRO4 (path, frame, dnd_data, dnd_type);
 
   frame = make_frame ((struct frame *) data);
-
+#if 0
   stderr_out("DndDropHandler: valid drop received (T%d S%u)\n",Type,Size);
-
+#endif
   switch (Type)
     {
     case DndFiles:
--- a/version.sh	Mon Aug 13 09:57:10 2007 +0200
+++ b/version.sh	Mon Aug 13 09:57:38 2007 +0200
@@ -1,5 +1,5 @@
 #!/bin/sh
 emacs_major_version=20
 emacs_minor_version=3
-emacs_beta_version=21
-xemacs_codename="Bern"
+emacs_beta_version=22
+xemacs_codename="Minsk"