Commits

Anonymous committed e121b01

Import from CVS: tag r20-3b18

  • Participants
  • Parent commits f07455f
  • Tags r20-3b18

Comments (0)

Files changed (137)

File CHANGES-beta

 							-*- indented-text -*-
+to 20.3 beta18 "Bratislava"
+-- enhancements to help.el courtesy of Jens Petersen
+-- Mega Martin Buchholz patch
+-- edit-toolbar.el-1.02 courtesy of Mike Scheidler
+-- cc-mode-5.16
+-- DOC file generation clean up
+-- Miscellaneous bug fixes
+
 to 20.3 beta17 "Bucharest"
 -- ediff-2.67
 -- viper-2.96
+1997-08-16  SL Baur  <steve@altair.xemacs.org>
+
+	* XEmacs 20.3-beta18 is released.
+
+1997-08-11  Karl M. Hegbloom  <karlheg@inetarena.com>
+
+	* etc/NEWS: add a section telling about the Info changes.
+
 1997-08-09  SL Baur  <steve@altair.xemacs.org>
 
 	* XEmacs 20.3-beta17 is released.
 ## instead, we have written out explicit code in the `install' targets.
 COPYDIR = ${srcdir}/etc ${srcdir}/lisp
 COPYDESTS = ${etcdir} ${lispdir}
-GENERATED_HEADERS = src/paths.h src/Emacs.ad.h src/puresize_adjust.h src/config.h lwlib/config.h
+GENERATED_HEADERS = src/paths.h src/Emacs.ad.h src/puresize-adjust.h src/config.h lwlib/config.h
 
 all:	${GENERATED_HEADERS} ${MAKE_SUBDIR}
 
 	  /bin/sh ${srcdir}/lib-src/ad2c ${srcdir}/etc/Emacs.ad ) > \
 	  src/Emacs.ad.h
 
-src/puresize_adjust.h:	${srcdir}/src/puresize.h
-	@echo "Resetting \`src/puresize_adjust.h'."; \
+src/puresize-adjust.h:	${srcdir}/src/puresize.h
+	@echo "Resetting \`src/puresize-adjust.h'."; \
 	(echo "/*	Do not edit this file!" ; \
 	 echo "  	Automatically generated by XEmacs */" ; \
 	 echo "#define PURESIZE_ADJUSTMENT 0") > $@
 	    ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext} ; \
 	    chmod 0644 ${mandir}/$${page}${manext} ; \
 	  done
-	if test ! -d ${prefix}/bin; then \
+	if test "${prefix}" != "${exec_prefix}"; then : extreme bogosity follows; \
+	   test ! -d ${prefix}/bin && \
 		$(LN_S) ${exec_prefix}/bin ${prefix}/bin; \
-	fi
-	if test ! -d ${prefix}/lib/xemacs-${version}/${configuration}; then \
+	   test ! -d ${prefix}/lib/xemacs-${version}/${configuration} && \
 		${LN_S} ${exec_prefix}/lib/xemacs-${version}/${configuration} \
-			${prefix}/lib/xemacs-${version}/${configuration}; \
+			     ${prefix}/lib/xemacs-${version}/${configuration}; \
 	fi
 	@echo "If you would like to save approximately 15M of disk space, do"
 	@echo "make gzip-el"
 	lib-src/gzip-el.sh ${lispdir}
 
 MAKEPATH=./lib-src/make-path
-## Build all the directories we're going to install XEmacs in.	Since
-## we may be creating several layers of directories (for example,
-## /usr/local/lib/xemacs-19.13/mips-dec-ultrix4.2), we use make-path
-## instead of mkdir.  Not all systems' mkdirs have the `-p' flag.
+## Build all the directories to install XEmacs in.
+## Since we may be creating several layers of directories,
+## (e.g. /usr/local/lib/xemacs-20.5/sparc-sun-solaris2.6), we use
+## make-path instead of mkdir.  Not all mkdirs have the `-p' flag.
 mkdir: FRC.mkdir
-	${MAKEPATH} ${COPYDESTS} ${lockdir} ${infodir} ${mandir} \
-	  ${bindir} ${datadir} ${libdir} ${sitelispdir} ${pkdir}
+	${MAKEPATH} ${COPYDESTS} ${lockdir} ${infodir} ${archlibdir} \
+	  ${mandir} ${bindir} ${datadir} ${libdir} ${sitelispdir} ${pkgdir}
 	-chmod 0777 ${lockdir}
 
 ## Delete all the installed files that the `install' target would
 
   Where should the build process find the source code?    $srcdir
   What installation prefix should install use?		  $prefix
+  Where should XEmacs look for packages?		  $package_path
   What operating system and machine description files should XEmacs use?
         \`$opsysfile' and \`$machfile'
   What compiler should XEmacs be built with?              $CC $CFLAGS

File configure.in

 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
 libdir='${{exec_prefix}}/lib'
+dnl The following gives NONE/lib/xemacs/packages as the first package
+dnl package_path=${prefix}/lib/xemacs/packages:~/.xemacs
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 infodir='${prefix}/info'
 
   Where should the build process find the source code?    $srcdir
   What installation prefix should install use?		  $prefix
+  Where should XEmacs look for packages?		  $package_path
   What operating system and machine description files should XEmacs use?
         \`$opsysfile' and \`$machfile'
   What compiler should XEmacs be built with?              $CC $CFLAGS
 * Changes in XEmacs 20.3
 ========================
 
+** Info "dir" functionality merged from Emacs-19.34
+
+All of the directories on `Info-directory-list' will be searched for
+"dir" files, which may be full fledged Info files containing subnodes
+as well as menus.  They are merged to become one directory, with menus
+in like-named subnodes being coalesced from the several "dir" files.
+
+"localdir" files are looked for too, secondary to "dir"'s.  If there's
+no "dir" in a directory, a "localdir" will be looked for.  There can
+be one of either "dir" or "localdir" in each of the directories in
+`Info-directory-list', which is initialized from `Info-default-
+directory-list', which you may customize through the Options menu.
+
+The first directory specified in `Info-default-directory-list' should
+contain a "dir" file that will become the toplevel dir which the
+others will be merged into.  A "localdir" may optionally contain a
+'* Menu:' section, or just entries like those in a menu section, but
+no subnodes or info header.  You can see what I'm talking about if you
+view the "dir" file that comes with XEmacs.  It has a header section
+that should not be in a "localdir" file.  The "localdir" should look
+like the `buffer-substring' of XEmacs' stock "dir" from just below
+"* Menu:" to the end of the file, optionally also containing the
+"* Menu:" line.
+
+The contents of each "localdir" file will be inserted into the
+toplevel "dir" file replacing a '* Locals:' line, OR alternatively,
+will insert it below a 'Local*' (that's a regexp) heading line.  If
+there's more than one "localdir" file, each will either consume a '*
+Locals:' line, be catenated to the end of the (dir)Top, or be inserted
+under the 'Local' topic header.
+
+There is a new variable, called `Info-additional-directory-list',
+which you may customize also, that can contain a list of directories
+in which to search for Info documents, but NOT to search in for "dir"
+or "localdir" files.  This is useful for things like the Calc package,
+which likes its info files in its lisp directory.  If you put that
+directory in the 'additional list', and a menu entry for it in one of
+your "dir" or "localdir" files, a click on a menu entry for it will be
+able to find the Info file.
+
 ** Startup file additions.
 
 By default XEmacs now loads the user file ~/.xemacs if it exists.  If

File lib-src/ChangeLog

+1997-08-11  Jeff Miller <jmiller@smart.net>
+	* Makefile.in.in:  Added a test for system-type equal to linux to
+	lisp/paths.el.  Mail spool dir should be /var/spool/mail.
+
+	* cleaned up lib-src/Makefile.in.in regarding targets blessmail and
+	maybe-blessmail. Added target do-blessmail.  Makefile.in.in was also
+	missing a variable called "configuration. This messed up archilibdir.
+
+	* Added highlighting to text suggesting to do "make gzip-el" in top
+	level Makefile.in.  Added code to do make maybe-blessmail after a 
+	make install is done.
+
 1997-08-07  Jan Vroonhof  <vroonhof@math.ethz.ch>
 
 	* gnuclient.c (main): Made help string correspond to options.

File lib-src/Makefile.in.in

 libdir=@libdir@
 srcdir=@srcdir@
 archlibdir=@archlibdir@
-
+configuration=@configuration@
 ## ==================== Utility Programs for the Build =================
 
 INSTALL = @INSTALL@
 #define MOVEMAIL_NEEDS_BLESSING
 blessmail = blessmail
 blessmail:
-	../src/emacs -batch -l ../lisp/blessmail.el
+	../src/xemacs -batch -l ../lisp/utils/blessmail.el
 	chmod +x $@
 #endif /* movemail needs blessing */
 
 maybe-blessmail: $(blessmail)
 #ifdef MOVEMAIL_NEEDS_BLESSING
 ## Do not charge ahead and do it!  Let the installer decide.
-	  ./blessmail ${archlibdir}/movemail  */
+##	  ./blessmail ${archlibdir}/movemail  
 	@if test `wc -l <blessmail` != 2; then \
 	  dir=`sed -n -e 's/echo mail directory = \(.*\)/\1/p' blessmail`; \
-	  echo "Assuming $$dir is really the mail spool directory, you should"; \
+	  echo "*************************************************************";\
+	  echo "Assuming $$dir is really the mail spool directory, you should";\
 	  echo "run  lib-src/blessmail ${archlibdir}/movemail"; \
 	  echo "as root, to give  movemail  appropriate permissions."; \
 	  echo "Do that after running  make install."; \
+	  echo "You can also do  make blessmail. "; \
+	  echo "*************************************************************";\
 	fi
 #endif
 
+do-blessmail: $(blessmail)
+#ifdef MOVEMAIL_NEEDS_BLESSING
+	./blessmail ${archlibdir}/movemail  
+#endif
+
 ## Install the internal utilities.  Until they are installed, we can
 ## just run them directly from lib-src.
 ${archlibdir}: all

File lib-src/ad2c

 s/\\/\\\\/g
 s/\\$//g
 s/"/\\"/g
-s/^/(String) "/
+s/^/"/
 : test
 /\\$/b slash
 s/$/",/

File lisp/ChangeLog

+Fri Aug 15 17:26:05 1997  Barry A. Warsaw  <cc-mode-help@python.org>
+
+	* cc-mode/Release 5.16
+
+Fri Aug 15 18:39:10 1997  Barry A. Warsaw  <cc-mode-help@python.org>
+
+	* cc-mode/cc-styles.el (c-style-alist):
+	"python" style requires c-comment-continuation-stars
+	to be "".
+
+	* cc-mode/cc-engine.el (c-end-of-statement-1):
+	Eliminate false hits on important characters
+	inside literals (strings, comments).
+
+Tue Aug 12 21:47:18 1997  Barry A. Warsaw  <cc-mode-help@python.org>
+
+	* cc-mode/cc-cmds.el (c-comment-line-break-function):
+	In this function, and the defadvice,
+	call indent-new-comment-line if not in a comment.
+
+	* cc-mode/cc-vars.el (c-buffer-is-cc-mode): Definition moved to
+	cc-mode.el
+
+	* cc-mode/cc-mode.el (c-buffer-is-cc-mode):
+	Definition moved here from cc-vars.el.  Also,
+	put permanent-local property on variable so it's value won't get
+	killed by kill-all-local-variables.  This makes it easier for non-CC
+	Mode derived modes to be initialized correctly.
+
+	* cc-mode/cc-cmds.el (c-electric-brace):
+	In preserve-p test, don't test char-before when at
+	bobp.  Open brace at bobp is illegal in most modes, but not awk-mode,
+	which depends on CC Mode.
+
+Mon Aug 11 15:37:04 1997  Barry A. Warsaw  <cc-mode-help@python.org>
+
+	* cc-mode/cc-mode.el (c++-mode, java-mode, objc-mode, idl-mode):
+	Remove obsolete variable c-double-slash-is-comments-p.
+
+	* cc-mode/cc-langs.el (c-double-slash-is-comments-p): Remove
+	obsolete variable.
+
+	* cc-mode/cc-cmds.el (c-fill-paragraph):
+	Remove conditional on obsolete variable
+	c-double-slash-is-comments-p.
+
+	* cc-mode/cc-styles.el (c-style-alist):
+	Conform comment settings to RMS's preferences.
+
+Thu Aug  7 19:21:32 1997  Barry A. Warsaw  <cc-mode-help@python.org>
+
+	* cc-styles.el (c-set-offset): Added autoload cookie.
+
+1997-08-15  SL Baur  <steve@altair.xemacs.org>
+
+	* cl/cl-macs.el (cl-make-type-test): De-ebolify type test for
+	'character.
+
+1997-08-12  Karl M. Hegbloom  <karlheg@inetarena.com>
+
+	* packages/man.el (Manual-mouseify-xrefs): Skip the top line of
+ 	manual entries so to not get the all-caps pseudo xrefs in the
+ 	heading in our list of manuals.
+	(Manual-buffers-have-stars): new customize option.
+	(manual-entry): Fix to utilize the new variable, and to not put
+ 	stars around manual names put in the minibuffer history.
+
+1997-08-12  Karl M. Hegbloom  <karlheg@inetarena.com>
+
+	* packages/info.el (Info-directory-list): reverse the
+ 	`Info-default-directory-list' when using it to initialize the
+ 	`Info-directory-list'.
+	(Info-insert-dir): make it so the insertion of a locadir file at a
+ 	"^[ \t]*Local.*\n[ \t]*[-=]+" line works correctly.
+
+Mon Aug 11 17:35:35 1997  SL Baur  <steve@altair.xemacs.org>
+
+	* prim/loaddefs.el (((dir load-path))): Ignore all errors.
+
+	* utils/autoload.el (fixup-autoload-buffer): Wrapping autoloads
+	files with a guard produces invalid bytecode.
+
+	* prim/make-docfile.el (package-path): Look in the package path
+	for autoloads files.
+
+	* prim/packages.el (packages-find-packages-1): Don't append
+	trailing "/" when adding a top-level Lisp directory.
+	(list-autoloads-path): New function.  Use existing precomputed
+	load-path instead of doing the old broken computation.
+
+1997-08-11  SL Baur  <steve@altair.xemacs.org>
+
+	* prim/startup.el (command-line-1): Allow setting of
+	`initial-scratch-message' to nil to turn it off.
+	Suggested by Gary D. Foster <Gary.Foster@Corp.Sun.COM>
+
 1997-08-09  Karl M. Hegbloom  <karlheg@inetarena.com>
 
 	* packages/info.el: (info::toolbar) swap next and prev buttons to

File lisp/apel/auto-autoloads.el

 ;;; DO NOT MODIFY THIS FILE
-(if (not (featurep 'apel-autoloads))
-    (progn
+(if (featurep 'apel-autoloads) (error "Already loaded"))
 
 ;;;### (autoloads (module-installed-p exec-installed-p file-installed-p get-latest-path add-latest-path add-path) "file-detect" "apel/file-detect.el")
 
 ;;;***
 
 (provide 'apel-autoloads)
-))

File lisp/bytecomp/auto-autoloads.el

 ;;; DO NOT MODIFY THIS FILE
-(if (not (featurep 'bytecomp-autoloads))
-    (progn
+(if (featurep 'bytecomp-autoloads) (error "Already loaded"))
 
 ;;;### (autoloads (batch-byte-recompile-directory batch-byte-recompile-directory-norecurse batch-byte-compile display-call-tree byte-compile-sexp byte-compile compile-defun byte-compile-file byte-recompile-file byte-recompile-directory byte-force-recompile) "bytecomp" "bytecomp/bytecomp.el")
 
 ;;;***
 
 (provide 'bytecomp-autoloads)
-))

File lisp/calendar/auto-autoloads.el

 ;;; DO NOT MODIFY THIS FILE
-(if (not (featurep 'calendar-autoloads))
-    (progn
+(if (featurep 'calendar-autoloads) (error "Already loaded"))
 
 ;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el")
 
 ;;;***
 
 (provide 'calendar-autoloads)
-))

File lisp/cc-mode/auto-autoloads.el

 ;;; DO NOT MODIFY THIS FILE
-(if (not (featurep 'cc-mode-autoloads))
-    (progn
+(if (featurep 'cc-mode-autoloads) (error "Already loaded"))
 
 ;;;### (autoloads nil "cc-langs" "cc-mode/cc-langs.el")
 
 ;;;***
 
 (provide 'cc-mode-autoloads)
-))

File lisp/cc-mode/cc-align.el

 ;;             1985 Richard M. Stallman
 ;; Maintainer: cc-mode-help@python.org
 ;; Created:    22-Apr-1997 (split from cc-mode.el)
-;; Version:    5.15
+;; Version:    5.16
 ;; Keywords:   c languages oop
 
 ;; This file is part of GNU Emacs.

File lisp/cc-mode/cc-cmds.el

 ;;             1985 Richard M. Stallman
 ;; Maintainer: cc-mode-help@python.org
 ;; Created:    22-Apr-1997 (split from cc-mode.el)
-;; Version:    5.15
+;; Version:    5.16
 ;; Keywords:   c languages oop
 
 ;; This file is part of GNU Emacs.
 	    blink-paren-function
 	    (insertion-point (point))
 	    delete-temp-newline
-	    (preserve-p (eq ?  (char-syntax (char-before))))
+	    (preserve-p (and (not (bobp))
+			     (eq ?\  (char-syntax (char-before)))))
 	    ;; shut this up too
 	    (c-echo-syntactic-information-p nil)
 	    (syntax (progn
 ;; for proposed new variable comment-line-break-function
 (defun c-comment-line-break-function (&optional soft)
   ;; we currently don't do anything with soft line breaks
-  (if (not c-comment-continuation-stars)
+  (if (or (not c-comment-continuation-stars)
+	  (not (c-in-literal)))
       (indent-new-comment-line soft)
     (let ((here (point))
 	  (leader c-comment-continuation-stars))
   (require 'advice)
   (defadvice indent-new-comment-line (around c-line-break-advice activate)
     (if (or (not c-buffer-is-cc-mode)
+	    (not (c-in-literal))
 	    (not c-comment-continuation-stars))
 	ad-do-it
       (c-comment-line-break-function (ad-get-arg 0)))))
 	    (and (looking-at comment-start-skip)
 		 (setq comment-start-place (point)))))
 	 (re1 "\\|[ \t]*/\\*[ \t]*$\\|[ \t]*\\*/[ \t]*$\\|[ \t/*]*$"))
-    (if (and c-double-slash-is-comments-p
-	     (save-excursion
-	       (beginning-of-line)
-	       (looking-at ".*//")))
+    (if (save-excursion
+	  (beginning-of-line)
+	  (looking-at ".*//"))
 	(let ((fill-prefix fill-prefix)
 	       ;; Lines containing just a comment start or just an end
 	       ;; should not be filled into paragraphs they are next

File lisp/cc-mode/cc-compat.el

 ;; Author:     1994-1997 Barry A. Warsaw
 ;; Maintainer: cc-mode-help@python.org
 ;; Created:    August 1994, split from cc-mode.el
-;; Version:    5.15
+;; Version:    5.16
 ;; Keywords:   c languages oop
 
 ;; This file is part of GNU Emacs.

File lisp/cc-mode/cc-defs.el

 ;;             1985 Richard M. Stallman
 ;; Maintainer: cc-mode-help@python.org
 ;; Created:    22-Apr-1997 (split from cc-mode.el)
-;; Version:    5.15
+;; Version:    5.16
 ;; Keywords:   c languages oop
 
 ;; This file is part of GNU Emacs.

File lisp/cc-mode/cc-engine.el

 ;;             1985 Richard M. Stallman
 ;; Maintainer: cc-mode-help@python.org
 ;; Created:    22-Apr-1997 (split from cc-mode.el)
-;; Version:    5.15
+;; Version:    5.16
 ;; Keywords:   c languages oop
 
 ;; This file is part of GNU Emacs.
     (skip-chars-backward "-+!*&:.~" (c-point 'boi))))
 
 (defun c-end-of-statement-1 ()
-  (condition-case ()
-      (progn
+  (condition-case nil
+      (let (beg end found)
 	(while (and (not (eobp))
-		    (let ((beg (point)))
+		    (progn
+		      (setq beg (point))
 		      (forward-sexp 1)
-		      (let ((end (point)))
-			(save-excursion
-			  (goto-char beg)
-			  (not (re-search-forward "[;{}]" end t)))))))
-	(re-search-backward "[;}]")
+		      (setq end (point))
+		      (goto-char beg)
+		      (setq found nil)
+		      (while (and (not found)
+				  (re-search-forward "[;{}]" end t))
+			(if (not (c-in-literal beg))
+			    (setq found t)))
+		      (not found)))
+	  (goto-char end))
+	(re-search-backward "[;{}]")
 	(forward-char 1))
     (error 
      (let ((beg (point)))

File lisp/cc-mode/cc-langs.el

 ;;             1985 Richard M. Stallman
 ;; Maintainer: cc-mode-help@python.org
 ;; Created:    22-Apr-1997 (split from cc-mode.el)
-;; Version:    5.15
+;; Version:    5.16
 ;; Keywords:   c languages oop
 
 ;; This file is part of GNU Emacs.
 (defvar c-auto-hungry-string nil)
 (make-variable-buffer-local 'c-auto-hungry-string)
 
-;; Buffer local language-specific comment style flag.
-(defvar c-double-slash-is-comments-p nil)
-(make-variable-buffer-local 'c-double-slash-is-comments-p)
-
 ;; Non-nil means K&R style argument declarations are valid.
 (defvar c-recognize-knr-p t)
 (make-variable-buffer-local 'c-recognize-knr-p)

File lisp/cc-mode/cc-menus.el

 ;;             1985 Richard M. Stallman
 ;; Maintainer: cc-mode-help@python.org
 ;; Created:    22-Apr-1997 (split from cc-mode.el)
-;; Version:    5.15
+;; Version:    5.16
 ;; Keywords:   c languages oop
 
 ;; This file is part of GNU Emacs.

File lisp/cc-mode/cc-mode.el

 ;;             1985 Richard M. Stallman
 ;; Maintainer: cc-mode-help@python.org
 ;; Created:    a long, long, time ago. adapted from the original c-mode.el
-;; Version:    5.15
+;; Version:    5.16
 ;; Keywords:   c languages oop
 
 ;; NOTE: Read the commentary below for the right way to submit bug reports!
   (require 'cc-menus))
 (require 'cc-defs)
 
+(defvar c-buffer-is-cc-mode nil
+  "Non-nil for all buffers with a `major-mode' derived from CC Mode.
+Otherwise, this variable is nil.  I.e. this variable is non-nil for
+`c-mode', `c++-mode', `objc-mode', `java-mode', `idl-mode', and any
+other non-CC Mode mode that calls `c-initialize-cc-mode'
+\(e.g. `awk-mode').")
+(make-variable-buffer-local 'c-buffer-is-cc-mode)
+(put 'c-buffer-is-cc-mode 'permanent-local t)
+
 
 ;; Other modes and packages which depend on CC Mode should do the
 ;; following to make sure everything is loaded and available for their
 	c-comment-start-regexp c-C++-comment-start-regexp
 	c-class-key c-C++-class-key
 	c-access-key c-C++-access-key
-	c-double-slash-is-comments-p t
 	c-recognize-knr-p nil
 	imenu-generic-expression cc-imenu-c++-generic-expression)
   (run-hooks 'c-mode-common-hook)
  	c-class-key c-ObjC-class-key
 	c-baseclass-key nil
 	c-access-key c-ObjC-access-key
-	c-double-slash-is-comments-p t
 	c-method-key c-ObjC-method-key)
   (run-hooks 'c-mode-common-hook)
   (run-hooks 'objc-mode-hook)
  	c-comment-start-regexp c-Java-comment-start-regexp
   	c-class-key c-Java-class-key
 	c-method-key c-Java-method-key
-	c-double-slash-is-comments-p t
  	c-baseclass-key nil
 	c-recognize-knr-p nil
  	c-access-key c-Java-access-key
 	c-comment-start-regexp c-C++-comment-start-regexp
 	c-class-key c-C++-class-key
 	c-access-key c-C++-access-key
-	c-double-slash-is-comments-p t
 	c-recognize-knr-p nil)
 ;;	imenu-generic-expression cc-imenu-c++-generic-expression)
   (run-hooks 'c-mode-common-hook)
 
 
 ;; defuns for submitting bug reports
-(defconst c-version "5.15"
+(defconst c-version "5.16"
   "CC Mode version number.")
 
 (defconst c-mode-help-address

File lisp/cc-mode/cc-styles.el

 ;;             1985 Richard M. Stallman
 ;; Maintainer: cc-mode-help@python.org
 ;; Created:    22-Apr-1997 (split from cc-mode.el)
-;; Version:    5.15
+;; Version:    5.16
 ;; Keywords:   c languages oop
 
 ;; This file is part of GNU Emacs.
 			 (arglist-close . c-lineup-arglist)
 			 ))
      (c-special-indent-hook . c-gnu-impose-minimum)
+     (c-comment-continuation-stars . "")
+     (c-hanging-comment-ender-p . t)
      )
     ("k&r"
      (c-basic-offset . 5)
 				(substatement-open after)
 				(block-close . c-snug-do-while)
 				))
+     (c-comment-continuation-stars "")
      )
     ("java"
      (c-basic-offset . 2)

File lisp/cc-mode/cc-vars.el

 ;;             1985 Richard M. Stallman
 ;; Maintainer: cc-mode-help@python.org
 ;; Created:    22-Apr-1997 (split from cc-mode.el)
-;; Version:    5.15
+;; Version:    5.16
 ;; Keywords:   c languages oop
 
 ;; This file is part of GNU Emacs.
 (defvar c-indentation-style c-site-default-style
   "Name of style installed in the current buffer.")
 
-(defvar c-buffer-is-cc-mode nil
-  "Non-nil for all buffers with a `major-mode' derived from CC Mode.
-Otherwise, this variable is nil.  I.e. this variable is non-nil for
-`c-mode', `c++-mode', `objc-mode', `java-mode', `idl-mode', and any
-other non-CC Mode mode that calls `c-initialize-cc-mode'
-\(e.g. `awk-mode').")
-(make-variable-buffer-local 'c-buffer-is-cc-mode)
 
 
 (provide 'cc-vars)

File lisp/cl/cl-macs.el

 	 name 'cl-deftype-handler (cons (list* '&cl-defs ''('*) args) body))))
 
 (defun cl-make-type-test (val type)
-  (if (memq type '(character string-char)) (setq type '(integer 0 255)))
   (if (symbolp type)
       (cond ((get type 'cl-deftype-handler)
 	     (cl-make-type-test val (funcall (get type 'cl-deftype-handler))))
 	    ((memq type '(nil t)) type)
+	    ((eq type 'string-char) (list 'characterp val))
 	    ((eq type 'null) (list 'null val))
 	    ((eq type 'float) (list 'floatp-safe val))
 	    ((eq type 'real) (list 'numberp val))

File lisp/comint/auto-autoloads.el

 ;;; DO NOT MODIFY THIS FILE
-(if (not (featurep 'comint-autoloads))
-    (progn
+(if (featurep 'comint-autoloads) (error "Already loaded"))
 
 ;;;### (autoloads (background) "background" "comint/background.el")
 
 ;;;***
 
 (provide 'comint-autoloads)
-))

File lisp/comint/custom-load.el

+(custom-put 'background 'custom-loads '("background"))
+(custom-put 'comint 'custom-loads '("comint-xemacs" "comint" "telnet"))
+(custom-put 'comint-completion 'custom-loads '("comint"))
+(custom-put 'comint-source 'custom-loads '("comint"))
+(custom-put 'rlogin 'custom-loads '("rlogin"))
+(custom-put 'shell 'custom-loads '("shell"))
+(custom-put 'shell-directories 'custom-loads '("shell"))
+(custom-put 'shell-faces 'custom-loads '("shell"))
+(custom-put 'ssh 'custom-loads '("ssh"))
 (custom-put 'telnet 'custom-loads '("telnet"))
-(custom-put 'ssh 'custom-loads '("ssh"))
-(custom-put 'shell-faces 'custom-loads '("shell"))
-(custom-put 'shell-directories 'custom-loads '("shell"))
-(custom-put 'shell 'custom-loads '("shell"))
-(custom-put 'rlogin 'custom-loads '("rlogin"))
-(custom-put 'comint-source 'custom-loads '("comint"))
-(custom-put 'comint-completion 'custom-loads '("comint"))
-(custom-put 'comint 'custom-loads '("comint-xemacs" "comint" "telnet"))
-(custom-put 'background 'custom-loads '("background"))

File lisp/custom/auto-autoloads.el

 ;;; DO NOT MODIFY THIS FILE
-(if (not (featurep 'custom-autoloads))
-    (progn
+(if (featurep 'custom-autoloads) (error "Already loaded"))
 
 ;;;### (autoloads (customize-menu-create custom-menu-create custom-save-all customize-save-customized customize-browse custom-buffer-create-other-window custom-buffer-create customize-apropos-groups customize-apropos-faces customize-apropos-options customize-apropos customize-saved customize-customized customize-face-other-window customize-face customize-option-other-window customize-option customize-group-other-window customize-group customize customize-save-variable customize-set-variable customize-set-value) "cus-edit" "custom/cus-edit.el")
 
 ;;;***
 
 (provide 'custom-autoloads)
-))

File lisp/custom/custom-load.el

+(custom-put 'emacs 'custom-loads '("cus-edit"))
+(custom-put 'editing 'custom-loads '("cus-edit"))
+(custom-put 'abbrev 'custom-loads '("cus-edit"))
+(custom-put 'matching 'custom-loads '())
+(custom-put 'mouse 'custom-loads '())
+(custom-put 'external 'custom-loads '("cus-edit"))
+(custom-put 'processes 'custom-loads '("cus-edit"))
+(custom-put 'programming 'custom-loads '("cus-edit"))
+(custom-put 'languages 'custom-loads '("cus-edit"))
+(custom-put 'lisp 'custom-loads '())
+(custom-put 'applications 'custom-loads '("cus-edit"))
+(custom-put 'calendar 'custom-loads '())
+(custom-put 'development 'custom-loads '("cus-edit"))
+(custom-put 'extensions 'custom-loads '("wid-edit"))
+(custom-put 'internal 'custom-loads '("cus-edit"))
+(custom-put 'maint 'custom-loads '())
+(custom-put 'environment 'custom-loads '("cus-edit"))
+(custom-put 'i18n 'custom-loads '("cus-edit"))
+(custom-put 'x 'custom-loads '())
+(custom-put 'frames 'custom-loads '())
+(custom-put 'data 'custom-loads '())
+(custom-put 'files 'custom-loads '("cus-edit"))
+(custom-put 'wp 'custom-loads '("cus-edit"))
+(custom-put 'faces 'custom-loads '("cus-edit" "wid-edit"))
+(custom-put 'hypermedia 'custom-loads '("wid-edit"))
+(custom-put 'help 'custom-loads '("cus-edit"))
+(custom-put 'local 'custom-loads '())
+(custom-put 'customize 'custom-loads '("cus-edit" "wid-edit" "cus-face"))
+(custom-put 'custom-faces 'custom-loads '("cus-edit"))
+(custom-put 'custom-browse 'custom-loads '("cus-edit"))
+(custom-put 'custom-buffer 'custom-loads '("cus-edit"))
+(custom-put 'custom-menu 'custom-loads '("cus-edit"))
+(custom-put 'alloc 'custom-loads '())
+(custom-put 'undo 'custom-loads '())
+(custom-put 'modeline 'custom-loads '())
+(custom-put 'fill 'custom-loads '())
+(custom-put 'editing-basics 'custom-loads '())
+(custom-put 'display 'custom-loads '())
+(custom-put 'execute 'custom-loads '())
+(custom-put 'dired 'custom-loads '())
+(custom-put 'limits 'custom-loads '())
+(custom-put 'debug 'custom-loads '())
+(custom-put 'minibuffer 'custom-loads '())
+(custom-put 'keyboard 'custom-loads '())
+(custom-put 'auto-save 'custom-loads '())
+(custom-put 'processes-basics 'custom-loads '())
+(custom-put 'windows 'custom-loads '())
+(custom-put 'custom-magic-faces 'custom-loads '("cus-edit"))
+(custom-put 'widget-browse 'custom-loads '("wid-browse"))
+(custom-put 'widgets 'custom-loads '("wid-browse" "wid-edit"))
+(custom-put 'widget-documentation 'custom-loads '("wid-edit"))
+(custom-put 'widget-faces 'custom-loads '("wid-edit"))
 (custom-put 'widget-button 'custom-loads '("wid-edit"))
-(custom-put 'widget-faces 'custom-loads '("wid-edit"))
-(custom-put 'widget-documentation 'custom-loads '("wid-edit"))
-(custom-put 'widgets 'custom-loads '("wid-browse" "wid-edit"))
-(custom-put 'widget-browse 'custom-loads '("wid-browse"))
-(custom-put 'custom-magic-faces 'custom-loads '("cus-edit"))
-(custom-put 'windows 'custom-loads '())
-(custom-put 'processes-basics 'custom-loads '())
-(custom-put 'auto-save 'custom-loads '())
-(custom-put 'keyboard 'custom-loads '())
-(custom-put 'minibuffer 'custom-loads '())
-(custom-put 'debug 'custom-loads '())
-(custom-put 'limits 'custom-loads '())
-(custom-put 'dired 'custom-loads '())
-(custom-put 'execute 'custom-loads '())
-(custom-put 'display 'custom-loads '())
-(custom-put 'editing-basics 'custom-loads '())
-(custom-put 'fill 'custom-loads '())
-(custom-put 'modeline 'custom-loads '())
-(custom-put 'undo 'custom-loads '())
-(custom-put 'alloc 'custom-loads '())
-(custom-put 'custom-menu 'custom-loads '("cus-edit"))
-(custom-put 'custom-buffer 'custom-loads '("cus-edit"))
-(custom-put 'custom-browse 'custom-loads '("cus-edit"))
-(custom-put 'custom-faces 'custom-loads '("cus-edit"))
-(custom-put 'customize 'custom-loads '("cus-edit" "wid-edit" "cus-face"))
-(custom-put 'local 'custom-loads '())
-(custom-put 'help 'custom-loads '("cus-edit"))
-(custom-put 'hypermedia 'custom-loads '("wid-edit"))
-(custom-put 'faces 'custom-loads '("cus-edit" "wid-edit"))
-(custom-put 'wp 'custom-loads '("cus-edit"))
-(custom-put 'files 'custom-loads '("cus-edit"))
-(custom-put 'data 'custom-loads '())
-(custom-put 'frames 'custom-loads '())
-(custom-put 'x 'custom-loads '())
-(custom-put 'i18n 'custom-loads '("cus-edit"))
-(custom-put 'environment 'custom-loads '("cus-edit"))
-(custom-put 'maint 'custom-loads '())
-(custom-put 'internal 'custom-loads '("cus-edit"))
-(custom-put 'extensions 'custom-loads '("wid-edit"))
-(custom-put 'development 'custom-loads '("cus-edit"))
-(custom-put 'calendar 'custom-loads '())
-(custom-put 'applications 'custom-loads '("cus-edit"))
-(custom-put 'lisp 'custom-loads '())
-(custom-put 'languages 'custom-loads '("cus-edit"))
-(custom-put 'programming 'custom-loads '("cus-edit"))
-(custom-put 'processes 'custom-loads '("cus-edit"))
-(custom-put 'external 'custom-loads '("cus-edit"))
-(custom-put 'mouse 'custom-loads '())
-(custom-put 'matching 'custom-loads '())
-(custom-put 'abbrev 'custom-loads '("cus-edit"))
-(custom-put 'editing 'custom-loads '("cus-edit"))
-(custom-put 'emacs 'custom-loads '("cus-edit"))

File lisp/edebug/auto-autoloads.el

 ;;; DO NOT MODIFY THIS FILE
-(if (not (featurep 'edebug-autoloads))
-    (progn
+(if (featurep 'edebug-autoloads) (error "Already loaded"))
 
 ;;;### (autoloads (edebug-eval-top-level-form def-edebug-spec) "edebug" "edebug/edebug.el")
 
 ;;;***
 
 (provide 'edebug-autoloads)
-))

File lisp/ediff/auto-autoloads.el

 ;;; DO NOT MODIFY THIS FILE
-(if (not (featurep 'ediff-autoloads))
-    (progn
+(if (featurep 'ediff-autoloads) (error "Already loaded"))
 
 ;;;### (autoloads (ediff-show-registry) "ediff-mult" "ediff/ediff-mult.el")
 
 ;;;***
 
 (provide 'ediff-autoloads)
-))

File lisp/ediff/custom-load.el

+(custom-put 'ediff-diff 'custom-loads '("ediff-diff"))
+(custom-put 'ediff-merge 'custom-loads '("ediff-merg"))
+(custom-put 'ediff-mult 'custom-loads '("ediff-mult"))
+(custom-put 'ediff-ptch 'custom-loads '("ediff-ptch"))
+(custom-put 'ediff-window 'custom-loads '())
 (custom-put 'ediff 'custom-loads '("ediff-diff" "ediff-merg" "ediff-mult" "ediff-ptch" "ediff-wind" "ediff" "ediff-init"))
-(custom-put 'ediff-window 'custom-loads '())
-(custom-put 'ediff-ptch 'custom-loads '("ediff-ptch"))
-(custom-put 'ediff-mult 'custom-loads '("ediff-mult"))
-(custom-put 'ediff-merge 'custom-loads '("ediff-merg"))
-(custom-put 'ediff-diff 'custom-loads '("ediff-diff"))

File lisp/efs/auto-autoloads.el

 ;;; DO NOT MODIFY THIS FILE
-(if (not (featurep 'efs-autoloads))
-    (progn
+(if (featurep 'efs-autoloads) (error "Already loaded"))
 
 ;;;### (autoloads nil "default-dir" "efs/default-dir.el")
 
 ;;;***
 
 (provide 'efs-autoloads)
-))

File lisp/efs/dired.el

 
 ;;; File name regular expressions and extensions.
 
-(defvar dired-trivial-filenames "^\\.\\.?$\\|^#"
+(defvar dired-trivial-filenames "\\`\\.\\.?\\'\\|\\`#"
   "*Regexp of files to skip when finding first file of a directory listing.
 A value of nil means move to the subdir line.
 A value of t means move to first file.")
 See also `dired-omit-extensions'.")
 (make-variable-buffer-local 'dired-omit-extensions)
 
-(defvar dired-omit-regexps '("^#" "^\\.")
+(defvar dired-omit-regexps '("\\`#" "\\`\\.")
   "*File names matching these regexp may be omitted (buffer-local).
 This only has effect when the subdirectory is in omission mode.
 To make omission mode the default, set `dired-omit-files' to t.
 See also `dired-omit-extensions'.")
 (make-variable-buffer-local 'dired-omit-regexps)
 
-(defvar dired-filename-re-ext "\\..+$"   ; start from the first dot. last dot?
+(defvar dired-filename-re-ext "\\..+\\'"  ; start from the first dot. last dot?
   "*Defines what is the extension of a file name.
 \(match-beginning 0\) for this regexp in the file name without directory will
 be taken to be the start of the extension.")
 (defun dired-find-file ()
   "In dired, visit the file or directory named on this line."
   (interactive)
-  (find-file (dired-get-filename)))
+  (let ((find-file-run-dired t))
+    (find-file (dired-get-filename))))
 
 (defun dired-view-file ()
   "In dired, examine a file in view mode, returning to dired when done.
   (interactive "P")
   (if displayp
       (dired-display-file)
-    (find-file-other-window (dired-get-filename))))
+      (let ((find-file-run-dired t))
+        (find-file-other-window (dired-get-filename)))))
 
 ;; Only for Emacs 19
 (defun dired-find-file-other-frame ()
   "In dired, visit this file or directory in another frame."
   (interactive)
-  (find-file-other-frame (dired-get-filename)))
+  (let ((find-file-run-dired t))
+    (find-file-other-frame (dired-get-filename))))
 
 (defun dired-display-file ()
   "In dired, displays this file or directory in the other window."
   (interactive)
-  (display-buffer (find-file-noselect (dired-get-filename))))
+  (let ((find-file-run-dired t))
+    (display-buffer (find-file-noselect (dired-get-filename)))))
 
 ;; After an idea by wurgler@zippysun.math.uakron.edu (Tom Wurgler).
 (defun dired-do-find-file (&optional arg)
       ;; The upper window will have SIZE lines.  We select the lower
       ;; (larger) window because we want to split that again.
       (select-window (split-window nil size))
-      (find-file (car file-list))
+      (let ((find-file-run-dired t))
+        (find-file (car file-list)))
       (setq file-list (cdr file-list)))))
 
 (defun dired-create-directory (directory)
 (defun dired-file-name-sans-rcs-extension (fn)
   "Returns the file name FN without its RCS extension \",v\"."
   (setq fn (file-name-nondirectory fn))
-  (if (string-match ",v$" fn 1)
+  (if (string-match ",v\\'" fn 1)
       (substring fn 0 (match-beginning 0))
     fn))
 
 (defun dired-file-name-sans-compress-extension (fn)
   "Returns the file name FN without the extension from compress or gzip."
   (setq fn (file-name-nondirectory fn))
-  (if (string-match "\\.\\([zZ]\\|gz\\)$" fn 1)
+  (if (string-match "\\.\\([zZ]\\|gz\\)\\'" fn 1)
       (substring fn (match-beginning 0))
     fn))
 
 		   "RCS")
 	    ;; skip inserted RCS subdirs
 	    (setq rcs-files
-		  (append (directory-files dir t ",v$") ; *,v and RCS/*,v
+		  (append (directory-files dir t ",v\\'") ; *,v and RCS/*,v
 			  (let ((rcs-dir (expand-file-name "RCS" dir)))
 			    (if (file-directory-p rcs-dir)
 				(mapcar	; working files from ./RCS are in ./
 				    (expand-file-name x dir)))
 				 (directory-files
 				  (file-name-as-directory rcs-dir)
-				  nil ",v$"))))
+				  nil ",v\\'"))))
 			  rcs-files)))))
      (mapcar (function car) dired-subdir-alist))
     (setq total (length rcs-files))
 	(setq rgxp (concat
 		    ".\\("
 		    (mapconcat 'regexp-quote dired-omit-extensions "\\|")
-		    "\\)$")))
+		    "\\)\\'")))
     (if dired-omit-regexps
 	(setq rgxp
 	      (concat

File lisp/egg/egg.el

   "FSFmacs event emulator that shoves non key events into
 unread-command-events to facilitate translation from Mule-2.3"
   (let ((event (make-event))
-	(ch nil))
+	ch key)
     (next-command-event event)
+    (setq key (event-key event))
     (if (key-press-event-p event)
 	(if (eq 0 (event-modifier-bits event))
-	    (setq ch (event-key event))
+	    (setq ch (or (event-to-character event) key))
 	  (if (eq 1 (event-modifier-bits event))
-	      (setq ch (int-to-char (- (char-to-int (event-key event)) 96)))
+	      (setq ch
+		    (if (characterp key)
+			(or (int-to-char (- (char-to-int key) 96))
+			    (int-to-char (- (char-to-int key) 64)))
+		      (event-to-character event)))
 	    (setq unread-command-events (list event))))
       (setq unread-command-events (list event)))
     ch))
     (narrow-to-region start end)
     (goto-char (point-min))
     (while (re-search-forward "\\cS\\|\\cA\\|\\cK" (point-max) (point-max))
-      (let* ((ch (preceding-char))
+      (let* ((ch (char-before (point)))
 	     (ch1 (char-octet ch 0))
 	     (ch2 (char-octet ch 1)))
 	(cond ((= ch1 33) ;Symbols
     (narrow-to-region start end)
     (goto-char (point-min))
     (while (re-search-forward "[ -~]" (point-max) (point-max))
-      (let ((ch (preceding-char)))
+      (let ((ch (char-before (point))))
 	(if (and (<= ?  ch) (<= ch ?~))
 	    (progn
 	      (delete-char -1)
 	      (let ((zen (cdr (assq ch *zenkaku-alist*))))
 		(if zen (insert zen)
-		  (insert (make-char (find-charset 'japanese-jisx0208) 38 ch))))))))))
+		  (insert (make-char (find-charset 'japanese-jisx0208) 38
+				     (char-to-int ch)))))))))))
 
 (defun zenkaku-paragraph ()
   "zenkaku  paragraph at or after point."
 		  ch)
 	      nil))
 	nil)
-    (following-char)))
+    (char-after (point))))
 
 (defun its:read-char ()
   (if (= (point) its:*buff-e*)
 	(if its:*interactive*
 	    (egg-read-event)
 	  nil))
-    (let ((ch (following-char)))
+    (let ((ch (char-after (point))))
       (setq its:*char-from-buff* t)
       (delete-char 1)
       ch)))
   (fence-exit-internal))
 
 (defun fence-exit-internal ()
+  (egg:fence-face-off)
   (delete-region (- egg:*region-start* (length egg:*fence-open*)) egg:*region-start*)
   (delete-region egg:*region-end* (+ egg:*region-end* (length egg:*fence-close*)))
-  (egg:fence-face-off)
   (if its:*previous-map*
       (setq its:*current-map* its:*previous-map*
 	    its:*previous-map* nil))

File lisp/electric/auto-autoloads.el

 ;;; DO NOT MODIFY THIS FILE
-(if (not (featurep 'electric-autoloads))
-    (progn
+(if (featurep 'electric-autoloads) (error "Already loaded"))
 
 ;;;### (autoloads (electric-buffer-list) "ebuff-menu" "electric/ebuff-menu.el")
 
 ;;;***
 
 (provide 'electric-autoloads)
-))

File lisp/emulators/auto-autoloads.el

 ;;; DO NOT MODIFY THIS FILE
-(if (not (featurep 'emulators-autoloads))
-    (progn
+(if (featurep 'emulators-autoloads) (error "Already loaded"))
 
 ;;;### (autoloads (edt-emulation-on) "edt" "emulators/edt.el")
 
 ;;;***
 
 (provide 'emulators-autoloads)
-))

File lisp/eterm/auto-autoloads.el

 ;;; DO NOT MODIFY THIS FILE
-(if (not (featurep 'eterm-autoloads))
-    (progn
+(if (featurep 'eterm-autoloads) (error "Already loaded"))
 
 ;;;### (autoloads (term make-term) "term" "eterm/term.el")
 
 ;;;***
 
 (provide 'eterm-autoloads)
-))

File lisp/games/auto-autoloads.el

 ;;; DO NOT MODIFY THIS FILE
-(if (not (featurep 'games-autoloads))
-    (progn
+(if (featurep 'games-autoloads) (error "Already loaded"))
 
 ;;;### (autoloads (blackbox) "blackbox" "games/blackbox.el")
 
 ;;;***
 
 (provide 'games-autoloads)
-))

File lisp/gnats/auto-autoloads.el

 ;;; DO NOT MODIFY THIS FILE
-(if (not (featurep 'gnats-autoloads))
-    (progn
+(if (featurep 'gnats-autoloads) (error "Already loaded"))
 
 ;;;### (autoloads (gnats:summ-pr gnats:query-pr gnats:edit-pr gnats:view-pr gnats:gnats-mode) "gnats" "gnats/gnats.el")
 
 ;;;***
 
 (provide 'gnats-autoloads)
-))

File lisp/hm--html-menus/auto-autoloads.el

 ;;; DO NOT MODIFY THIS FILE
-(if (not (featurep 'hm--html-menus-autoloads))
-    (progn
+(if (featurep 'hm--html-menus-autoloads) (error "Already loaded"))
 
 ;;;### (autoloads (hm--html-minor-mode hm--html-mode) "hm--html-mode" "hm--html-menus/hm--html-mode.el")
 
 ;;;***
 
 (provide 'hm--html-menus-autoloads)
-))

File lisp/hm--html-menus/custom-load.el

+(custom-put 'tmpl-minor 'custom-loads '("tmpl-minor-mode"))
+(custom-put 'idd-drag-and-drop 'custom-loads '("internal-drag-and-drop"))
+(custom-put 'hm--html-indentation 'custom-loads '("hm--html-configuration"))
+(custom-put 'hm--html-hooks 'custom-loads '("hm--html-configuration"))
+(custom-put 'hm--html-display 'custom-loads '("hm--html-configuration"))
+(custom-put 'hm--html-keys 'custom-loads '("hm--html-configuration"))
+(custom-put 'hm--html-templates 'custom-loads '("hm--html-configuration"))
+(custom-put 'hm--html-links 'custom-loads '("hm--html-configuration"))
+(custom-put 'hm--html-menus 'custom-loads '("hm--html-configuration"))
+(custom-put 'hm--html-document-information 'custom-loads '("hm--html-configuration"))
+(custom-put 'hm--html-files 'custom-loads '("hm--html-configuration"))
 (custom-put 'hm--html 'custom-loads '("hm--html-configuration"))
-(custom-put 'hm--html-files 'custom-loads '("hm--html-configuration"))
-(custom-put 'hm--html-document-information 'custom-loads '("hm--html-configuration"))
-(custom-put 'hm--html-menus 'custom-loads '("hm--html-configuration"))
-(custom-put 'hm--html-links 'custom-loads '("hm--html-configuration"))
-(custom-put 'hm--html-templates 'custom-loads '("hm--html-configuration"))
-(custom-put 'hm--html-keys 'custom-loads '("hm--html-configuration"))
-(custom-put 'hm--html-display 'custom-loads '("hm--html-configuration"))
-(custom-put 'hm--html-hooks 'custom-loads '("hm--html-configuration"))
-(custom-put 'hm--html-indentation 'custom-loads '("hm--html-configuration"))
-(custom-put 'idd-drag-and-drop 'custom-loads '("internal-drag-and-drop"))
-(custom-put 'tmpl-minor 'custom-loads '("tmpl-minor-mode"))

File lisp/hyperbole/auto-autoloads.el

 ;;; DO NOT MODIFY THIS FILE
-(if (not (featurep '-autoloads))
-    (progn
+(if (featurep 'hyperbole-autoloads) (error "Already loaded"))
 
 ;;;### (autoloads (hmail:compose) "hmail" "hyperbole/hmail.el")
 
 
 ;;;***
 
-(provide '-autoloads)
-))
+(provide 'hyperbole-autoloads)

File lisp/iso/auto-autoloads.el

 ;;; DO NOT MODIFY THIS FILE
-(if (not (featurep 'iso-autoloads))
-    (progn
+(if (featurep 'iso-autoloads) (error "Already loaded"))
 
-(provide 'iso-autoloads)
-))
 
 ;;;### (autoloads (iso-accents-mode) "iso-acc" "iso/iso-acc.el")
 
 and a negative argument disables it." t nil)
 
 ;;;***
+
+(provide 'iso-autoloads)

File lisp/leim/auto-autoloads.el

 ;;; DO NOT MODIFY THIS FILE
-(if (not (featurep 'leim-autoloads))
-    (progn
+(if (featurep 'leim-autoloads) (error "Already loaded"))
 
-(provide 'leim-autoloads)
-))
 
 ;;;### (autoloads (quail-use-package) "quail" "leim/quail.el")
 
 The remaining arguments are libraries to be loaded before using the package." nil nil)
 
 ;;;***
+
+(provide 'leim-autoloads)

File lisp/mailcrypt/auto-autoloads.el

 ;;; DO NOT MODIFY THIS FILE
-(if (not (featurep 'mailcrypt-autoloads))
-    (progn
+(if (featurep 'mailcrypt-autoloads) (error "Already loaded"))
 
 ;;;### (autoloads (mc-deactivate-passwd mc-install-write-mode mc-install-read-mode) "mailcrypt" "mailcrypt/mailcrypt.el")
 
 ;;;***
 
 (provide 'mailcrypt-autoloads)
-))

File lisp/mh-e/auto-autoloads.el

 ;;; DO NOT MODIFY THIS FILE
-(if (not (featurep 'mh-e-autoloads))
-    (progn
+(if (featurep 'mh-e-autoloads) (error "Already loaded"))
 
 ;;;### (autoloads (mh-letter-mode mh-smail-other-window mh-smail-batch mh-smail) "mh-comp" "mh-e/mh-comp.el")
 
 ;;;***
 
 (provide 'mh-e-autoloads)
-))

File lisp/mh-e/custom-load.el

+(custom-put 'mh-buffer 'custom-loads '("mh-utils"))
+(custom-put 'mh-hook 'custom-loads '("mh-e"))
+(custom-put 'mh 'custom-loads '("mh-comp" "mh-e" "mh-utils"))
 (custom-put 'mh-compose 'custom-loads '("mh-comp"))
-(custom-put 'mh 'custom-loads '("mh-comp" "mh-e" "mh-utils"))
-(custom-put 'mh-hook 'custom-loads '("mh-e"))
-(custom-put 'mh-buffer 'custom-loads '("mh-utils"))

File lisp/modes/auto-autoloads.el

 ;;; DO NOT MODIFY THIS FILE
-(if (not (featurep 'modes-autoloads))
-    (progn
+(if (featurep 'modes-autoloads) (error "Already loaded"))
 
 ;;;### (autoloads nil "abbrev" "modes/abbrev.el")
 
 ;;;### (autoloads (ksh-mode) "ksh-mode" "modes/ksh-mode.el")
 
 (autoload 'ksh-mode "ksh-mode" "\
-ksh-mode $Revision: 1.7 $ - Major mode for editing (Bourne, Korn or Bourne again)
+ksh-mode $Revision: 1.8 $ - Major mode for editing (Bourne, Korn or Bourne again)
 shell scripts.
 Special key bindings and commands:
 \\{ksh-mode-map}
 
 (autoload 'vhdl-mode "vhdl-mode" "\
 Major mode for editing VHDL code.
-vhdl-mode $Revision: 1.7 $
+vhdl-mode $Revision: 1.8 $
 To submit a problem report, enter `\\[vhdl-submit-bug-report]' from a
 vhdl-mode buffer.  This automatically sets up a mail buffer with version
 information already added.  You just need to add a description of the
 ;;;***
 
 (provide 'modes-autoloads)
-))

File lisp/modes/custom-load.el

+(custom-put 'asm 'custom-loads '("asm-mode"))
+(custom-put 'auto-show 'custom-loads '("auto-show"))
+(custom-put 'lisp-indent 'custom-loads '("cl-indent"))
+(custom-put 'c-macro 'custom-loads '("cmacexp"))
+(custom-put 'enriched 'custom-loads '("enriched"))
+(custom-put 'executable 'custom-loads '("executable"))
+(custom-put 'f90 'custom-loads '("f90"))
+(custom-put 'f90-indent 'custom-loads '("f90"))
+(custom-put 'fortran 'custom-loads '("f90" "fortran"))
+(custom-put 'fortran-indent 'custom-loads '("fortran"))
+(custom-put 'fortran-comment 'custom-loads '("fortran"))
+(custom-put 'icon 'custom-loads '("icon"))
+(custom-put 'mail-abbrevs 'custom-loads '("mail-abbrevs"))
+(custom-put 'makefile-mode 'custom-loads '("make-mode"))
+(custom-put 'outl-mouse 'custom-loads '("outl-mouse"))
+(custom-put 'pascal 'custom-loads '("pascal"))
+(custom-put 'prolog 'custom-loads '("prolog"))
+(custom-put 'reftex 'custom-loads '("reftex"))
+(custom-put 'reftex-label-support 'custom-loads '("reftex"))
+(custom-put 'rexx 'custom-loads '("rexx-mode"))
+(custom-put 'resize-minibuffer 'custom-loads '("rsz-minibuf"))
+(custom-put 'sh 'custom-loads '("sh-script"))
+(custom-put 'sh-script 'custom-loads '("sh-script"))
+(custom-put 'strokes 'custom-loads '("strokes"))
+(custom-put 'tcl 'custom-loads '("tcl"))
+(custom-put 'texinfo 'custom-loads '("texinfo"))
+(custom-put 'verilog 'custom-loads '("verilog-mode"))
+(custom-put 'vrml 'custom-loads '("vrml-mode"))
+(custom-put 'whitespace 'custom-loads '("whitespace-mode"))
+(custom-put 'winmgr 'custom-loads '("winmgr-mode"))
 (custom-put 'xrdb 'custom-loads '("xrdb-mode"))
-(custom-put 'winmgr 'custom-loads '("winmgr-mode"))
-(custom-put 'whitespace 'custom-loads '("whitespace-mode"))
-(custom-put 'vrml 'custom-loads '("vrml-mode"))
-(custom-put 'verilog 'custom-loads '("verilog-mode"))
-(custom-put 'texinfo 'custom-loads '("texinfo"))
-(custom-put 'tcl 'custom-loads '("tcl"))
-(custom-put 'strokes 'custom-loads '("strokes"))
-(custom-put 'sh-script 'custom-loads '("sh-script"))
-(custom-put 'sh 'custom-loads '("sh-script"))
-(custom-put 'resize-minibuffer 'custom-loads '("rsz-minibuf"))
-(custom-put 'rexx 'custom-loads '("rexx-mode"))
-(custom-put 'reftex-label-support 'custom-loads '("reftex"))
-(custom-put 'reftex 'custom-loads '("reftex"))
-(custom-put 'prolog 'custom-loads '("prolog"))
-(custom-put 'pascal 'custom-loads '("pascal"))
-(custom-put 'outl-mouse 'custom-loads '("outl-mouse"))
-(custom-put 'makefile-mode 'custom-loads '("make-mode"))
-(custom-put 'mail-abbrevs 'custom-loads '("mail-abbrevs"))
-(custom-put 'icon 'custom-loads '("icon"))
-(custom-put 'fortran-comment 'custom-loads '("fortran"))
-(custom-put 'fortran-indent 'custom-loads '("fortran"))
-(custom-put 'fortran 'custom-loads '("f90" "fortran"))
-(custom-put 'f90-indent 'custom-loads '("f90"))
-(custom-put 'f90 'custom-loads '("f90"))
-(custom-put 'executable 'custom-loads '("executable"))
-(custom-put 'enriched 'custom-loads '("enriched"))
-(custom-put 'c-macro 'custom-loads '("cmacexp"))
-(custom-put 'lisp-indent 'custom-loads '("cl-indent"))
-(custom-put 'auto-show 'custom-loads '("auto-show"))
-(custom-put 'asm 'custom-loads '("asm-mode"))

File lisp/mule/auto-autoloads.el

 ;;; DO NOT MODIFY THIS FILE
-(if (not (featurep 'mule-autoloads))
-    (progn
+(if (featurep 'mule-autoloads) (error "Already loaded"))
 
 ;;;### (autoloads (isearch-fep-quail isearch-fep-canna isearch-fep-egg isearch-fep-string) "isearch-mule" "mule/isearch-mule.el")
 
 ;;;***
 
 (provide 'mule-autoloads)
-))

File lisp/oobr/auto-autoloads.el

 ;;; DO NOT MODIFY THIS FILE
-(if (not (featurep '-autoloads))
-    (progn
+(if (featurep 'oobr-autoloads) (error "Already loaded"))
 
 ;;;### (autoloads (br-env-load br-env-browse) "br-env" "oobr/br-env.el")
 
 
 ;;;***
 
-(provide '-autoloads)
-))
+(provide 'oobr-autoloads)

File lisp/packages/auto-autoloads.el

 ;;; DO NOT MODIFY THIS FILE
-(if (not (featurep 'packages-autoloads))
-    (progn
+(if (featurep 'packages-autoloads) (error "Already loaded"))
 
 ;;;### (autoloads (add-log-current-defun change-log-mode add-change-log-entry-other-window add-change-log-entry find-change-log prompt-for-change-log-name) "add-log" "packages/add-log.el")
 
 ;;;***
 
 (provide 'packages-autoloads)
-))

File lisp/packages/gnuserv.el

 	    (pushnew (current-buffer) (gnuclient-buffers client))
 	    (setq gnuserv-minor-mode t)
 	    ;; Add the "Done" button to the menubar, only in this buffer.
-	    (set-buffer-menubar current-menubar)
-	    (add-menu-button nil ["Done" gnuserv-edit t]))
+	    (if (boundp 'current-menubar)
+	      (progn (set-buffer-menubar current-menubar)
+	      (add-menu-button nil ["Done" gnuserv-edit t]))
+	      ))
 	  (run-hooks 'gnuserv-visit-hook)
 	  (pop list)))
       (cond
     (run-hooks 'gnuserv-done-hook)
     (setq gnuserv-minor-mode nil)
     ;; Delete the menu button.
-    (delete-menu-item '("Done"))
+    (if (boundp 'current-menubar)
+      (delete-menu-item '("Done")))
     (funcall (if (gnuserv-temp-file-p buffer)
 		 gnuserv-done-temp-file-function
 	       gnuserv-done-function)

File lisp/packages/info.el

 (defcustom Info-default-directory-list nil
   "*List of default directories to search for Info documentation
 files.  This value is used as the default for `Info-directory-list'.
-It is set in startup.el."
+It is set in startup.el.  The first directory in this list must
+contain a `dir' file that will become the basis for the toplevel Info
+directory."
   :type '(repeat directory)
   :group 'info)
 
 		  path (substring path (min (1+ idx)
 					    (length path)))))
 	  (nreverse list))
-      Info-default-directory-list))
+      (reverse Info-default-directory-list)))
   "List of directories to search for Info documentation files.
 Default is to use the environment variable INFOPATH if it exists,
 else to use Info-default-directory-list.")
 		(cond
 		 ((re-search-backward "^ *\\* *Locals *: *\n" nil t)
 		  (delete-region (match-beginning 0) (match-end 0)))
-		 ((re-search-backward "^Local" nil t)
-		  (end-of-line))
+		 ((re-search-backward "^[ \t]*Local" nil t)
+		  ;; This is for people who underline topic headings with
+		  ;; equal signs or dashes.
+		  (when (save-excursion
+			  (forward-line 1)
+			  (beginning-of-line)
+			  (looking-at "^[ \t]*[-=]+"))
+		    (forward-line 1))
+		  (forward-line 1)
+		  (beginning-of-line))
 		 (t (search-backward "\^L" nil t)))
 		;; Insert menu part of the file
 		(let* ((pt (point))
 		       (len (length (buffer-string nil nil other))))
-		  (insert "\n" (buffer-string nil nil other))
+		  (insert (buffer-string nil nil other))
 		  (goto-char (+ pt len))
 		  (save-excursion
 		    (goto-char pt)
 		       "")
 		     ")"
 		     (or Info-current-node ""))))))
-
+
 ;; Go to an info node specified with a filename-and-nodename string
 ;; of the sort that is found in pointers in nodes.
 
       (or (and (equal onode Info-current-node)
                (equal ofile Info-current-file))
           (Info-history-add ofile onode opoint)))))
-
-
+
 ;; Extract the value of the node-pointer named NAME.
 ;; If there is none, use ERRORNAME in the error message; 
 ;; if ERRORNAME is nil, just return nil.
   "Go to the Info directory node."
   (interactive)
   (Info-find-node "dir" "top"))
-
+
 (defun Info-follow-reference (footnotename)
   "Follow cross reference named NAME to the node it refers to.
 NAME may be an abbreviation of the reference name."
       (or (equal tag "")
 	  (insert "<<" tag ">>"))))
   (Info-cease-annotate))
-
-
+
 (defun Info-exit ()
   "Exit Info by selecting some other buffer."
   (interactive)
 	       (name (nth 1 (nth 1 data))))
 	  (and name (nth 1 data))))
     (error nil)))
-
 
 (defvar Info-mode-map nil
   "Keymap containing Info commands.")
   (define-key Info-mode-map 'delete 'Info-scroll-prev)
   (define-key Info-mode-map 'button2 'Info-follow-clicked-node)
   (define-key Info-mode-map 'button3 'Info-select-node-menu))
-
 
 ;; Info mode is suitable only for specially formatted data.
 (put 'info-mode 'mode-class 'special)
 				  0)
 			    where)))
       where)))
-
 
 ;;; fontification and mousability for info
 
 		 "Up entry to enclosing section"]
 		)))
 ;))
-
 
 (provide 'info)
 

File lisp/packages/lazy-lock.el

 	(we (if lazy-lock-hide-invisible
 		(save-excursion
 		  (end-of-line) (forward-line (window-height)) (point))
-	      (min (max (1- (window-end)) (point-min)) (point-max)))))
+	      (min (max (1- (window-end nil t)) (point-min)) (point-max)))))
     (if (or (/= ws lazy-lock-cache-start) (/= we lazy-lock-cache-end))
 	;; Find where we haven't `fontified' before.
 	(let* ((start (or (text-property-not-all ws we 'fontified t) ws))

File lisp/packages/man.el

   :type 'boolean
   :group 'man)
 
+(defcustom Manual-buffers-have-stars nil
+  "*When T, manual page buffers are always named like *man*.
+Otherwise, they are not if `buffers-menu-submenus-for-groups-p' is T,
+so that Manual-mode buffers will have their own submenu."
+  :type 'boolean
+  :group 'man)
+
 (defcustom Manual-use-rosetta-man (not (null (locate-file "rman" exec-path))) "\
 If non-nil, use RosettaMan (rman) to filter man pages.
 This makes man-page cleanup virtually instantaneous, instead of
 
     (let ((bufname (flet
 		       ((maybe-star ()
-				    (if buffers-menu-submenus-for-groups-p
-					""
-				      "*")))
+		          (if (or Manual-buffers-have-stars
+				  (not buffers-menu-submenus-for-groups-p))
+			      "*"
+			    "")))
 		     (if apropos-mode
 			 (concat (maybe-star) "man apropos " topic (maybe-star))
 		       (concat (maybe-star)
 		   (message "%s (done.)" args-string))
 		 (set-buffer-modified-p nil)
 		 (Manual-mode)))))
-
-      (let ((page (flet
-		      ((maybe-star ()
-				   (if buffers-menu-submenus-for-groups-p
-				       ""
-				     "*")))
-		    (if section
-			(concat (maybe-star) topic "(" section ")" (maybe-star))
-		      topic))))
+      (let ((page (if section
+		      (concat topic "(" section ")")
+		    topic)))
 	(setq Manual-page-history
 	      (cons (buffer-name)
 		    (delete (buffer-name) Manual-page-history))
 
 (defun Manual-mouseify-xrefs ()
   (goto-char (point-min))
+  ;; skip the top line of manual pages, but not apropos listings.
+  (unless apropos-mode (forward-line 1))
   (let ((case-fold-search nil)
 	s e name splitp extent)
     ;; possibly it would be faster to rewrite this expression to search for
 
       (goto-char s)
       ;; if this is a hyphenated xref, we're on the second line, 1st char now.
-
       (when (progn
 	      (beginning-of-line)
 	      (and (looking-at (concat "^[ \t]+" (regexp-quote name)))
 		(setq manpage "???"))
 	      (flet
 		  ((maybe-star ()
-			       (if buffers-menu-submenus-for-groups-p
-				   "*"
-				 "")))
+		     (if (or Manual-buffers-have-stars
+			     (not buffers-menu-submenus-for-groups-p))
+			 "*"
+		       "")))
 		(setq buffer
 		      (rename-buffer
 		       (generate-new-buffer-name (concat (maybe-star)

File lisp/paths.el

 	    "/var/mail/")
 	   ((memq system-type '(dgux hpux usg-unix-v unisoft-unix rtu irix))
 	    "/usr/mail/")
+	   ((memq system-type '(linux))
+	    "/var/spool/mail/")
 	   (t "/usr/spool/mail/")))
 
     (funcall

File lisp/pcl-cvs/auto-autoloads.el

 ;;; DO NOT MODIFY THIS FILE
-(if (not (featurep 'pcl-cvs-autoloads))
-    (progn
+(if (featurep 'pcl-cvs-autoloads) (error "Already loaded"))
 
 ;;;### (autoloads (pcl-cvs-fontify) "pcl-cvs-xemacs" "pcl-cvs/pcl-cvs-xemacs.el")
 
 ;;;***
 
 (provide 'pcl-cvs-autoloads)
-))

File lisp/prim/about.el

        (print-short "Frederic Poncin" "fp@info.ucl.ac.be")
        (print-short "E. Rehmi Post" "rehmi@asylum.sf.ca.us")
        (print-short "Martin Pottendorfer" "Martin.Pottendorfer@aut.alcatel.at")
-       (print-short "Colin Rafferty" "craffert@spspme.ml.com")
+       (print-short "Colin Rafferty" "craffert@ml.com")
        (print-short "Paul M Reilly" "pmr@pajato.com")
        (print-short "Jack Repenning" "jackr@sgi.com")
        (print-short "Daniel Rich" "drich@cisco.com")

File lisp/prim/auto-autoloads.el

 ;;; DO NOT MODIFY THIS FILE
-(if (not (featurep 'prim-autoloads))
-    (progn
+(if (featurep 'prim-autoloads) (error "Already loaded"))
 
 ;;;### (autoloads (about-xemacs) "about" "prim/about.el")
 
 ;;;***
 
 (provide 'prim-autoloads)
-))

File lisp/prim/frame.el

 	       (buffer-substring-no-properties begin end))
     (error "CDE functionality not compiled in.")))
 
+(defun offix-start-drag (event data &optional type)
+  "Implements the OffiX drag operation.
+Calls the internal function offix-start-drag-internal to do the actual work.
+If type is not given, DndText is assumed."
+  (interactive "esi")
+  (if (featurep 'offix)
+      (funcall (intern "offix-start-drag-internal") event data type)
+    (error "OffiX functionality not compiled in.")))
+
+(defun offix-start-drag-region (event begin end)
+  "Implements the OffiX drag operation for a region.
+Calls the internal function offix-start-drag-internal to do the actual work.
+This always assumes DndText as type."
+  (interactive "_er")
+  (if (featurep 'offix)
+      (funcall (intern "offix-start-drag-internal")
+	       event (buffer-substring-no-properties begin end))
+    (error "OffiX functionality not compiled in.")))
+
 
 
 ;;; Application-specific frame-management

File lisp/prim/help.el

  
 ;; This code implements XEmacs's on-line help system, the one invoked by
 ;;`M-x help-for-help'.
- 
+
 ;; 06/11/1997 -- Converted to use char-after instead of broken
 ;;  following-char. -slb
 
         (message "%s is undefined" (key-description key))
       (with-displaying-help-buffer
        (lambda ()
-;	 (princ (key-description key))
-;	 (princ " runs the command ")
-	 (prin1 defn)
-	 (princ ":\n")
+	 (princ (key-description key))
+	 (princ " runs ")
+	 (princ (format "`%s'" defn))
+	 (princ "\n\n")
 	 (cond ((or (stringp defn) (vectorp defn))
 		(let ((cmd (key-binding defn)))
 		  (if (not cmd)
   :group 'help-appearance)
 
 (defun describe-function-find-file (function)
-  (and (boundp 'load-history) ; not standardly bound in XEmacs
-       (let ((files load-history)
+  (let ((files load-history)
 	     file)
 	 (while files
 	   (if (memq function (cdr (car files)))
 	       (setq file (car (car files)) files nil))
 	   (setq files (cdr files)))
-	 file)))
+	 file))
 
 (defun describe-function (function)
   "Display the full documentation of FUNCTION (a symbol)."
   (interactive
-    (let* ((fn (function-called-at-point))
+    (let* ((fn (funcall find-function-function))
            (val (let ((enable-recursive-minibuffers t))
                   (completing-read
                     (if fn
 ;(gettext "an interactive autoloaded Lisp macro")
 
 (defun describe-function-1 (function stream &optional nodoc)
-  (prin1 function stream)
-  (princ ": " stream)
+  (princ (format "`%S' is " function) stream)
   (let* ((def function)
 	 file-name
          (doc (or (documentation function)
 	  (if aliases
 	      ;; I18N3 Need gettext due to concat
 	      (setq aliases (concat aliases 
-				    (format "\n     which is an alias for %s, "
+				    (format
+				     "\n     which is an alias for `%s', "
 					    (symbol-name def))))
-	    (setq aliases (format "an alias for %s, " (symbol-name def)))))
+	    (setq aliases (format "an alias for `%s', &q