changeset 90223:edf295560b5a

Revision: [e-mail]--gnu-2005/emacs--unicode--0--patch-77 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 504-513) - Update from CVS - Merge from gnus--rel--5.10 - Update from CVS: .cvsignore: Add `lock'. * gnus--rel--5.10 (patch 99-103) - Update from CVS

--- a/ChangeLog	Fri Jul 29 11:44:50 2005 +0000
+++ b/ChangeLog	Fri Aug 05 10:57:36 2005 +0000
@@ -1,3 +1,7 @@
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* .cvsignore: Add `lock'.
+
 2005-07-28  Juanma Barranquero  <[e-mail]>
 
 	* .cvsignore: Add `data' and `site-lisp' (for in-place installs).

--- a/admin/FOR-RELEASE	Fri Jul 29 11:44:50 2005 +0000
+++ b/admin/FOR-RELEASE	Fri Aug 05 10:57:36 2005 +0000
@@ -96,17 +96,18 @@
 DIRECTORY		STATUS		IN CHARGE
 ---------		------		---------
 leim			working		Kenichi Handa
-lisp/calc		working		Thien-Thi Nguyen
+lisp/calc		done		Thien-Thi Nguyen
 lisp/calendar		working		Glenn Morris
-lisp/emulation		working		Thien-Thi Nguyen
-lisp/eshell		working		Thien-Thi Nguyen
+lisp/emulation		done		Thien-Thi Nguyen
+lisp/eshell		done		Thien-Thi Nguyen
 lisp/international	done		Kenichi Handa
 lisp/languages		done		Kenichi Handa
 lisp/mh-e		working		Bill Wohler
-lisp/net		working		Thien-Thi Nguyen
-lisp/play		working		Thien-Thi Nguyen
-lisp/term		working		Thien-Thi Nguyen
-lisp/toolbar		working		Thien-Thi Nguyen
+lisp/net		done		Thien-Thi Nguyen
+lisp/play		done		Thien-Thi Nguyen
+lisp/progmodes		done		Nick Roberts
+lisp/term		done		Thien-Thi Nguyen
+lisp/toolbar		done		Thien-Thi Nguyen
 lisp/url		working		Thien-Thi Nguyen
 
 ** Check the Emacs manual.

--- a/admin/notes/years	Fri Jul 29 11:44:50 2005 +0000
+++ b/admin/notes/years	Fri Aug 05 10:57:36 2005 +0000
@@ -1,11 +1,23 @@
+How to Maintain Copyright Years for GNU Emacs
 
 
-  THIS DOCUMENT IS UNDER REVIEW.
+"Our lawyer says it is ok if we add, to each file that has been in Emacs
+ since Emacs 21 came out in 2001, all the subsequent years.  We don't
+ need to check whether *that file* was changed in those years.
+ It's sufficient that *Emacs* was changed in those years (and it was!).
 
-  DO NOT FOLLOW THESE INSTRUCTIONS -- THEY ARE NOT CORRECT.
+ For those files that have been added since then, we should add
+ the year it was added to Emacs, and all subsequent years."
+
+ --RMS, 2005-07-13
 
 
-How to Maintain Copyright Years for GNU Emacs
+------------------------------------------------------------------------------
+
+
+Following is the policy that we tried to write down one time (mid 2005).
+Although it is incorrect, we keep it around to remind us how complicated
+things used to be (and may become in the future).
 
 
 Principle: Individual files need to have the year of the release

--- a/etc/ChangeLog	Fri Jul 29 11:44:50 2005 +0000
+++ b/etc/ChangeLog	Fri Aug 05 10:57:36 2005 +0000
@@ -1,3 +1,7 @@
[phone]  Kenichi Handa  <[e-mail]>
+
+	* NEWS: Fix the entry describing code-pages.
+
 2005-07-28  Juanma Barranquero  <[e-mail]>
 
 	* .cvsignore: Add `icons' (for in-place installs).

--- a/etc/NEWS	Fri Jul 29 11:44:50 2005 +0000
+++ b/etc/NEWS	Fri Aug 05 10:57:36 2005 +0000
@@ -1201,12 +1201,11 @@
 Big 5 is then converted to CNS.
 
 ---
-*** Many new coding systems are available by loading the `code-pages'
-library.  These include complete versions of most of those in
-codepage.el, based on Unicode mappings.  `codepage-setup' is now
-obsolete and is used only in the MS-DOS port of Emacs.  windows-1252
-and windows-1251 are preloaded since the former is so common and the
-latter is used by GNU locales.
+*** Many new coding systems are available in the `code-pages' library.
+These include complete versions of most of those in codepage.el, based
+on Unicode mappings.  `codepage-setup' is now obsolete and is used
+only in the MS-DOS port of Emacs.  All coding systems defined in
+`code-pages' are auto-loaded.
 
 ---
 *** New variable `utf-translate-cjk-unicode-range' controls which

--- a/lisp/ChangeLog	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/ChangeLog	Fri Aug 05 10:57:36 2005 +0000
@@ -1,3 +1,123 @@
[phone]  Kenichi Handa  <[e-mail]>
+
+	* international/code-pages.el: Add autoload cookies for all coding
+	systems.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* cus-start.el (all): Put undo.c where it alphabetically belongs.
+
[phone]  Juri Linkov  <[e-mail]>
+
+	* progmodes/compile.el (compilation-mode-map):
+	* progmodes/grep.el (grep-mode-map):
+	Bind TAB to `compilation-next-error' and [backtab] to
+	`compilation-previous-error'.
+
+	* progmodes/grep.el (grep-regexp-alist): Replace complex regexp
+	matching line numbers, column numbers and their ranges with regexp
+	matching only line numbers.
+	(grep-context-face): New face variable.
+	(grep-mode-font-lock-keywords): Use it.
+
+	* faces.el (read-face-name): Delete duplicate faces.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* thumbs.el (thumbs-find-image): Don't make variables
+	automatically buffer local.
+	(thumbs-current-tmp-filename, thumbs-current-image-filename)
+	(thumbs-image-num): Make automatically buffer local.
+	(thumbs-show-thumbs-list): Use `make-local-variable', not
+	`make-variable-buffer-local'.
+	(thumbs-insert-image): Make `thumbs-current-image-size'
+	buffer-local.
+
+	* play/doctor.el (doctor-type-symbol): "?\ " -> "?\s".
+	(**mad**, *debug*, *print-space*, *print-upcase*, abuselst)
+	(abusewords, account, afraidof, arerelated, areyou, bak, beclst)
+	(bother, bye, canyou, chatlst, continue, deathlst, describe)
+	(drnk, drugs, eliza-flag, elizalst, famlst, feared, fears)
+	(feelings-about, foullst, found, hello, history, howareyoulst)
+	(howdyflag, huhlst, ibelieve, improve, inter, isee, isrelated)
+	(lincount, longhuhlst, lover, machlst, mathlst, maybe, moods)
+	(neglst, obj, object, owner, please, problems, qlist)
+	(random-adjective, relation, remlst, repetitive-shortness)
+	(replist, rms-flag, schoollst, sent, sexlst, shortbeclst)
+	(shortlst, something, sportslst, stallmanlst, states, subj)
+	(suicide-flag, sure, things, thlst, toklst, typos, verb, want)
+	(whatwhen, whereoutp, whysay, whywant, zippy-flag, zippylst):
+	Defvar at compile time.
+
+	* progmodes/ada-mode.el (ada-mode): Use `make-local-variable',
+	not `make-variable-buffer-local'.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* emulation/cua-rect.el (cua--highlight-rectangle): Only show
+	rectangle overlay in selected window.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* cus-start.el (all): Put `indicate-empty-lines' in fringe group
+	instead of display group.  Make `indicate-buffer-boundaries'
+	customizable through Custom.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* progmodes/gdb-ui.el (gdb-frame-address, gdb-var-changed)
+	(gdb-output-sink, gdba, gdb-cpp-define-alist-program)
+	(gdb-set-gud-minor-mode, gdb-exited, gdb-setup-windows)
+	(gdb-put-string): Fix typos in docstrings.
+
[phone]  Nick Roberts  <[e-mail]>
+
+	Update copyright notices of files in progmodes directory for
+ 	release of Emacs 22.1.
+
+	* progmodes/gdb-ui.el (gdb-enable-debug-log): Add autoload cookie.
+
+	* progmodes/gud.el (gud-tooltip-mode): Add autoload cookie.  Don't
+	barf if the GUD buffer has been killed.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* textmodes/table.el (table-yank-handler): Change defcustom to defvar.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* emacs-lisp/bytecomp.el (byte-compile-make-variable-buffer-local)
+	(byte-compile-form-make-variable-buffer-local): New functions to warn
+	about misuses of make-variable-buffer-local where make-local-variable
+	was meant.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* bs.el (bs-attributes-list): Doc fix.
+	(bs): Update url-link.
+
+	* desktop.el (desktop-save-buffer): Fix typos in docstring.
+	(desktop-load-default): Simplify.
+
+	* ibuffer.el (ibuffer-columnize-and-insert-list)
+	(ibuffer-mouse-toggle-mark, ibuffer-count-marked-lines)
+	(ibuffer-unmark-all, ibuffer-toggle-marks)
+	(ibuffer-unmark-forward, ibuffer-unmark-backward)
+	(ibuffer-compile-make-format-form, ibuffer-format-column)
+	(ibuffer-current-buffers-with-marks)
+	(ibuffer-update-title-and-summary): "?\ " -> "?\s".
+	(ibuffer): Doc fix.
+	(ibuffer-mode): Fix typo in docstring.
+	(ibuffer-hooks, ibuffer-mode-hooks): Make obsolete and declare
+	with `define-obsolete-variable-alias'.
+	(ibuffer-elide-long-columns): Mark as obsolete.  Doc fix.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* international/mule-cmds.el (select-message-coding-system):
+	Be sure to use LF for end-of-line.  If no coding system is decided,
+	return iso-8859-1-unix.
+
 2005-07-28  Stefan Monnier  <[e-mail]>
 
 	* net/ange-ftp.el (ange-ftp-gateway-fatal-msgs)
@@ -62,17 +182,15 @@
 
 	* term/README: Describe the terminal-init-* functionality.
 
-	* startup.el (command-line): After loading the terminal
-	initialization file call the corresponding terminal initialization
-	function.
+	* startup.el (command-line): After loading the terminal initialization
+	file call the corresponding terminal initialization function.
 
 2005-07-27  Kenichi Handa  <[e-mail]>
 
 	* ps-bdf.el (bdf-read-font-info): Ignore glyphs whose ENCODING is
 	negative.
 
-	* ps-mule.el (ps-mule-bitmap-prologue): Fix arguments to
-	setcharwidth.
+	* ps-mule.el (ps-mule-bitmap-prologue): Fix arguments to setcharwidth.
 	(ps-mule-composition-prologue): Fix for the case that
 	RelativeCompose is false.
 
@@ -140,8 +258,6 @@
 
 2005-07-22  Juri Linkov  <[e-mail]>
 
-	* simple.el (line-move-1): Fix comments.
-
 	* startup.el (normal-splash-screen): Update menu name.
 
 	* tempo.el (tempo-insert-template): Fix 2005-07-16 change.

--- a/lisp/bs.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/bs.el	Fri Aug 05 10:57:36 2005 +0000
@@ -25,7 +25,7 @@
 ;;; Commentary:
 
 ;; Version: 1.17
-;; X-URL: http://home.netsurf.de/olaf.sylvester/emacs
+;; X-URL: http://www.geekware.de/software/emacs
 ;;
 ;; The bs-package contains a main function bs-show for poping up a
 ;; buffer in a way similar to `list-buffers' and `electric-buffer-list':
@@ -138,7 +138,7 @@
   "Buffer Selection: Maintaining buffers by buffer menu."
   :version "21.1"
   :link '(emacs-commentary-link "bs")
-  :link '(url-link "http://home.netsurf.de/olaf.sylvester/emacs")
+  :link '(url-link "http://www.geekware.de/software/emacs")
   :group 'convenience)
 
 (defgroup bs-appearance nil
@@ -160,15 +160,17 @@
   "*List specifying the layout of a Buffer Selection Menu buffer.
 Each entry specifies a column and is a list of the form of:
 \(HEADER MINIMUM-LENGTH MAXIMUM-LENGTH ALIGNMENT FUN-OR-STRING)
-HEADER         : string for header for first line or a function
-  which calculates column title.
-MINIMUM-LENGTH : minimum width of column (number or name of function).
-  The function must return a positive integer.
-MAXIMUM-LENGTH : maximum width of column (number or name of function)
-                 (currently ignored)
-ALIGNMENT      : alignment of column: (`left' `right' `middle')
-FUN-OR-STRING  : Name of a function for calculating the value or
-a string for a constant value.
+
+HEADER         : String for header for first line or a function
+                 which calculates column title.
+MINIMUM-LENGTH : Minimum width of column (number or name of function).
+                 The function must return a positive integer.
+MAXIMUM-LENGTH : Maximum width of column (number or name of function)
+                 (currently ignored).
+ALIGNMENT      : Alignment of column (`left', `right', `middle').
+FUN-OR-STRING  : Name of a function for calculating the value or a
+                 string for a constant value.
+
 The function gets as parameter the buffer where we have started
 buffer selection and the list of all buffers to show.  The function must
 return a string representing the column's value."

--- a/lisp/cus-start.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/cus-start.el	Fri Aug 05 10:57:36 2005 +0000
@@ -40,20 +40,6 @@
 	     ;; alloc.c
 	     (gc-cons-threshold alloc integer)
 	     (garbage-collection-messages alloc boolean)
-	     ;; undo.c
-	     (undo-limit undo integer)
-	     (undo-strong-limit undo integer)
-	     (undo-outer-limit undo
-			       (choice integer
-				       (const :tag "No limit"
-					      :format "%t\n%d"
-					      :doc
-					      "With this choice, \
-the undo info for the current command never gets discarded.
-This should only be chosen under exceptional circumstances,
-since it could result in memory overflow and make Emacs crash."
-					      nil))
-			       "22.1")
 	     ;; buffer.c
 	     (mode-line-format modeline sexp) ;Hard to do right.
 	     (default-major-mode internal function)
@@ -65,7 +51,47 @@
 	     (ctl-arrow display boolean)
 	     (truncate-lines display boolean)
 	     (selective-display-ellipses display boolean)
-	     (indicate-empty-lines display boolean "21.1")
+	     (indicate-empty-lines fringe boolean "21.1")
+	     (indicate-buffer-boundaries
+	      fringe
+	      (choice
+	       (const :tag "No indicators" nil)
+	       (const :tag "On left, with arrows" left)
+	       (const :tag "On right, with arrows" right)
+	       (set :tag "Pick your own design"
+		    :value ((t . nil))
+		    :format "%{%t%}:\n%v\n%d"
+		    :doc "You can specify a default and then override it \
+for individual indicators.
+Leaving \"Default\" unchecked is equivalent with specifying a default of
+\"Do not show\"."
+		    (choice :tag "Default"
+			    :value (t . nil)
+			    (const :tag "Do not show" (t . nil))
+			    (const :tag "On the left" (t . left))
+			    (const :tag "On the right" (t . right)))
+		    (choice :tag "Top"
+			    :value (top . left)
+			    (const :tag "Do not show" (top . nil))
+			    (const :tag "On the left" (top . left))
+			    (const :tag "On the right" (top . right)))
+		    (choice :tag "Bottom"
+			    :value (bottom . left)
+			    (const :tag "Do not show" (bottom . nil))
+			    (const :tag "On the left" (bottom . left))
+			    (const :tag "On the right" (bottom . right)))
+		    (choice :tag "Up arrow"
+			    :value (up . left)
+			    (const :tag "Do not show" (up . nil))
+			    (const :tag "On the left" (up . left))
+			    (const :tag "On the right" (up . right)))
+		    (choice :tag "Down arrow"
+			    :value (down . left)
+			    (const :tag "Do not show" (down . nil))
+			    (const :tag "On the left" (down . left))
+			    (const :tag "On the right" (down . right))))
+	       (other :tag "On left, no arrows" t))
+	      "22.1")
 	     (scroll-up-aggressively windows
 				     (choice (const :tag "off" nil) number)
 				     "21.1")
@@ -220,6 +246,20 @@
 	     (words-include-escapes editing-basics boolean)
 	     (open-paren-in-column-0-is-defun-start editing-basics boolean
 						    "21.1")
+	     ;; undo.c
+	     (undo-limit undo integer)
+	     (undo-strong-limit undo integer)
+	     (undo-outer-limit undo
+			       (choice integer
+				       (const :tag "No limit"
+					      :format "%t\n%d"
+					      :doc
+					      "With this choice, \
+the undo info for the current command never gets discarded.
+This should only be chosen under exceptional circumstances,
+since it could result in memory overflow and make Emacs crash."
+					      nil))
+			       "22.1")
 	     ;; window.c
 	     (temp-buffer-show-function windows (choice (const nil) function))
 	     (display-buffer-function windows (choice (const nil) function))

--- a/lisp/desktop.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/desktop.el	Fri Aug 05 10:57:36 2005 +0000
@@ -106,7 +106,8 @@
   :group 'desktop)
 
 ;; Maintained for backward compatibility
-(define-obsolete-variable-alias 'desktop-enable 'desktop-save-mode "22.1")
+(define-obsolete-variable-alias 'desktop-enable
+                                'desktop-save-mode "22.1")
 
 (defcustom desktop-save 'ask-if-new
   "*Specifies whether the desktop should be saved when it is killed.
@@ -136,7 +137,8 @@
   "Name of file for Emacs desktop, excluding the directory part."
   :type 'file
   :group 'desktop)
-(define-obsolete-variable-alias 'desktop-basefilename 'desktop-base-file-name "22.1")
+(define-obsolete-variable-alias 'desktop-basefilename
+                                'desktop-base-file-name "22.1")
 
 (defcustom desktop-path '("." "~")
   "List of directories to search for the desktop file.
@@ -292,8 +294,8 @@
   "When non-nil, save buffer status in desktop file.
 This variable becomes buffer local when set.
 
-If the value is a function, it called by `desktop-save' with argument
-DESKTOP-DIRNAME to obtain auxiliary information to saved in the desktop
+If the value is a function, it is called by `desktop-save' with argument
+DESKTOP-DIRNAME to obtain auxiliary information to save in the desktop
 file along with the state of the buffer for which it was called.
 
 When file names are returned, they should be formatted using the call
@@ -776,11 +778,11 @@
 (defun desktop-load-default ()
   "Load the `default' start-up library manually.
 Also inhibit further loading of it."
-  (if (not inhibit-default-init)	; safety check
-      (progn
-	(load "default" t t)
-	(setq inhibit-default-init t))))
-(make-obsolete 'desktop-load-default 'desktop-save-mode "22.1")
+  (unless inhibit-default-init	        ; safety check
+    (load "default" t t)
+    (setq inhibit-default-init t)))
+(make-obsolete 'desktop-load-default
+               'desktop-save-mode "22.1")
 
 ;; ----------------------------------------------------------------------------
 ;;;###autoload
@@ -801,7 +803,7 @@
   "Save the desktop in directory `desktop-dirname'."
   (interactive)
   (if desktop-dirname
-    (desktop-save desktop-dirname)
+      (desktop-save desktop-dirname)
     (call-interactively 'desktop-save))
   (message "Desktop saved in %s" desktop-dirname))
 

--- a/lisp/emacs-lisp/bytecomp.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/emacs-lisp/bytecomp.el	Fri Aug 05 10:57:36 2005 +0000
@@ -3792,6 +3792,19 @@
 (defun byte-compile-no-warnings (form)
   (let (byte-compile-warnings)
     (byte-compile-form (cons 'progn (cdr form)))))
+
+;; Warn about misuses of make-variable-buffer-local.
+(byte-defop-compiler-1 make-variable-buffer-local byte-compile-make-variable-buffer-local)
+(defun byte-compile-make-variable-buffer-local (form)
+  (if (eq (car-safe (car-safe (cdr-safe form))) 'quote)
+      (byte-compile-warn
+       "`make-variable-buffer-local' should be called at toplevel"))
+  (byte-compile-normal-call form))
+(put 'make-variable-buffer-local
+     'byte-hunk-handler 'byte-compile-form-make-variable-buffer-local)
+(defun byte-compile-form-make-variable-buffer-local (form)
+  (byte-compile-keep-pending form 'byte-compile-normal-call))
+
 
 ;;; tags
 

--- a/lisp/emacs-lisp/cl-extra.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/emacs-lisp/cl-extra.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; cl-extra.el --- Common Lisp features, part 2 -*-byte-compile-dynamic: t;-*-
 
-;; Copyright (C) 1993,2000,2003  Free Software Foundation, Inc.
+;; Copyright (C) 1993, 2000, 2003, 2005  Free Software Foundation, Inc.
 
 ;; Author: Dave Gillespie <[e-mail]>
 ;; Keywords: extensions
@@ -38,9 +38,7 @@
 
 ;;; Code:
 
-(or (memq 'cl-19 features)
-    (error "Tried to load `cl-extra' before `cl'!"))
-
+(require 'cl)
 
 ;;; Type coercion.
 
@@ -763,5 +761,5 @@
 
 (run-hooks 'cl-extra-load-hook)
 
-;;; arch-tag: bcd03437-0871-43fb-a8f1-ad0e0b5427ed
+;; arch-tag: bcd03437-0871-43fb-a8f1-ad0e0b5427ed
 ;;; cl-extra.el ends here

--- a/lisp/emulation/crisp.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/emulation/crisp.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; crisp.el --- CRiSP/Brief Emacs emulator
 
-;; Copyright (C) 1997, 1998, 1999, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Gary D. Foster <[e-mail]>
 ;; Keywords: emulations brief crisp

--- a/lisp/emulation/cua-base.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/emulation/cua-base.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,7 +1,7 @@
 ;;; cua-base.el --- emulate CUA key bindings
 
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2005
-;;        Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Kim F. Storm <[e-mail]>
 ;; Keywords: keyboard emulation convenience cua

--- a/lisp/emulation/cua-gmrk.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/emulation/cua-gmrk.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; cua-gmrk.el --- CUA unified global mark support
 
-;; Copyright (C) 1997-2002 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Kim F. Storm <[e-mail]>
 ;; Keywords: keyboard emulations convenience cua mark

--- a/lisp/emulation/cua-rect.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/emulation/cua-rect.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; cua-rect.el --- CUA unified rectangle support
 
-;; Copyright (C) 1997-2002, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Kim F. Storm <[e-mail]>
 ;; Keywords: keyboard emulations convenience CUA
@@ -832,6 +833,7 @@
 	     (overlay-put overlay 'after-string as)
 	     (overlay-put overlay 'face rface)
 	     (overlay-put overlay 'keymap cua--overlay-keymap)
+	     (overlay-put overlay 'window (selected-window))
 	     (setq new (cons overlay new))))))
     ;; Trim old trailing overlays.
     (mapcar (function delete-overlay) old)

--- a/lisp/emulation/edt-lk201.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/emulation/edt-lk201.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; edt-lk201.el --- enhanced EDT keypad mode emulation for LK-201 keyboards
 
-;; Copyright (C) 1986, 1992, 1993, 1995 Free Software Foundation, Inc.
+;; Copyright (C) 1986, 1992, 1993, 1995, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Kevin Gallagher <[e-mail]>
 ;; Maintainer: Kevin Gallagher <[e-mail]>

--- a/lisp/emulation/edt-mapper.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/emulation/edt-mapper.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; edt-mapper.el --- create an EDT LK-201 map file for X-Windows Emacs
 
-;; Copyright (C) 1994, 1995, 2000, 2001  Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 2000, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Kevin Gallagher <[e-mail]>
 ;; Maintainer: Kevin Gallagher <[e-mail]>

--- a/lisp/emulation/edt-pc.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/emulation/edt-pc.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; edt-pc.el --- enhanced EDT keypad mode emulation for PC 101 keyboards
 
-;; Copyright (C) 1986, 1994, 1995 Free Software Foundation, Inc.
+;; Copyright (C) 1986, 1994, 1995, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Kevin Gallagher <[e-mail]>
 ;; Maintainer: Kevin Gallagher <[e-mail]>

--- a/lisp/emulation/edt-vt100.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/emulation/edt-vt100.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; edt-vt100.el --- enhanced EDT keypad mode emulation for VT series terminals
 
-;; Copyright (C) 1986, 1992, 1993, 1995 Free Software Foundation, Inc.
+;; Copyright (C) 1986, 1992, 1993, 1995, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Kevin Gallagher <[e-mail]>
 ;; Maintainer: Kevin Gallagher <[e-mail]>

--- a/lisp/emulation/edt.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/emulation/edt.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,7 +1,7 @@
 ;;; edt.el --- enhanced EDT keypad mode emulation for GNU Emacs 19
 
-;; Copyright (C) 1986, 1992, 1993, 1994, 1995, 2000, 2001
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1986, 1992, 1993, 1994, 1995, 2000, 2001, 2002, 2003,
+;;   2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Kevin Gallagher <[e-mail]>
 ;; Maintainer: Kevin Gallagher <[e-mail]>

--- a/lisp/emulation/keypad.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/emulation/keypad.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; keypad.el --- simplified keypad bindings
 
-;; Copyright (C) 2002  Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Kim F. Storm <[e-mail]>
 ;; Keywords: keyboard convenience

--- a/lisp/emulation/pc-mode.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/emulation/pc-mode.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; pc-mode.el --- emulate certain key bindings used on PCs
 
-;; Copyright (C) 1995 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: emulations

--- a/lisp/emulation/pc-select.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/emulation/pc-select.el	Fri Aug 05 10:57:36 2005 +0000
@@ -2,7 +2,8 @@
 ;;;		     (or MAC GUI or MS-windoze (bah)) look-and-feel
 ;;;		     including key bindings.
 
-;; Copyright (C) 1995, 1996, 1997, 2000, 2001, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Michael Staats <[e-mail]>
 ;; Keywords: convenience emulation

--- a/lisp/emulation/tpu-edt.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/emulation/tpu-edt.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; tpu-edt.el --- Emacs emulating TPU emulating EDT
 
-;; Copyright (C) 1993, 1994, 1995, 2000, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 1995, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Rob Riepel <[e-mail]>
 ;; Maintainer: Rob Riepel <[e-mail]>

--- a/lisp/emulation/tpu-extras.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/emulation/tpu-extras.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; tpu-extras.el --- scroll margins and free cursor mode for TPU-edt
 
-;; Copyright (C) 1993, 1994, 1995, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 1995, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Rob Riepel <[e-mail]>
 ;; Maintainer: Rob Riepel <[e-mail]>

--- a/lisp/emulation/tpu-mapper.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/emulation/tpu-mapper.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; tpu-mapper.el --- create a TPU-edt X-windows keymap file
 
-;; Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 1995, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Rob Riepel <[e-mail]>
 ;; Maintainer: Rob Riepel <[e-mail]>

--- a/lisp/emulation/vip.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/emulation/vip.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,7 +1,7 @@
 ;;; vip.el --- a VI Package for GNU Emacs
 
-;; Copyright (C) 1986, 1987, 1988, 1992, 1993, 1998, 2005
-;;        Free Software Foundation, Inc.
+;; Copyright (C) 1986, 1987, 1988, 1992, 1993, 1998, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Masahiko Sato <[e-mail]>
 ;; Keywords: emulations

--- a/lisp/emulation/viper-cmd.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/emulation/viper-cmd.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; viper-cmd.el --- Vi command support for Viper
 
-;; Copyright (C) 1997, 98, 99, 2000, 01, 02, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <[e-mail]>
 

--- a/lisp/emulation/viper-ex.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/emulation/viper-ex.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; viper-ex.el --- functions implementing the Ex commands for Viper
 
-;; Copyright (C) 1994, 95, 96, 97, 98, 2000, 01, 02, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003,
+;;   2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <[e-mail]>
 

--- a/lisp/emulation/viper-init.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/emulation/viper-init.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; viper-init.el --- some common definitions for Viper
 
-;; Copyright (C) 1997, 98, 99, 2000, 01, 02, 05 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <[e-mail]>
 

--- a/lisp/emulation/viper-keym.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/emulation/viper-keym.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; viper-keym.el --- Viper keymaps
 
-;; Copyright (C) 1994, 95, 96, 97, 2000, 01, 02, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <[e-mail]>
 

--- a/lisp/emulation/viper-macs.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/emulation/viper-macs.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; viper-macs.el --- functions implementing keyboard macros for Viper
 
-;; Copyright (C) 1994, 95, 96, 97, 2000, 01, 02, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <[e-mail]>
 

--- a/lisp/emulation/viper-mous.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/emulation/viper-mous.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; viper-mous.el --- mouse support for Viper
 
-;; Copyright (C) 1994, 95, 96, 97, 2001, 02 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 1996, 1997, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <[e-mail]>
 

--- a/lisp/emulation/viper-util.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/emulation/viper-util.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; viper-util.el --- Utilities used by viper.el
 
-;; Copyright (C) 1994, 95, 96, 97, 99, 2000, 01, 02, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003,
+;;   2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <[e-mail]>
 

--- a/lisp/emulation/viper.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/emulation/viper.el	Fri Aug 05 10:57:36 2005 +0000
@@ -3,7 +3,8 @@
 ;;		 and a venomous VI PERil.
 ;;		 Viper Is also a Package for Emacs Rebels.
 
-;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01, 02, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+;;   2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <[e-mail]>
 ;; Keywords: emulations

--- a/lisp/emulation/ws-mode.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/emulation/ws-mode.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; ws-mode.el --- WordStar emulation mode for GNU Emacs
 
-;; Copyright (C) 1991 Free Software Foundation, Inc.
+;; Copyright (C) 1991, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Juergen Nickelsen <[e-mail]>
 ;; Version: 0.7

--- a/lisp/eshell/em-alias.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/eshell/em-alias.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; em-alias.el --- creation and management of command aliases
 
-;; Copyright (C) 1999, 2000, 2004 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <[e-mail]>
 

--- a/lisp/eshell/em-banner.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/eshell/em-banner.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; em-banner.el --- sample module that displays a login banner
 
-;; Copyright (C) 1999, 2000 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <[e-mail]>
 

--- a/lisp/eshell/em-basic.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/eshell/em-basic.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; em-basic.el --- basic shell builtin commands
 
-;; Copyright (C) 1999, 2000 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <[e-mail]>
 

--- a/lisp/eshell/em-cmpl.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/eshell/em-cmpl.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; em-cmpl.el --- completion using the TAB key
 
-;; Copyright (C) 1999, 2000 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <[e-mail]>
 

--- a/lisp/eshell/em-dirs.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/eshell/em-dirs.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; em-dirs.el --- directory navigation commands
 
-;; Copyright (C) 1999, 2000, 2004 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <[e-mail]>
 

--- a/lisp/eshell/em-glob.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/eshell/em-glob.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; em-glob.el --- extended file name globbing
 
-;; Copyright (C) 1999, 2000 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <[e-mail]>
 

--- a/lisp/eshell/em-hist.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/eshell/em-hist.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; em-hist.el --- history list management
 
-;; Copyright (C) 1999, 2000, 2004 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <[e-mail]>
 

--- a/lisp/eshell/em-ls.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/eshell/em-ls.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; em-ls.el --- implementation of ls in Lisp
 
-;; Copyright (C) 1999, 2000, 2005 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <[e-mail]>
 

--- a/lisp/eshell/em-pred.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/eshell/em-pred.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; em-pred.el --- argument predicates and modifiers (ala zsh)
 
-;; Copyright (C) 1999, 2000 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <[e-mail]>
 

--- a/lisp/eshell/em-prompt.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/eshell/em-prompt.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; em-prompt.el --- command prompts
 
-;; Copyright (C) 1999, 2000, 2005 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <[e-mail]>
 

--- a/lisp/eshell/em-rebind.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/eshell/em-rebind.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; em-rebind.el --- rebind keys when point is at current input
 
-;; Copyright (C) 1999, 2000 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <[e-mail]>
 

--- a/lisp/eshell/em-script.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/eshell/em-script.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; em-script.el --- Eshell script files
 
-;; Copyright (C) 1999, 2000 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <[e-mail]>
 

--- a/lisp/eshell/em-smart.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/eshell/em-smart.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; em-smart.el --- smart display of output
 
-;; Copyright (C) 1999, 2000 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <[e-mail]>
 

--- a/lisp/eshell/em-term.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/eshell/em-term.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; em-term.el --- running visual commands
 
-;; Copyright (C) 1999, 2000 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <[e-mail]>
 

--- a/lisp/eshell/em-unix.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/eshell/em-unix.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; em-unix.el --- UNIX command aliases
 
-;; Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <[e-mail]>
 

--- a/lisp/eshell/em-xtra.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/eshell/em-xtra.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; em-xtra.el --- extra alias functions
 
-;; Copyright (C) 1999, 2000 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <[e-mail]>
 

--- a/lisp/eshell/esh-arg.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/eshell/esh-arg.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; esh-arg.el --- argument processing
 
-;; Copyright (C) 1999, 2000 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <[e-mail]>
 

--- a/lisp/eshell/esh-cmd.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/eshell/esh-cmd.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; esh-cmd.el --- command invocation
 
-;; Copyright (C) 1999, 2000 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <[e-mail]>
 

--- a/lisp/eshell/esh-ext.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/eshell/esh-ext.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; esh-ext.el --- commands external to Eshell
 
-;; Copyright (C) 1999, 2000 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <[e-mail]>
 

--- a/lisp/eshell/esh-io.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/eshell/esh-io.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; esh-io.el --- I/O management
 
-;; Copyright (C) 1999, 2000, 2005 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <[e-mail]>
 

--- a/lisp/eshell/esh-maint.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/eshell/esh-maint.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; esh-maint.el --- init code for building eshell -*- no-byte-compile: t -*-
 
-;; Copyright (C) 1999, 2000 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <[e-mail]>
 

--- a/lisp/eshell/esh-mode.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/eshell/esh-mode.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; esh-mode.el --- user interface
 
-;; Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <[e-mail]>
 

--- a/lisp/eshell/esh-module.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/eshell/esh-module.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; esh-module.el --- Eshell modules
 
-;; Copyright (C) 1999, 2000, 2004 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <[e-mail]>
 ;; Keywords: processes

--- a/lisp/eshell/esh-opt.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/eshell/esh-opt.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; esh-opt.el --- command options processing
 
-;; Copyright (C) 1999, 2000, 2003 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <[e-mail]>
 

--- a/lisp/eshell/esh-proc.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/eshell/esh-proc.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; esh-proc.el --- process management
 
-;; Copyright (C) 1999, 2000 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <[e-mail]>
 

--- a/lisp/eshell/esh-test.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/eshell/esh-test.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; esh-test.el --- Eshell test suite
 
-;; Copyright (C) 1999, 2000, 2005 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <[e-mail]>
 

--- a/lisp/eshell/esh-util.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/eshell/esh-util.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; esh-util.el --- general utilities
 
-;; Copyright (C) 1999, 2000, 2001 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <[e-mail]>
 

--- a/lisp/eshell/esh-var.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/eshell/esh-var.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; esh-var.el --- handling of variables
 
-;; Copyright (C) 1999, 2000, 2005 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <[e-mail]>
 

--- a/lisp/eshell/eshell.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/eshell/eshell.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; eshell.el --- the Emacs command shell
 
-;; Copyright (C) 1999, 2000 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <[e-mail]>
 ;; Version: 2.4.2

--- a/lisp/faces.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/faces.el	Fri Aug 05 10:57:36 2005 +0000
@@ -882,6 +882,7 @@
 	      (push f faces)))
       (if (symbolp faceprop)
 	  (push faceprop faces)))
+    (delete-dups faces)
 
     ;; Build up the completion tables.
     (mapatoms (lambda (s)

--- a/lisp/gnus/ChangeLog	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/gnus/ChangeLog	Fri Aug 05 10:57:36 2005 +0000
@@ -1,8 +1,74 @@
[phone]  Katsumi Yamaoka  <[e-mail]>
+
+	* mm-bodies.el (mm-encode-body): Use coding system rather than
+	charset to encode text.
+
+	* mm-util.el (mm-find-mime-charset-region): Attempt to reduce the
+	number of charsets if utf-8 is available (XEmacs).
+
[phone]  Lars Magne Ingebrigtsen  <[e-mail]>
+
+	* gnus-art.el (article-unsplit-urls): Don't anchor urls to the
+	start of the lines.
+	(gnus-picon-databases): Add /usr/share/picons.
+
[phone]  Reiner Steib  <[e-mail]>
+
+	* gnus-art.el (gnus-button-valid-localpart-regexp): New variable
+	taken from `gnus-button-mid-or-mail-regexp'.
+	(gnus-button-mid-or-mail-regexp, gnus-button-alist): Use it.
+	(gnus-button-alist): Improve regexp for domain part of the MIDs
+	for news:localpart@domain buttons.
+	(gnus-button-ctan-directory-regexp): Update.
+
+	* message.el (message-kill-buffer): Raise the current frame.
+	(message-bury): Use `window-dedicated-p'.
+
[phone]  Katsumi Yamaoka  <[e-mail]>
+
+	* sieve-manage.el (sieve-manage-interactive-login): Use
+	make-local-variable rather than make-variable-buffer-local.
+	(sieve-manage-open): Ditto.
+	(sieve-manage-authenticate): Ditto.
+
+	* mml.el (mml-generate-mime-1): Make the content type default to
+	text/plain if the filename is not specified.
+
[phone]  Katsumi Yamaoka  <[e-mail]>
+
+	* gnus-uu.el (gnus-uu-save-article): Use insert-buffer-substring
+	instead of insert-buffer.
+
+	* message.el (message-yank-original): Ditto; set the mark at the
+	end of the yanked message.
+
[phone]  Katsumi Yamaoka  <[e-mail]>
+
+	* gnus-art.el (gnus-article-next-page-1): Reduce the number of
+	lines to scroll rather than to stop it.
+
+	* mml.el (mml-generate-default-type): Add doc string.
+	(mml-generate-mime-1): Use mm-default-file-encoding or make it
+	default to application/octet-stream when determining the content
+	type if it is not specified for the part or the mml contents; add
+	a comment about mml-generate-default-type.
+
[phone]  Reiner Steib  <[e-mail]>
+
+	* mml.el (mml-generate-mime-1): Use mm-default-file-encoding or
+	make it default to application/octet-stream when determining the
+	content type if it is not specified for the external contents.
+
 2005-07-28  Katsumi Yamaoka  <[e-mail]>
 
 	* rfc2231.el (rfc2231-parse-string): Take care that not only a
 	segmented parameter but also other parameters might be there.
 
[phone]  Katsumi Yamaoka  <[e-mail]>
+
+	* mm-decode.el (mm-display-external): Delete temp file, directory
+	and buffer immediately if the external process is exited.
+
 2005-07-26  Katsumi Yamaoka  <[e-mail]>
 
 	* gnus-art.el (gnus-article-next-page-1): Don't scroll if there're

--- a/lisp/gnus/gnus-art.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/gnus/gnus-art.el	Fri Aug 05 10:57:36 2005 +0000
@@ -842,7 +842,8 @@
   :type '(choice (item :tag "None" :value nil)
 		 string))
 
-(defcustom gnus-picon-databases '("/usr/lib/picon" "/usr/local/faces")
+(defcustom gnus-picon-databases '("/usr/lib/picon" "/usr/local/faces"
+				  "/usr/share/picons")
   "Defines the location of the faces database.
 For information on obtaining this database of pretty pictures, please
 see http://www.cs.indiana.edu/picons/ftp/index.html"
@@ -2428,7 +2429,7 @@
     (let ((inhibit-read-only t))
       (goto-char (point-min))
       (while (re-search-forward
-	      "^\\(\\(https?\\|ftp\\)://\\S-+\\) *\n\\(\\S-+\\)" nil t)
+	      "\\(\\(https?\\|ftp\\)://\\S-+\\) *\n\\(\\S-+\\)" nil t)
 	(replace-match "\\1\\3" t)))
     (when (interactive-p)
       (gnus-treat-article nil))))
@@ -5197,17 +5198,23 @@
 			 1 0)))))))
 
 (defun gnus-article-next-page-1 (lines)
-  (unless (and (not (featurep 'xemacs))
-	       (> (symbol-value 'scroll-margin) 0)
-	       (<= (count-lines (window-start) (point-max))
-		   (symbol-value 'scroll-margin)))
-    (condition-case ()
-	(let ((scroll-in-place nil))
-	  (scroll-up lines))
-      (end-of-buffer
-       ;; Long lines may cause an end-of-buffer error.
-       (goto-char (point-max))))
-    (gnus-article-beginning-of-window)))
+  (when (and (not (featurep 'xemacs))
+	     (numberp lines)
+	     (> lines 0)
+	     (numberp (symbol-value 'scroll-margin))
+	     (> (symbol-value 'scroll-margin) 0))
+    ;; Protect against the bug that Emacs 21.x hangs up when scrolling up for
+    ;; too many number of lines if `scroll-margin' is set as two or greater.
+    (setq lines (min lines
+		     (max 0 (- (count-lines (window-start) (point-max))
+			       (symbol-value 'scroll-margin))))))
+  (condition-case ()
+      (let ((scroll-in-place nil))
+	(scroll-up lines))
+    (end-of-buffer
+     ;; Long lines may cause an end-of-buffer error.
+     (goto-char (point-max))))
+  (gnus-article-beginning-of-window))
 
 (defun gnus-article-prev-page (&optional lines)
   "Show previous page of current article.
@@ -5880,6 +5887,14 @@
   :group 'gnus-article-buttons
   :type 'regexp)
 
+;; Regexp suggested by Felix Wiemann in <[e-mail]>
+(defcustom gnus-button-valid-localpart-regexp
+  "[a-z0-9$%(*-=?[_][^<>\")!;:,{}\n\t ]*"
+  "Regular expression that matches a localpart of mail addresses or MIDs."
+  :version "22.1"
+  :group 'gnus-article-buttons
+  :type 'regexp)
+
 (defcustom gnus-button-man-handler 'manual-entry
   "Function to use for displaying man pages.
 The function must take at least one argument with a string naming the
@@ -5919,12 +5934,11 @@
 		 (regexp :tag "Other")))
 
 (defcustom gnus-button-ctan-directory-regexp
-  (concat
-   "\\("; Cannot use `\(?: ... \)' (compatibility with Emacs 20).
-   "biblio\\|digests\\|dviware\\|fonts\\|graphics\\|help\\|"
-   "indexing\\|info\\|language\\|macros\\|support\\|systems\\|"
-   "tds\\|tools\\|usergrps\\|web\\|nonfree\\|obsolete"
-   "\\)")
+  (regexp-opt
+   (list "archive-tools" "biblio" "bibliography" "digests" "documentation"
+	 "dviware" "fonts" "graphics" "help" "indexing" "info" "language"
+	 "languages" "macros" "nonfree" "obsolete" "support" "systems"
+	 "tds" "tools" "usergrps" "web") t)
   "Regular expression for ctan directories.
 It should match all directories in the top level of `gnus-ctan-url'."
   :version "22.1"
@@ -5932,8 +5946,7 @@
   :type 'regexp)
 
 (defcustom gnus-button-mid-or-mail-regexp
-  (concat "\\b\\(<?[a-z0-9$%(*-=?[_][^<>\")!;:,{}\n\t ]*@"
-	  ;; Felix Wiemann in <[e-mail]>
+  (concat "\\b\\(<?" gnus-button-valid-localpart-regexp "@"
 	  gnus-button-valid-fqdn-regexp
 	  ">?\\)\\b")
   "Regular expression that matches a message ID or a mail address."
@@ -6248,8 +6261,9 @@
 (defcustom gnus-button-alist
   '(("<\\(url:[>\n\t ]*?\\)?\\(nntp\\|news\\):[>\n\t ]*\\([^>\n\t ]*@[^>\n\t ]*\\)>"
      0 (>= gnus-button-message-level 0) gnus-button-handle-news 3)
-    ("\\b\\(nntp\\|news\\):\\([^>\n\t ]*@[^>)!;:,\n\t ]*\\)" 0 t
-     gnus-button-handle-news 2)
+    ((concat "\\b\\(nntp\\|news\\):\\("
+	     gnus-button-valid-localpart-regexp "@[a-z0-9.-]+[a-z]\\)")
+     0 t gnus-button-handle-news 2)
     ("\\(\\b<\\(url:[>\n\t ]*\\)?\\(nntp\\|news\\):[>\n\t ]*\\(//\\)?\\([^>\n\t ]*\\)>\\)"
      1 (>= gnus-button-message-level 0) gnus-button-fetch-group 5)
     ("\\b\\(nntp\\|news\\):\\(//\\)?\\([^'\">\n\t ]+\\)"

--- a/lisp/gnus/gnus-uu.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/gnus/gnus-uu.el	Fri Aug 05 10:57:36 2005 +0000
@@ -917,16 +917,16 @@
 	(if (and message-forward-as-mime gnus-uu-digest-buffer)
 	    (with-current-buffer gnus-uu-digest-buffer
 	      (erase-buffer)
-	      (insert-buffer "*gnus-uu-pre*")
+	      (insert-buffer-substring "*gnus-uu-pre*")
 	      (goto-char (point-max))
-	      (insert-buffer "*gnus-uu-body*"))
+	      (insert-buffer-substring "*gnus-uu-body*"))
 	  (save-excursion
 	    (set-buffer "*gnus-uu-pre*")
 	    (insert (format "\n\n%s\n\n" (make-string 70 ?-)))
 	    (if gnus-uu-digest-buffer
 		(with-current-buffer gnus-uu-digest-buffer
 		  (erase-buffer)
-		  (insert-buffer "*gnus-uu-pre*"))
+		  (insert-buffer-substring "*gnus-uu-pre*"))
 	      (let ((coding-system-for-write mm-text-coding-system))
 		(gnus-write-buffer gnus-uu-saved-article-name))))
 	  (save-excursion
@@ -939,7 +939,7 @@
 	    (if gnus-uu-digest-buffer
 		(with-current-buffer gnus-uu-digest-buffer
 		  (goto-char (point-max))
-		  (insert-buffer "*gnus-uu-body*"))
+		  (insert-buffer-substring "*gnus-uu-body*"))
 	      (let ((coding-system-for-write mm-text-coding-system)
 		    (file-name-coding-system nnmail-pathname-coding-system))
 		(write-region

--- a/lisp/gnus/message.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/gnus/message.el	Fri Aug 05 10:57:36 2005 +0000
@@ -3206,7 +3206,9 @@
     (when (and message-reply-buffer
 	       message-cite-function)
       (delete-windows-on message-reply-buffer t)
-      (insert-buffer message-reply-buffer)
+      (push-mark (save-excursion
+		   (insert-buffer-substring message-reply-buffer)
+		   (point)))
       (unless arg
 	(funcall message-cite-function))
       (message-exchange-point-and-mark)
@@ -3416,8 +3418,15 @@
 			  (file-exists-p auto-save-file-name))
 		     (and file-name
 			  (file-exists-p file-name)))
-	       (yes-or-no-p (format "Remove the backup file%s? "
-				    (if modified " too" ""))))
+		 (progn
+		   ;; If the message buffer has lived in a dedicated window,
+		   ;; `kill-buffer' has killed the frame.  Thus the
+		   ;; `yes-or-no-p' may show up in a lowered frame.  Make sure
+		   ;; that the user can see the question by raising the
+		   ;; current frame:
+		   (raise-frame)
+		   (yes-or-no-p (format "Remove the backup file%s? "
+					(if modified " too" "")))))
 	(ignore-errors
 	  (delete-file auto-save-file-name))
 	(let ((message-draft-article draft-article))
@@ -3428,8 +3437,7 @@
   "Bury this mail BUFFER."
   (let ((newbuf (other-buffer buffer)))
     (bury-buffer buffer)
-    (if (and (fboundp 'frame-parameters)
-	     (cdr (assq 'dedicated (frame-parameters)))
+    (if (and (window-dedicated-p (selected-window))
 	     (not (null (delq (selected-frame) (visible-frame-list)))))
 	(delete-frame (selected-frame))
       (switch-to-buffer newbuf))))

--- a/lisp/gnus/mm-bodies.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/gnus/mm-bodies.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; mm-bodies.el --- Functions for decoding MIME things
 
-;; Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004
+;; Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <[e-mail]>
@@ -95,7 +95,8 @@
     (save-excursion
       (if charset
 	  (progn
-	    (mm-encode-coding-region (point-min) (point-max) charset)
+	    (mm-encode-coding-region (point-min) (point-max)
+				     (mm-charset-to-coding-system charset))
 	    charset)
 	(goto-char (point-min))
 	(let ((charsets (mm-find-mime-charset-region (point-min) (point-max))))

--- a/lisp/gnus/mm-decode.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/gnus/mm-decode.el	Fri Aug 05 10:57:36 2005 +0000
@@ -817,11 +817,32 @@
 	    (let ((command (mm-mailcap-command
 			    method file (mm-handle-type handle))))
 	      (unwind-protect
-		  (start-process "*display*"
-				 (setq buffer
-				       (generate-new-buffer " *mm*"))
-				 shell-file-name
-				 shell-command-switch command)
+		  (progn
+		    (start-process "*display*"
+				   (setq buffer
+					 (generate-new-buffer " *mm*"))
+				   shell-file-name
+				   shell-command-switch command)
+		    (set-process-sentinel
+		     (get-buffer-process buffer)
+		     `(lambda (process state)
+			(when (eq 'exit (process-status process))
+			  ;; Don't use `ignore-errors'.
+			  (condition-case nil
+			      (delete-file ,file)
+			    (error))
+			  (condition-case nil
+			      (delete-directory ,(file-name-directory file))
+			    (error))
+			  (condition-case nil
+			      (kill-buffer ,buffer)
+			    (error))
+			  (condition-case nil
+			      ,(macroexpand (list 'mm-handle-set-undisplayer
+						  (list 'quote handle)
+						  nil))
+			    (error))
+			  (message "Displaying %s...done" ,command)))))
 		(mm-handle-set-external-undisplayer
 		 handle (cons file buffer)))
 	      (message "Displaying %s..." command))

--- a/lisp/gnus/mml.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/gnus/mml.el	Fri Aug 05 10:57:36 2005 +0000
@@ -123,7 +123,13 @@
 with unknown encoding; `multipart': always send messages with more than
 one charsets.")
 
-(defvar mml-generate-default-type "text/plain")
+(defvar mml-generate-default-type "text/plain"
+  "Content type by which the Content-Type header can be omitted.
+The Content-Type header will not be put in the MIME part if the type
+equals the value and there's no parameter (e.g. charset, format, etc.)
+and `mml-insert-mime-headers-always' is nil.  The value will be bound
+to \"message/rfc822\" when encoding an article to be forwarded as a MIME
+part.  This is for the internal use, you should never modify the value.")
 
 (defvar mml-buffer-list nil)
 
@@ -399,9 +405,14 @@
       (mml-tweak-part cont)
       (cond
        ((or (eq (car cont) 'part) (eq (car cont) 'mml))
-	(let ((raw (cdr (assq 'raw cont)))
-	      coded encoding charset filename type flowed)
-	  (setq type (or (cdr (assq 'type cont)) "text/plain"))
+	(let* ((raw (cdr (assq 'raw cont)))
+	       (filename (cdr (assq 'filename cont)))
+	       (type (or (cdr (assq 'type cont))
+			 (if filename
+			     (or (mm-default-file-encoding filename)
+				 "application/octet-stream")
+			   "text/plain")))
+	       coded encoding charset flowed)
 	  (if (and (not raw)
 		   (member (car (split-string type "/")) '("text" "message")))
 	      (progn
@@ -413,7 +424,7 @@
 		  (cond
 		   ((cdr (assq 'buffer cont))
 		    (insert-buffer-substring (cdr (assq 'buffer cont))))
-		   ((and (setq filename (cdr (assq 'filename cont)))
+		   ((and filename
 			 (not (equal (cdr (assq 'nofile cont)) "yes")))
 		    (let ((coding-system-for-read charset))
 		      (mm-insert-file-contents filename)))
@@ -433,6 +444,10 @@
 		  (cond
 		   ((eq (car cont) 'mml)
 		    (let ((mml-boundary (mml-compute-boundary cont))
+			  ;; It is necessary for the case where this
+			  ;; function is called recursively since
+			  ;; `m-g-d-t' will be bound to "message/rfc822"
+			  ;; when encoding an article to be forwarded.
 			  (mml-generate-default-type "text/plain"))
 		      (mml-to-mime))
 		    (let ((mm-7bit-chars (concat mm-7bit-chars "\x1b")))
@@ -474,7 +489,7 @@
 		(insert (with-current-buffer (cdr (assq 'buffer cont))
 			  (mm-with-unibyte-current-buffer
 			    (buffer-string)))))
-	       ((and (setq filename (cdr (assq 'filename cont)))
+	       ((and filename
 		     (not (equal (cdr (assq 'nofile cont)) "yes")))
 		(let ((coding-system-for-read mm-binary-coding-system))
 		  (mm-insert-file-contents filename nil nil nil nil t)))
@@ -515,15 +530,21 @@
 	     "access-type=url"))
 	  (when parameters
 	    (mml-insert-parameter-string
-	     cont '(expiration size permission))))
-	(insert "\n\n")
-	(insert "Content-Type: " (cdr (assq 'type cont)) "\n")
-	(insert "Content-ID: " (message-make-message-id) "\n")
-	(insert "Content-Transfer-Encoding: "
-		(or (cdr (assq 'encoding cont)) "binary"))
-	(insert "\n\n")
-	(insert (or (cdr (assq 'contents cont))))
-	(insert "\n"))
+	     cont '(expiration size permission)))
+	  (insert "\n\n")
+	  (insert "Content-Type: "
+		  (or (cdr (assq 'type cont))
+		      (if name
+			  (or (mm-default-file-encoding name)
+			      "application/octet-stream")
+			"text/plain"))
+		  "\n")
+	  (insert "Content-ID: " (message-make-message-id) "\n")
+	  (insert "Content-Transfer-Encoding: "
+		  (or (cdr (assq 'encoding cont)) "binary"))
+	  (insert "\n\n")
+	  (insert (or (cdr (assq 'contents cont))))
+	  (insert "\n")))
        ((eq (car cont) 'multipart)
 	(let* ((type (or (cdr (assq 'type cont)) "mixed"))
 	       (mml-generate-default-type (if (equal type "digest")
@@ -559,7 +580,8 @@
 	    (message-options-set 'message-sender sender))
 	  (if (setq recipients (cdr (assq 'recipients cont)))
 	      (message-options-set 'message-recipients recipients))
-	  (let ((style (mml-signencrypt-style (first (or sign-item encrypt-item)))))
+	  (let ((style (mml-signencrypt-style
+			(first (or sign-item encrypt-item)))))
 	    ;; check if: we're both signing & encrypting, both methods
 	    ;; are the same (why would they be different?!), and that
 	    ;; the signencrypt style allows for combined operation.

--- a/lisp/gnus/sieve-manage.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/gnus/sieve-manage.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,5 +1,5 @@
 ;;; sieve-manage.el --- Implementation of the managesive protocol in elisp
-;; Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <[e-mail]>
 
@@ -184,8 +184,8 @@
 it where sucessful authenticating itself to the server, nil otherwise.
 Returns t if login was successful, nil otherwise."
   (with-current-buffer buffer
-    (make-variable-buffer-local 'sieve-manage-username)
-    (make-variable-buffer-local 'sieve-manage-password)
+    (make-local-variable 'sieve-manage-username)
+    (make-local-variable 'sieve-manage-password)
     (let (user passwd ret reason)
       ;;      (condition-case ()
       (while (or (not user) (not passwd))
@@ -370,7 +370,7 @@
 to work in."
   (setq buffer (or buffer (format " *sieve* %s:%d" server (or port 2000))))
   (with-current-buffer (get-buffer-create buffer)
-    (mapcar 'make-variable-buffer-local sieve-manage-local-variables)
+    (mapcar 'make-local-variable sieve-manage-local-variables)
     (sieve-manage-disable-multibyte)
     (buffer-disable-undo)
     (setq sieve-manage-server (or server sieve-manage-server))
@@ -458,8 +458,8 @@
   (with-current-buffer (or buffer (current-buffer))
     (if (not (eq sieve-manage-state 'nonauth))
 	(eq sieve-manage-state 'auth)
-      (make-variable-buffer-local 'sieve-manage-username)
-      (make-variable-buffer-local 'sieve-manage-password)
+      (make-local-variable 'sieve-manage-username)
+      (make-local-variable 'sieve-manage-password)
       (if user (setq sieve-manage-username user))
       (if passwd (setq sieve-manage-password passwd))
       (if (funcall (nth 2 (assq sieve-manage-auth

--- a/lisp/ibuffer.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/ibuffer.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; ibuffer.el --- operate on buffers like dired
 
-;; Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005
+;;   Free Software Foundation, Inc.
 
 ;; Author: Colin Walters <[e-mail]>
 ;; Maintainer: John Paul Wallington <[e-mail]>
@@ -193,11 +194,12 @@
 (defvar ibuffer-sorting-reversep nil)
 
 (defcustom ibuffer-elide-long-columns nil
-  "If non-nil, then elide column entries which exceed their max length.
-This variable is deprecated; use the :elide argument of
-`ibuffer-formats' to elide just certain columns."
+  "If non-nil, then elide column entries which exceed their max length."
   :type 'boolean
   :group 'ibuffer)
+(make-obsolete-variable 'ibuffer-elide-long-columns
+                        "use the :elide argument of `ibuffer-formats'."
+                        "22.1")
 
 (defcustom ibuffer-eliding-string "..."
   "The string to use for eliding long columns."
@@ -307,13 +309,15 @@
   "Hook run when `ibuffer' is called."
   :type 'hook
   :group 'ibuffer)
-(defvaralias 'ibuffer-hooks 'ibuffer-hook)
+(define-obsolete-variable-alias 'ibuffer-hooks
+                                'ibuffer-hook "22.1")
 
 (defcustom ibuffer-mode-hook nil
   "Hook run upon entry into `ibuffer-mode'."
   :type 'hook
   :group 'ibuffer)
-(defvaralias 'ibuffer-mode-hooks 'ibuffer-mode-hook)
+(define-obsolete-variable-alias 'ibuffer-mode-hooks
+                                'ibuffer-mode-hook "22.1")
 
 (defcustom ibuffer-load-hook nil
   "Hook run when Ibuffer is loaded."
@@ -838,7 +842,7 @@
       (while list
 	(dotimes (i (1- columns))
 	  (insert (concat (car list) (make-string (- max (length (car list)))
-						  ? )))
+						  ?\s)))
 	  (setq list (cdr list)))
 	(when (not (null list))
 	  (insert (pop list)))
@@ -861,7 +865,7 @@
 	  (let ((mark (ibuffer-current-mark)))
 	    (setq buffer-read-only nil)
 	    (if (eq mark ibuffer-marked-char)
-		(ibuffer-set-mark ? )
+		(ibuffer-set-mark ?\s)
 	      (ibuffer-set-mark ibuffer-marked-char)))))
     (setq buffer-read-only t)))
 
@@ -1153,7 +1157,7 @@
   (if all
       (ibuffer-map-lines-nomodify
        #'(lambda (buf mark)
-	   (not (char-equal mark ? ))))
+	   (not (char-equal mark ?\s))))
     (ibuffer-map-lines-nomodify
      #'(lambda (buf mark)
 	 (char-equal mark ibuffer-marked-char)))))
@@ -1227,18 +1231,18 @@
      ((char-equal mark ibuffer-marked-char)
       (ibuffer-map-marked-lines
        #'(lambda (buf mark)
-	   (ibuffer-set-mark-1 ? )
+	   (ibuffer-set-mark-1 ?\s)
 	   t)))
      ((char-equal mark ibuffer-deletion-char)
       (ibuffer-map-deletion-lines
        #'(lambda (buf mark)
-	   (ibuffer-set-mark-1 ? )
+	   (ibuffer-set-mark-1 ?\s)
 	   t)))
      (t
       (ibuffer-map-lines
        #'(lambda (buf mark)
-	   (when (not (char-equal mark ? ))
-	     (ibuffer-set-mark-1 ? ))
+	   (when (not (char-equal mark ?\s))
+	     (ibuffer-set-mark-1 ?\s))
 	   t)))))
   (ibuffer-redisplay t))
 
@@ -1255,9 +1259,9 @@
 	 (ibuffer-map-lines
 	  #'(lambda (buf mark)
 	      (cond ((eq mark ibuffer-marked-char)
-		     (ibuffer-set-mark-1 ? )
+		     (ibuffer-set-mark-1 ?\s)
 		     nil)
-		    ((eq mark ? )
+		    ((eq mark ?\s)
 		     (ibuffer-set-mark-1 ibuffer-marked-char)
 		     t)
 		    (t
@@ -1276,13 +1280,13 @@
   "Unmark the buffer on this line, and move forward ARG lines.
 If point is on a group name, this function operates on that group."
   (interactive "P")
-  (ibuffer-mark-interactive arg ?  1))
+  (ibuffer-mark-interactive arg ?\s 1))
 
 (defun ibuffer-unmark-backward (arg)
   "Unmark the buffer on this line, and move backward ARG lines.
 If point is on a group name, this function operates on that group."
   (interactive "P")
-  (ibuffer-mark-interactive arg ?  -1))
+  (ibuffer-mark-interactive arg ?\s -1))
 
 (defun ibuffer-mark-interactive (arg mark movement)
   (assert (eq major-mode 'ibuffer-mode))
@@ -1409,8 +1413,8 @@
     `(substring ,strvar 0 ,maxvar)))
 
 (defun ibuffer-compile-make-format-form (strvar widthform alignment)
-  (let* ((left `(make-string tmp2 ? ))
-	 (right `(make-string (- tmp1 tmp2) ? )))
+  (let* ((left `(make-string tmp2 ?\s))
+	 (right `(make-string (- tmp1 tmp2) ?\s)))
     `(progn
        (setq tmp1 ,widthform
 	     tmp2 (/ tmp1 2))
@@ -1690,7 +1694,7 @@
 	 (and (boundp 'dired-directory)
 	      (if (stringp dired-directory)
 		  dired-directory
-		(car dired-directory)))	
+		(car dired-directory)))
 	 ""))))
 
 (define-ibuffer-column filename-and-process
@@ -1724,8 +1728,8 @@
       filename)))
 
 (defun ibuffer-format-column (str width alignment)
-  (let ((left (make-string (/ width 2) ? ))
-	(right (make-string (- width (/ width 2)) ? )))
+  (let ((left (make-string (/ width 2) ?\s))
+	(right (make-string (- width (/ width 2)) ?\s)))
     (case alignment
       (:right (concat left right str))
       (:center (concat left str right))
@@ -1881,7 +1885,7 @@
     (mapcar #'(lambda (buf) (let ((e (assq buf bufs)))
 			      (if e
 				  e
-				(cons buf ? ))))
+				(cons buf ?\s))))
 	    curbufs)))
 
 (defun ibuffer-buf-matches-predicates (buf predicates)
@@ -1989,10 +1993,10 @@
 		      (buffer-substring (point) (line-end-position)))))
 	   (apply #'insert (mapcar
 			    #'(lambda (c)
-				(if (not (or (char-equal c ? )
+				(if (not (or (char-equal c ?\s)
 					     (char-equal c ?\n)))
 				    ?-
-				  ? ))
+				  ?\s))
 			    str)))
 	 (insert "\n"))
        (point))
@@ -2011,7 +2015,7 @@
 	   (dolist (element format)
 	     (insert
 	      (if (stringp element)
-		  (make-string (length element) ? )
+		  (make-string (length element) ?\s)
 		(let ((sym (car element)))
 		  (let ((min (cadr element))
 			;; (max (caddr element))
@@ -2023,7 +2027,7 @@
 					(funcall (get sym 'ibuffer-column-summarizer)
 						 (get sym 'ibuffer-column-summary))
 				      (make-string (length (get sym 'ibuffer-column-name))
-						   ? )))
+						   ?\s)))
 			   (len (length summary)))
 		      (if (< len min)
 			  (ibuffer-format-column summary
@@ -2241,22 +2245,22 @@
 ;;;###autoload
 (defun ibuffer (&optional other-window-p name qualifiers noselect
 			  shrink filter-groups formats)
-  "Begin using `ibuffer' to edit a list of buffers.
+  "Begin using Ibuffer to edit a list of buffers.
 Type 'h' after entering ibuffer for more information.
 
-Optional argument OTHER-WINDOW-P says to use another window.
-Optional argument NAME specifies the name of the buffer; it defaults
-to \"*Ibuffer*\".
-Optional argument QUALIFIERS is an initial set of filtering qualifiers
-to use; see `ibuffer-filtering-qualifiers'.
-Optional argument NOSELECT means don't select the Ibuffer buffer.
-Optional argument SHRINK means shrink the buffer to minimal size.  The
-special value `onewindow' means always use another window.
-Optional argument FILTER-GROUPS is an initial set of filtering
-groups to use; see `ibuffer-filter-groups'.
-Optional argument FORMATS is the value to use for `ibuffer-formats'.
-If specified, then the variable `ibuffer-formats' will have that value
-locally in this buffer."
+All arguments are optional.
+OTHER-WINDOW-P says to use another window.
+NAME specifies the name of the buffer (defaults to \"*Ibuffer*\").
+QUALIFIERS is an initial set of filtering qualifiers to use;
+  see `ibuffer-filtering-qualifiers'.
+NOSELECT means don't select the Ibuffer buffer.
+SHRINK means shrink the buffer to minimal size.  The special
+  value `onewindow' means always use another window.
+FILTER-GROUPS is an initial set of filtering groups to use;
+  see `ibuffer-filter-groups'.
+FORMATS is the value to use for `ibuffer-formats'.
+  If specified, then the variable `ibuffer-formats' will have
+  that value locally in this buffer."
   (interactive "P")
   (when ibuffer-use-other-window
     (setq other-window-p t))
@@ -2297,7 +2301,7 @@
 (put 'ibuffer-mode 'mode-class 'special)
 (defun ibuffer-mode ()
   "A major mode for viewing a list of buffers.
-In ibuffer, you can conveniently perform many operations on the
+In Ibuffer, you can conveniently perform many operations on the
 currently open buffers, in addition to filtering your view to a
 particular subset of them, and sorting by various criteria.
 

--- a/lisp/net/ange-ftp.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/net/ange-ftp.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,7 +1,7 @@
 ;;; ange-ftp.el --- transparent FTP support for GNU Emacs
 
-;; Copyright (C) 1989,90,91,92,93,94,95,96,98, 2000, 2001, 2005
-;;  Free Software Foundation, Inc.
+;; Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998,
+;;   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Andy Norman ([e-mail])
 ;; Maintainer: FSF
@@ -745,7 +745,7 @@
 
 (defcustom ange-ftp-potential-error-msgs
   ;; On Mac OS X we sometimes get things like:
-  ;; 
+  ;;
   ;;     ftp> open ftp.nluug.nl
   ;;     Trying 2001:610:1:80aa:192:87:102:36...
   ;;     ftp: connect to address 2001:610:1:80aa:192:87:102:36: No route to host

--- a/lisp/net/browse-url.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/net/browse-url.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,7 +1,7 @@
 ;;; browse-url.el --- pass a URL to a WWW browser
 
-;; Copyright (C) 1995, 96, 97, 98, 99, 2000, 2001, 2005
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+;;   2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Denis Howe <[e-mail]>
 ;; Maintainer: FSF

--- a/lisp/net/eudc-bob.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/net/eudc-bob.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; eudc-bob.el --- Binary Objects Support for EUDC
 
-;; Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <[e-mail]>
 ;; Maintainer: Pavel Janík <[e-mail]>

--- a/lisp/net/eudc-export.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/net/eudc-export.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; eudc-export.el --- functions to export EUDC query results
 
-;; Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <[e-mail]>
 ;; Maintainer: Pavel Janík <[e-mail]>

--- a/lisp/net/eudc-hotlist.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/net/eudc-hotlist.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; eudc-hotlist.el --- hotlist management for EUDC
 
-;; Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <[e-mail]>
 ;; Maintainer: Pavel Janík <[e-mail]>

--- a/lisp/net/eudc-vars.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/net/eudc-vars.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; eudc-vars.el --- Emacs Unified Directory Client
 
-;; Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <[e-mail]>
 ;; Maintainer: Pavel Janík <[e-mail]>

--- a/lisp/net/eudc.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/net/eudc.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; eudc.el --- Emacs Unified Directory Client
 
-;; Copyright (C) 1998, 1999, 2000, 2002, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <[e-mail]>
 ;; Maintainer: Pavel Janík <[e-mail]>

--- a/lisp/net/eudcb-bbdb.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/net/eudcb-bbdb.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; eudcb-bbdb.el --- Emacs Unified Directory Client - BBDB Backend
 
-;; Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <[e-mail]>
 ;; Maintainer: Pavel Janík <[e-mail]>

--- a/lisp/net/eudcb-ldap.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/net/eudcb-ldap.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; eudcb-ldap.el --- Emacs Unified Directory Client - LDAP Backend
 
-;; Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <[e-mail]>
 ;; Maintainer: Pavel Janík <[e-mail]>

--- a/lisp/net/eudcb-ph.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/net/eudcb-ph.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; eudcb-ph.el --- Emacs Unified Directory Client - CCSO PH/QI Backend
 
-;; Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <[e-mail]>
 ;; Maintainer: Pavel Janík <[e-mail]>

--- a/lisp/net/goto-addr.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/net/goto-addr.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; goto-addr.el --- click to browse URL or to send to e-mail address
 
-;; Copyright (C) 1995, 2000, 2001, 2005  Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2000, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Eric Ding <[e-mail]>
 ;; Maintainer: FSF

--- a/lisp/net/ldap.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/net/ldap.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; ldap.el --- client interface to LDAP for Emacs
 
-;; Copyright (C) 1998, 1999, 2000, 2002, 2005  Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <[e-mail]>
 ;; Maintainer: FSF

--- a/lisp/net/net-utils.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/net/net-utils.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; net-utils.el --- network functions
 
-;; Copyright (C) 1998, 1999, 2000, 2001, 2005  Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author:  Peter Breton <[e-mail]>
 ;; Created: Sun Mar 16 1997

--- a/lisp/net/netrc.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/net/netrc.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; netrc.el --- .netrc parsing functionality
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
-;;        Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <[e-mail]>
 ;; Keywords: news

--- a/lisp/net/quickurl.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/net/quickurl.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; quickurl.el --- insert an URL based on text at point in buffer
 
-;; Copyright (C) 1999,2000,2001,2005 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Dave Pearson <[e-mail]>
 ;; Maintainer: Dave Pearson <[e-mail]>

--- a/lisp/net/rcompile.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/net/rcompile.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; rcompile.el --- run a compilation on a remote machine
 
-;; Copyright (C) 1993, 1994 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Albert    <[e-mail]>
 ;; Maintainer: FSF

--- a/lisp/net/rlogin.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/net/rlogin.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; rlogin.el --- remote login interface
 
-;; Copyright (C) 1992, 93, 94, 95, 97, 1998, 2002, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1993, 1994, 1995, 1997, 1998, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Noah Friedman
 ;; Maintainer: Noah Friedman <[e-mail]>

--- a/lisp/net/snmp-mode.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/net/snmp-mode.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; snmp-mode.el --- SNMP & SNMPv2 MIB major mode
 
-;; Copyright (C) 1995, 1998, 2002, 2005  Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1998, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Paul D. Smith <[e-mail]>
 ;; Keywords: data

--- a/lisp/net/telnet.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/net/telnet.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; telnet.el --- run a telnet session from within an Emacs buffer
 
-;; Copyright (C) 1985, 88, 1992, 94, 2005  Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1988, 1992, 1994, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: William F. Schelter
 ;; Maintainer: FSF

--- a/lisp/net/tls.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/net/tls.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; tls.el --- TLS/SSL support via wrapper around GnuTLS
 
-;; Copyright (C) 1996-1999, 2003, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <[e-mail]>
 ;; Keywords: comm, tls, gnutls, ssl

--- a/lisp/net/tramp-uu.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/net/tramp-uu.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,7 +1,7 @@
 ;;; -*- coding: iso-2022-7bit; -*-
 ;;; tramp-uu.el --- uuencode in Lisp
 
-;; Copyright (C) 2002, 2004, 2005  Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Kai Gro,A_(Bjohann <[e-mail]>
 ;; Keywords: comm, terminals

--- a/lisp/net/tramp-vc.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/net/tramp-vc.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; tramp-vc.el --- Version control integration for TRAMP.el
 
-;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 by Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Daniel Pittman <[e-mail]>
 ;; Keywords: comm, processes

--- a/lisp/net/tramp.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/net/tramp.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,7 +1,8 @@
 ;;; -*- mode: Emacs-Lisp; coding: iso-2022-7bit; -*-
 ;;; tramp.el --- Transparent Remote Access, Multiple Protocol
 
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: [e-mail]
 ;; Keywords: comm, processes

--- a/lisp/net/trampver.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/net/trampver.el	Fri Aug 05 10:57:36 2005 +0000
@@ -2,7 +2,7 @@
 ;;; trampver.el --- Transparent Remote Access, Multiple Protocol
 ;;; lisp/trampver.el.  Generated from trampver.el.in by configure.
 
-;; Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: [e-mail] 
 ;; Keywords: comm, processes

--- a/lisp/net/webjump.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/net/webjump.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; webjump.el --- programmable Web hotlist
 
-;; Copyright (C) 1996, 1997, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author:    Neil W. Van Dyke <[e-mail]>
 ;; Created:   09-Aug-1996

--- a/lisp/net/zone-mode.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/net/zone-mode.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; zone-mode.el --- major mode for editing DNS zone files
 
-;; Copyright (C) 1998, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: John Heidemann <[e-mail]>
 ;; Keywords: DNS, languages

--- a/lisp/play/5x5.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/play/5x5.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; 5x5.el --- simple little puzzle game
 
-;; Copyright (C) 1999,2000,2005 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Dave Pearson <[e-mail]>
 ;; Maintainer: Dave Pearson <[e-mail]>

--- a/lisp/play/animate.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/play/animate.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; animate.el --- make text dance
 
-;; Copyright (C) 2001,2005 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Maintainer: Richard Stallman <[e-mail]>
 ;; Keywords: games

--- a/lisp/play/blackbox.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/play/blackbox.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; blackbox.el --- blackbox game in Emacs Lisp
 
-;; Copyright (C) 1985, 1986, 1987, 1992, 2001, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1987, 1992, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: F. Thomas May <uw-nsr!uw-warp![e-mail]>
 ;; Adapted-By: ESR

--- a/lisp/play/bruce.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/play/bruce.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,7 +1,8 @@
 ;;; bruce.el --- bruce phrase utility for overloading the Communications -*- no-byte-compile: t -*-
 ;;; Decency Act snoops, if any.
 
-;; Copyright (C) 1988, 1993, 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1988, 1993, 1997, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: games

--- a/lisp/play/cookie1.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/play/cookie1.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; cookie1.el --- retrieve random phrases from fortune cookie files
 
-;; Copyright (C) 1993 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Eric S. Raymond <[e-mail]>
 ;; Maintainer: FSF

--- a/lisp/play/decipher.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/play/decipher.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; decipher.el --- cryptanalyze monoalphabetic substitution ciphers
 ;;
-;; Copyright (C) 1995, 1996, 2003, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1996, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 ;;
 ;; Author: Christopher J. Madsen <[e-mail]>
 ;; Keywords: games

--- a/lisp/play/dissociate.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/play/dissociate.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; dissociate.el --- scramble text amusingly for Emacs
 
-;; Copyright (C) 1985 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: games

--- a/lisp/play/doctor.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/play/doctor.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; doctor.el --- psychological help for frustrated users
 
-;; Copyright (C) 1985, 1987, 1994, 1996, 2000, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1987, 1994, 1996, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: games
@@ -45,6 +46,36 @@
 
 ;;; Code:
 
+(eval-when-compile
+  (defvar **mad**)        (defvar *debug*)      (defvar *print-space*)
+  (defvar *print-upcase*) (defvar abuselst)     (defvar abusewords)
+  (defvar account)        (defvar afraidof)     (defvar arerelated)
+  (defvar areyou)         (defvar bak)          (defvar beclst)
+  (defvar bother)         (defvar bye)          (defvar canyou)
+  (defvar chatlst)        (defvar continue)     (defvar deathlst)
+  (defvar describe)       (defvar drnk)         (defvar drugs)
+  (defvar eliza-flag)     (defvar elizalst)     (defvar famlst)
+  (defvar feared)         (defvar fears)        (defvar feelings-about)
+  (defvar foullst)        (defvar found)        (defvar hello)
+  (defvar history)        (defvar howareyoulst) (defvar howdyflag)
+  (defvar huhlst)         (defvar ibelieve)     (defvar improve)
+  (defvar inter)          (defvar isee)         (defvar isrelated)
+  (defvar lincount)       (defvar longhuhlst)   (defvar lover)
+  (defvar machlst)        (defvar mathlst)      (defvar maybe)
+  (defvar moods)          (defvar neglst)       (defvar obj)
+  (defvar object)         (defvar owner)        (defvar please)
+  (defvar problems)       (defvar qlist)        (defvar random-adjective)
+  (defvar relation)       (defvar remlst)       (defvar repetitive-shortness)
+  (defvar replist)        (defvar rms-flag)     (defvar schoollst)
+  (defvar sent)           (defvar sexlst)       (defvar shortbeclst)
+  (defvar shortlst)       (defvar something)    (defvar sportslst)
+  (defvar stallmanlst)    (defvar states)       (defvar subj)
+  (defvar suicide-flag)   (defvar sure)         (defvar things)
+  (defvar thlst)          (defvar toklst)       (defvar typos)
+  (defvar verb)           (defvar want)         (defvar whatwhen)
+  (defvar whereoutp)      (defvar whysay)       (defvar whywant)
+  (defvar zippy-flag)     (defvar zippylst))
+
 (defun doc// (x) x)
 
 (defmacro doc$ (what)
@@ -1369,7 +1400,7 @@
   (cond ((or (string-match "^[.,;:?! ]" word)
 	     (not *print-space*))
 	 (insert word))
-	(t (insert ?\  word)))
+	(t (insert ?\s word)))
   (and auto-fill-function
        (> (current-column) fill-column)
        (apply auto-fill-function nil))

--- a/lisp/play/dunnet.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/play/dunnet.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; dunnet.el --- text adventure for Emacs
 
-;; Copyright (C) 1992, 1993, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1993, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Ron Schnell <[e-mail]>
 ;; Created: 25 Jul 1992

--- a/lisp/play/fortune.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/play/fortune.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; fortune.el --- use fortune to create signatures
 
-;; Copyright (C) 1999, 2001, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Holger Schauer <[e-mail]>
 ;; Keywords: games utils mail

--- a/lisp/play/gamegrid.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/play/gamegrid.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; gamegrid.el --- library for implementing grid-based games on Emacs
 
-;; Copyright (C) 1997, 1998, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Glynn Clements <[e-mail]>
 ;; Version: 1.02

--- a/lisp/play/gametree.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/play/gametree.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; gametree.el --- manage game analysis trees in Emacs
 
-;;  Copyright (C) 1997, 1999 Free Software Foundation, Inc
+;; Copyright (C) 1997, 1999, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Ian T Zimmerman <[e-mail]>
 ;; Created: Wed Dec 10 07:41:46 PST 1997

--- a/lisp/play/gomoku.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/play/gomoku.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; gomoku.el --- Gomoku game between you and Emacs
 
-;; Copyright (C) 1988, 1994, 1996, 2001, 2003, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1988, 1994, 1996, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Philippe Schnoebelen <[e-mail]>
 ;; Maintainer: FSF

--- a/lisp/play/handwrite.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/play/handwrite.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; handwrite.el --- turns your emacs buffer into a handwritten document -*- coding: iso-latin-1; -*-
 
-;; (C) Copyright 1996, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Danny Roozendaal (was: <[e-mail]>)
 ;; Created: October 21 1996

--- a/lisp/play/landmark.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/play/landmark.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; landmark.el --- neural-network robot that learns landmarks
 
-;; Copyright (c) 1996, 1997, 2000, 2003, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Terrence Brannon (was: <[e-mail]>)
 ;; Created: December 16, 1996 - first release to usenet

--- a/lisp/play/life.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/play/life.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; life.el --- John Horton Conway's `Life' game for GNU Emacs
 
-;; Copyright (C) 1988, 2001, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1988, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Kyle Jones <kyleuunet.uu.net>
 ;; Maintainer: FSF

--- a/lisp/play/morse.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/play/morse.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; morse.el --- convert text to morse code and back             -*- coding: utf-8 -*-
 
-;; Copyright (C) 1995, 2002, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Rick Farnbach <[e-mail]>
 ;; Keywords: games

--- a/lisp/play/mpuz.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/play/mpuz.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; mpuz.el --- multiplication puzzle for GNU Emacs
 
-;; Copyright (C) 1990, 2002, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Philippe Schnoebelen <[e-mail]>
 ;; Overhauled: Daniel Pfeiffer <[e-mail]>

--- a/lisp/play/pong.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/play/pong.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; pong.el --- classical implementation of pong
 
-;; Copyright 1999, 2000, 2001, 2005 by Free Software Foundation, Inc.
+;; Copyright 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Benjamin Drieu <[e-mail]>
 ;; Keywords: games

--- a/lisp/play/snake.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/play/snake.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; snake.el --- implementation of Snake for Emacs
 
-;; Copyright (C) 1997, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Glynn Clements <[e-mail]>
 ;; Created: 1997-09-10

--- a/lisp/play/solitaire.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/play/solitaire.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; solitaire.el --- game of solitaire in Emacs Lisp
 
-;; Copyright (C) 1994, 2003 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Jan Schormann <[e-mail]>
 ;; Created: Fri afternoon, Jun  3,  1994

--- a/lisp/play/spook.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/play/spook.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; spook.el --- spook phrase utility for overloading the NSA line eater
 
-;; Copyright (C) 1988, 1993 Free Software Foundation, Inc.
+;; Copyright (C) 1988, 1993, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: games

--- a/lisp/play/tetris.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/play/tetris.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; tetris.el --- implementation of Tetris for Emacs
 
-;; Copyright (C) 1997, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Glynn Clements <[e-mail]>
 ;; Version: 2.01

--- a/lisp/play/yow.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/play/yow.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; yow.el --- quote random zippyisms
 
-;; Copyright (C) 1993, 1994, 1995, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 1995, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Author: Richard Mlynarik

--- a/lisp/play/zone.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/play/zone.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; zone.el --- idle display hacks
 
-;; Copyright (C) 2000, 2001, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Victor Zandy <[e-mail]>
 ;; Maintainer: Thien-Thi Nguyen <[e-mail]>

--- a/lisp/progmodes/ada-mode.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/ada-mode.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,7 +1,7 @@
 ;;; ada-mode.el --- major-mode for editing Ada sources
 
-;; Copyright (C) 1994, 95, 97, 98, 99, 2000, 2001, 2002, 03, 2004
-;;  Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;;               2005  Free Software Foundation, Inc.
 
 ;; Author: Rolf Ebert      <[e-mail]>
 ;;      Markus Heritsch <[e-mail]>
@@ -1280,7 +1280,7 @@
       (progn
 	(add-to-list 'align-dq-string-modes 'ada-mode)
 	(add-to-list 'align-open-comment-modes 'ada-mode)
-	(set (make-variable-buffer-local 'align-region-separate)
+	(set (make-local-variable 'align-region-separate)
 	     ada-align-region-separate)
 
 	;; Exclude comments alone on line from alignment.

--- a/lisp/progmodes/ada-prj.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/ada-prj.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; ada-prj.el --- easy editing of project files for the ada-mode
 
-;; Copyright (C) 1998, 99, 2000-2003 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 
+;; Free Software Foundation, Inc.
 
 ;; Author: Emmanuel Briot <[e-mail]>
 ;; Keywords: languages, ada, project file

--- a/lisp/progmodes/ada-stmt.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/ada-stmt.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,7 +1,7 @@
 ;;; ada-stmt.el --- an extension to Ada mode for inserting statement templates
 
-;; Copyright(C) 1987, 93, 94, 96, 97, 98, 99, 2000
-;;   Free Software Foundation, Inc.
+;; Copyright(C) 1987, 1993, 1994, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+;;              2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 

--- a/lisp/progmodes/ada-xref.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/ada-xref.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,7 +1,7 @@
 ;;; ada-xref.el --- for lookup and completion in Ada mode
 
-;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 2001, 2002, 2003
-;;    Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+;;               2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Markus Heritsch <[e-mail]>
 ;;      Rolf Ebert <[e-mail]>

--- a/lisp/progmodes/antlr-mode.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/antlr-mode.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; antlr-mode.el --- major mode for ANTLR grammar files
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+;; Free Software Foundation, Inc.
 ;;
 ;; Author: [e-mail]
 ;; Keywords: languages, ANTLR, code generator

--- a/lisp/progmodes/asm-mode.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/asm-mode.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; asm-mode.el --- mode for editing assembler code
 
-;; Copyright (C) 1991, 2003 Free Software Foundation, Inc.
+;; Copyright (C) 1991, 2001, 2002, 2003, 2004, 2005
+;; Free Software Foundation, Inc.
 
 ;; Author: Eric S. Raymond <[e-mail]>
 ;; Maintainer: FSF

--- a/lisp/progmodes/autoconf.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/autoconf.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; autoconf.el --- mode for editing Autoconf configure.in files
 
-;; Copyright (C) 2000, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2002 2003, 2004, 2005
+;; Free Software Foundation, Inc.
 
 ;; Author: Dave Love <[e-mail]>
 ;; Keywords: languages

--- a/lisp/progmodes/cc-align.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/cc-align.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; cc-align.el --- custom indentation functions for CC Mode
 
-;; Copyright (C) 1985,1987,1992-2003 Free Software Foundation, Inc.
+;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Authors:    1998- Martin Stjernholm
 ;;             1992-1999 Barry A. Warsaw

--- a/lisp/progmodes/cc-awk.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/cc-awk.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; cc-awk.el --- AWK specific code within cc-mode.
 
-;; Copyright (C) 1988,94,96,2000,01,02,03  Free Software Foundation, Inc.
+;; Copyright (C) 1988, 94, 96, 2000, 2001, 2002, 2003, 2004, 2005
+;; Free Software Foundation, Inc.
 
 ;; Author: Alan Mackenzie <[e-mail]> (originally based on awk-mode.el)
 ;; Maintainer: FSF

--- a/lisp/progmodes/cc-bytecomp.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/cc-bytecomp.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; cc-bytecomp.el --- compile time setup for proper compilation
 
-;; Copyright (C) 2000, 01, 02, 03 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005
+;; Free Software Foundation, Inc.
 
 ;; Author:     Martin Stjernholm
 ;; Maintainer: [e-mail]

--- a/lisp/progmodes/cc-cmds.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/cc-cmds.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; cc-cmds.el --- user level commands for CC Mode
 
-;; Copyright (C) 1985,1987,1992-2003 Free Software Foundation, Inc.
+;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Authors:    1998- Martin Stjernholm
 ;;             1992-1999 Barry A. Warsaw

--- a/lisp/progmodes/cc-compat.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/cc-compat.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; cc-compat.el --- cc-mode compatibility with c-mode.el confusion
 
-;; Copyright (C) 1985,1987,1992-2003 Free Software Foundation, Inc.
+;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Authors:    1998- Martin Stjernholm
 ;;	       1994-1999 Barry A. Warsaw

--- a/lisp/progmodes/cc-defs.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/cc-defs.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; cc-defs.el --- compile time definitions for CC Mode
 
-;; Copyright (C) 1985,1987,1992-2003 Free Software Foundation, Inc.
+;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Authors:    1998- Martin Stjernholm
 ;;             1992-1999 Barry A. Warsaw

--- a/lisp/progmodes/cc-engine.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/cc-engine.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; cc-engine.el --- core syntax guessing engine for CC mode
 
-;; Copyright (C) 1985,1987,1992-2003 Free Software Foundation, Inc.
+;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Authors:    1998- Martin Stjernholm
 ;;             1992-1999 Barry A. Warsaw

--- a/lisp/progmodes/cc-fonts.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/cc-fonts.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; cc-fonts.el --- font lock support for CC Mode
 
-;; Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Authors:    2003- Alan Mackenzie
 ;;             2002- Martin Stjernholm

--- a/lisp/progmodes/cc-langs.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/cc-langs.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; cc-langs.el --- language specific settings for CC Mode
 
-;; Copyright (C) 1985,1987,1992-2003 Free Software Foundation, Inc.
+;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Authors:    1998- Martin Stjernholm
 ;;             1992-1999 Barry A. Warsaw

--- a/lisp/progmodes/cc-menus.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/cc-menus.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; cc-menus.el --- imenu support for CC Mode
 
-;; Copyright (C) 1985,1987,1992-2003 Free Software Foundation, Inc.
+;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Authors:    1998- Martin Stjernholm
 ;;             1992-1999 Barry A. Warsaw

--- a/lisp/progmodes/cc-mode.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/cc-mode.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; cc-mode.el --- major mode for editing C and similar languages
 
-;; Copyright (C) 1985,1987,1992-2003 Free Software Foundation, Inc.
+;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Authors:    2003- Alan Mackenzie
 ;;             1998- Martin Stjernholm

--- a/lisp/progmodes/cc-styles.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/cc-styles.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; cc-styles.el --- support for styles in CC Mode
 
-;; Copyright (C) 1985,1987,1992-2003 Free Software Foundation, Inc.
+;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Authors:    1998- Martin Stjernholm
 ;;             1992-1999 Barry A. Warsaw

--- a/lisp/progmodes/cc-vars.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/cc-vars.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; cc-vars.el --- user customization variables for CC Mode
 
-;; Copyright (C) 1985,1987,1992-2003 Free Software Foundation, Inc.
+;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Authors:    1998- Martin Stjernholm
 ;;             1992-1999 Barry A. Warsaw

--- a/lisp/progmodes/cfengine.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/cfengine.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; cfengine.el --- mode for editing Cfengine files
 
-;; Copyright (C) 2003, 2004  Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005  Free Software Foundation, Inc.
 
 ;; Author: Dave Love <[e-mail]>
 ;; Keywords: languages

--- a/lisp/progmodes/cmacexp.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/cmacexp.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; cmacexp.el --- expand C macros in a region
 
-;; Copyright (C) 1992, 1994, 1996, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1994, 1996, 2000, 2001, 2002, 2003, 2004
+;; Free Software Foundation, Inc.
 
 ;; Author: Francesco Potorti` <[e-mail]>
 ;; Adapted-By: ESR
@@ -146,8 +147,9 @@
 prefix arg means replace the region with it.
 
 `c-macro-preprocessor' specifies the preprocessor to use.
-Prompt for arguments to the preprocessor \(e.g. `-DDEBUG -I ./include')
-if the user option `c-macro-prompt-flag' is non-nil.
+Tf the user option `c-macro-prompt-flag' is non-nil
+prompt for arguments to the preprocessor \(e.g. `-DDEBUG -I ./include'),
+otherwise use `c-macro-cppflags'.
 
 Noninteractive args are START, END, SUBST.
 For use inside Lisp programs, see also `c-macro-expansion'."

--- a/lisp/progmodes/compile.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/compile.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,7 +1,7 @@
 ;;; compile.el --- run compiler as inferior of Emacs, parse error messages
 
 ;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2001, 2003, 2004, 2005  Free Software Foundation, Inc.
+;;   2001, 2002, 2003, 2004, 2005  Free Software Foundation, Inc.
 
 ;; Authors: Roland McGrath <[e-mail]>,
 ;;	    Daniel Pfeiffer <[e-mail]>
@@ -1158,6 +1158,8 @@
     (define-key map "\M-p" 'compilation-previous-error)
     (define-key map "\M-{" 'compilation-previous-file)
     (define-key map "\M-}" 'compilation-next-file)
+    (define-key map "\t" 'compilation-next-error)
+    (define-key map [backtab] 'compilation-previous-error)
 
     (define-key map " " 'scroll-up)
     (define-key map "\^?" 'scroll-down)

--- a/lisp/progmodes/cperl-mode.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/cperl-mode.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; cperl-mode.el --- Perl code editing commands for Emacs
 
-;; Copyright (C) 1985,86,87,91,92,93,94,95,96,97,98,99,2000,03,2004,2005
+;; Copyright (C) 1985, 1986, 1987, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
+;; 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 ;;     Free Software Foundation, Inc.
 
 ;; Author: Ilya Zakharevich and Bob Olson

--- a/lisp/progmodes/cpp.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/cpp.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; cpp.el --- highlight or hide text according to cpp conditionals
 
-;; Copyright (C) 1994, 1995, 2003 Free Software Foundation
+;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, 2005
+;; Free Software Foundation
 
 ;; Author: Per Abrahamsen <[e-mail]>
 ;; Keywords: c, faces, tools

--- a/lisp/progmodes/cwarn.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/cwarn.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; cwarn.el --- highlight suspicious C and C++ constructions
 
-;; Copyright (C) 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+;; Free Software Foundation, Inc.
 
 ;; Author: Anders Lindgren <[e-mail]>
 ;; Keywords: c, languages, faces

--- a/lisp/progmodes/dcl-mode.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/dcl-mode.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; dcl-mode.el --- major mode for editing DCL command files
 
-;; Copyright (c) 1997 Free Software Foundation, Inc.
+;; Copyright (c) 1997, 2001, 2002, 2003, 2004, 2005
+;; Free Software Foundation, Inc.
 
 ;; Author: Odd Gripenstam <[e-mail]>
 ;; Maintainer: Odd Gripenstam <[e-mail]>

--- a/lisp/progmodes/delphi.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/delphi.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; delphi.el --- major mode for editing Delphi source (Object Pascal) in Emacs
 
-;; Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004, 2005
+;; Free Software Foundation, Inc.
 
 ;; Author: Ray Blaak <[e-mail]>
 ;; Keywords: languages

--- a/lisp/progmodes/ebnf-abn.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/ebnf-abn.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; ebnf-abn.el --- parser for ABNF (Augmented BNF)
 
-;; Copyright (C) 2004, 2005 Free Sofware Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Sofware Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <[e-mail]>
 ;; Maintainer: Vinicius Jose Latorre <[e-mail]>

--- a/lisp/progmodes/ebnf-dtd.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/ebnf-dtd.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; ebnf-dtd.el --- parser for DTD (Data Type Description for XML)
 
-;; Copyright (C) 2004, 2005 Free Sofware Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Sofware Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <[e-mail]>
 ;; Maintainer: Vinicius Jose Latorre <[e-mail]>

--- a/lisp/progmodes/ebnf-ebx.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/ebnf-ebx.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; ebnf-ebx.el --- parser for EBNF used to specify XML (EBNFX)
 
-;; Copyright (C) 2004, 2005 Free Sofware Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Sofware Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <[e-mail]>
 ;; Maintainer: Vinicius Jose Latorre <[e-mail]>

--- a/lisp/progmodes/ebnf-otz.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/ebnf-otz.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; ebnf-otz.el --- syntactic chart OpTimiZer
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
 ;; Free Sofware Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <[e-mail]>

--- a/lisp/progmodes/ebrowse.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/ebrowse.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,7 +1,8 @@
 ;;; ebrowse.el --- Emacs C++ class browser & tags facility
 
-;; Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000, 2001, 2002, 2005
-;;  Free Software Foundation Inc.
+;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+;; 2002, 2003, 2004, 2005
+;; Free Software Foundation Inc.
 
 ;; Author: Gerd Moellmann <[e-mail]>
 ;; Maintainer: FSF

--- a/lisp/progmodes/etags.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/etags.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; etags.el --- etags facility for Emacs
 
-;; Copyright (C) 1985, 86, 88, 89, 92, 93, 94, 95, 96, 98, 2000, 2001
+;; Copyright (C) 1985, 1986, 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1998,
+;;               2000, 2001, 2002, 2003, 2004, 2005
 ;;	Free Software Foundation, Inc.
 
 ;; Author: Roland McGrath <[e-mail]>

--- a/lisp/progmodes/executable.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/executable.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; executable.el --- base functionality for executable interpreter scripts -*- byte-compile-dynamic: t -*-
 
-;; Copyright (C) 1994, 1995, 1996, 2000, 2003, 2004 by Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 1996, 2000, 2001, 2002, 2003, 2004, 2005
+;; Free Software Foundation, Inc.
 
 ;; Author: Daniel Pfeiffer <[e-mail]>
 ;; Keywords: languages, unix

--- a/lisp/progmodes/f90.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/f90.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; f90.el --- Fortran-90 mode (free format)
 
-;; Copyright (C) 1995, 1996, 1997, 2000, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005
+;; Free Software Foundation, Inc.
 
 ;; Author: Torbj\"orn Einarsson <[e-mail]>
 ;; Maintainer: Glenn Morris <[e-mail]>

--- a/lisp/progmodes/flymake.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/flymake.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; flymake.el -- a universal on-the-fly syntax checker
 
-;; Copyright (C) 2003, 2005  Free Software Foundation
+;; Copyright (C) 2003, 2004, 2005  Free Software Foundation
 
 ;; Author:  Pavel Kobiakov <[e-mail]>
 ;; Maintainer: Pavel Kobiakov <[e-mail]>

--- a/lisp/progmodes/fortran.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/fortran.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,7 +1,7 @@
 ;;; fortran.el --- Fortran mode for GNU Emacs
 
 ;; Copyright (C) 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001,
-;;               2003, 2004, 2005  Free Software Foundation, Inc.
+;;               2002, 2003, 2004, 2005  Free Software Foundation, Inc.
 
 ;; Author: Michael D. Prange <[e-mail]>
 ;; Maintainer: Glenn Morris <[e-mail]>

--- a/lisp/progmodes/gdb-ui.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/gdb-ui.el	Fri Aug 05 10:57:36 2005 +0000
@@ -56,7 +56,7 @@
 ;; explicitly in your program if you want timely display of I/O in Emacs.
 ;; Alternatively you can make the output stream unbuffered, for example, by
 ;; using a macro:
-;; 
+;;
 ;;           #ifdef UNBUFFERED
 ;;	     setvbuf(stdout,(char *)NULL, _IONBF,0);
 ;;	     #endif
@@ -79,7 +79,7 @@
 
 (require 'gud)
 
-(defvar gdb-frame-address "main" "Initialisation for Assembler buffer.")
+(defvar gdb-frame-address "main" "Initialization for Assembler buffer.")
 (defvar gdb-previous-frame-address nil)
 (defvar gdb-memory-address "main")
 (defvar gdb-previous-frame nil)
@@ -87,7 +87,7 @@
 (defvar gdb-frame-number nil)
 (defvar gdb-current-language nil)
 (defvar gdb-var-list nil "List of variables in watch window.")
-(defvar gdb-var-changed nil "Non-nil means that gdb-var-list has changed.")
+(defvar gdb-var-changed nil "Non-nil means that `gdb-var-list' has changed.")
 (defvar gdb-main-file nil "Source file from which program execution begins.")
 (defvar gdb-buffer-type nil)
 (defvar gdb-overlay-arrow-position nil)
@@ -118,7 +118,7 @@
     `user' -- gdb output should be copied to the GUD buffer
               for the user to see.
 
-    `inferior' -- gdb output should be copied to the inferior-io buffer
+    `inferior' -- gdb output should be copied to the inferior-io buffer.
 
     `pre-emacs' -- output should be ignored util the post-prompt
                    annotation is received.  Then the output-sink
@@ -130,7 +130,7 @@
     `post-emacs' -- ignore output until the prompt annotation is
 		    received, then go to USER disposition.
 
-gdba (gdb-ui.el) uses all five values,  gdbmi (gdb-mi.el) only two
+gdba (gdb-ui.el) uses all five values, gdbmi (gdb-mi.el) only two
 \(`user' and `emacs').")
 
 (defvar gdb-current-item nil
@@ -149,7 +149,7 @@
 and source-file directory for your debugger.
 
 If `gdb-many-windows' is nil (the default value) then gdb just
-pops up the GUD buffer unless `gdb-show-main' is t. In this case
+pops up the GUD buffer unless `gdb-show-main' is t.  In this case
 it starts with two windows: one displaying the GUD buffer and the
 other with the source file with the main routine of the inferior.
 
@@ -201,6 +201,7 @@
 
 (defvar gdb-debug-log nil)
 
+;;;###autoload
 (defcustom gdb-enable-debug-log nil
   "Non-nil means record the process input and output in `gdb-debug-log'."
   :type 'boolean
@@ -216,7 +217,7 @@
 (defcustom gdb-cpp-define-alist-program "gcc -E -dM -"
   "Shell command for generating a list of defined macros in a source file.
 This list is used to display the #define directive associated
-with an identifier as a tooltip. It works in a debug session with
+with an identifier as a tooltip.  It works in a debug session with
 GDB, when gud-tooltip-mode is t.
 
 Set `gdb-cpp-define-alist-flags' for any include paths or
@@ -279,7 +280,7 @@
 		  'gdb-tooltip-print))))))
 
 (defun gdb-set-gud-minor-mode (buffer)
-  "Set gud-minor-mode from find-file if appropriate."
+  "Set `gud-minor-mode' from find-file if appropriate."
   (goto-char (point-min))
   (unless (search-forward "No source file named " nil t)
     (condition-case nil
@@ -972,7 +973,7 @@
 (defun gdb-exited (ignored)
   "An annotation handler for `exited' and `signalled'.
 They say that I/O for the subprocess is now GDB, not the program
-being debugged and that the program is no longer running. This
+being debugged and that the program is no longer running.  This
 function is used to change the focus of GUD tooltips to #define
 directives."
   (setq gdb-active-process nil)
@@ -2225,7 +2226,7 @@
   (set-window-dedicated-p (selected-window) t))
 
 (defun gdb-setup-windows ()
-  "Layout the window pattern for gdb-many-windows."
+  "Layout the window pattern for `gdb-many-windows'."
   (gdb-display-locals-buffer)
   (gdb-display-stack-buffer)
   (delete-other-windows)
@@ -2379,7 +2380,7 @@
 (defun gdb-put-string (putstring pos &optional dprop)
   "Put string PUTSTRING in front of POS in the current buffer.
 PUTSTRING is displayed by putting an overlay into the current buffer with a
-`before-string' STRING that has a `display' property whose value is
+`before-string' string that has a `display' property whose value is
 PUTSTRING."
   (let ((string (make-string 1 ?x))
 	(buffer (current-buffer)))
@@ -2484,7 +2485,7 @@
 
 (def-gdb-auto-updated-buffer gdb-assembler-buffer
   gdb-invalidate-assembler
-  (concat gdb-server-prefix "disassemble " 
+  (concat gdb-server-prefix "disassemble "
 	  (if (member gdb-frame-address '(nil "main")) nil "0x")
 	  gdb-frame-address "\n")
   gdb-assembler-handler

--- a/lisp/progmodes/grep.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/grep.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,7 +1,7 @@
 ;;; grep.el --- run Grep as inferior of Emacs, parse match messages
 
 ;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2001, 2002, 2004, 2005  Free Software Foundation, Inc.
+;;   2001, 2002, 2003, 2004, 2005  Free Software Foundation, Inc.
 
 ;; Author: Roland McGrath <[e-mail]>
 ;; Maintainer: FSF
@@ -187,17 +187,13 @@
     (define-key map "\^?" 'scroll-down)
     (define-key map "\C-c\C-f" 'next-error-follow-minor-mode)
 
-    ;; This is intolerable -- rms
-;;;    (define-key map [remap next-line] 'compilation-next-error)
-;;;    (define-key map [remap previous-line] 'compilation-previous-error)
-
     (define-key map "\r" 'compile-goto-error)  ;; ?
     (define-key map "n" 'next-error-no-select)
     (define-key map "p" 'previous-error-no-select)
     (define-key map "{" 'compilation-previous-file)
     (define-key map "}" 'compilation-next-file)
-    (define-key map [backtab] 'compilation-previous-file)
-    (define-key map "\t" 'compilation-next-file)
+    (define-key map "\t" 'compilation-next-error)
+    (define-key map [backtab] 'compilation-previous-error)
 
     ;; Set up the menu-bar
     (define-key map [menu-bar grep]
@@ -248,13 +244,12 @@
 
 ;;;###autoload
 (defvar grep-regexp-alist
-  ;; rms: I removed the code to match parens around the line number
-  ;; because it causes confusion and so we will find out if anyone needs it.
-  ;; It causes confusion with a file name that contains a number in parens.
-  '(("^\\(.+?\\)\\([: \t]\\)+\
-\\([0-9]+\\)\\([.:]?\\)\\([0-9]+\\)?\
-\\(?:-\\(?:\\([0-9]+\\)\\4\\)?\\.?\\([0-9]+\\)?\\)?\\2"
-     1 (3 . 6) (5 . 7))
+  '(("^\\([^:\n]+\\)\\(:[ \t]*\\)\\([0-9]+\\)\\2"
+     1 3)
+    ;; Rule to match column numbers is commented out since no known grep
+    ;; produces them
+    ;; ("^\\([^:\n]+\\)\\(:[ \t]*\\)\\([0-9]+\\)\\2\\(?:\\([0-9]+\\)\\(?:-\\([0-9]+\\)\\)?\\2\\)?"
+    ;;  1 3 (4 . 5))
     ("^\\(\\(.+?\\):\\([0-9]+\\):\\).*?\
 \\(\033\\[01;31m\\(?:\033\\[K\\)?\\)\\(.*?\\)\\(\033\\[[0-9]*m\\)"
      2 3
@@ -284,6 +279,9 @@
 (defvar grep-match-face	'match
   "Face name to use for grep matches.")
 
+(defvar grep-context-face 'shadow
+  "Face name to use for grep context lines.")
+
 (defvar grep-mode-font-lock-keywords
    '(;; Command output lines.
      ("^\\([A-Za-z_0-9/\.+-]+\\)[ \t]*:" 1 font-lock-function-name-face)
@@ -298,6 +296,7 @@
       (0 '(face nil message nil help-echo nil mouse-face nil) t)
       (1 grep-error-face)
       (2 grep-error-face))
+     ("^[^\n-]+-[0-9]+-.*" (0 grep-context-face))
      ;; Highlight grep matches and delete markers
      ("\\(\033\\[01;31m\\)\\(.*?\\)\\(\033\\[[0-9]*m\\)"
       ;; Refontification does not work after the markers have been

--- a/lisp/progmodes/gud.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/gud.el	Fri Aug 05 10:57:36 2005 +0000
@@ -4,7 +4,8 @@
 ;; Maintainer: FSF
 ;; Keywords: unix, tools
 
-;; Copyright (C) 1992,93,94,95,96,1998,2000,02,03,04,05 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 2000, 2001, 2002, 2003,
+;; 2004, 2005 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -3209,6 +3210,7 @@
 (define-obsolete-function-alias 'tooltip-gud-toggle-dereference
                                 'toggle-gud-tooltip-dereference "22.1")
 
+;;;###autoload
 (define-minor-mode gud-tooltip-mode
   "Toggle the display of GUD tooltips."
   :global t
@@ -3225,7 +3227,11 @@
     (remove-hook 'tooltip-hook 'gud-tooltip-tips)
     (define-key global-map [mouse-movement] 'ignore)))
   (gud-tooltip-activate-mouse-motions-if-enabled)
-  (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
+  (if (and
+       gud-comint-buffer
+       (buffer-name gud-comint-buffer); gud-comint-buffer might be kille
+       (with-current-buffer gud-comint-buffer
+	(memq gud-minor-mode '(gdbmi gdba))))
       (if gud-tooltip-mode
 	  (progn
 	    (dolist (buffer (buffer-list))

--- a/lisp/progmodes/hideif.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/hideif.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; hideif.el --- hides selected code within ifdef
 
-;; Copyright (C) 1988, 1994, 2001, 2002, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1988, 1994, 2001, 2002, 2003, 2004 2005
+;; Free Software Foundation, Inc.
 
 ;; Author: Daniel LaLiberte <[e-mail]>
 ;; Maintainer: FSF

--- a/lisp/progmodes/hideshow.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/hideshow.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; hideshow.el --- minor mode cmds to selectively display code/comment blocks
 
-;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01 Free Software Foundation
+;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+;;               2004, 2005  Free Software Foundation
 
 ;; Author: Thien-Thi Nguyen <[e-mail]>
 ;;      Dan Nicolaescu <[e-mail]>

--- a/lisp/progmodes/icon.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/icon.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; icon.el --- mode for editing Icon code
 
-;; Copyright (C) 1989 Free Software Foundation, Inc.
+;; Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005
+;; Free Software Foundation, Inc.
 
 ;; Author: Chris Smith <[e-mail]>
 ;; Created: 15 Feb 89

--- a/lisp/progmodes/idlw-complete-structtag.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/idlw-complete-structtag.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,5 +1,5 @@
 ;;; idlw-complete-structtag.el --- Completion of structure tags.
-;; Copyright (c) 2001,2002 Free Software Foundation
+;; Copyright (c) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 
 ;; Author: Carsten Dominik <[e-mail]>
 ;; Maintainer: J.D. Smith <[e-mail]>

--- a/lisp/progmodes/idlw-help.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/idlw-help.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,7 +1,7 @@
 ;;; idlw-help.el --- HTML Help code for IDLWAVE
 ;; Copyright (c) 2000 Carsten Dominik
 ;; Copyright (c) 2001, 2002 J.D. Smith
-;; Copyright (c) 2003,2004,2005 Free Software Foundation
+;; Copyright (c) 2003, 2004, 2005, Free Software Foundation
 ;;
 ;; Authors: J.D. Smith <[e-mail]>
 ;;          Carsten Dominik <[e-mail]>

--- a/lisp/progmodes/idlw-rinfo.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/idlw-rinfo.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; idlw-rinfo.el --- Routine Information for IDLWAVE
 ;; Copyright (c) 1999 Carsten Dominik
-;; Copyright (c) 1999, 2000, 2001,2002,2003,2004,2005 Free Software Foundation
+;; Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+;; Free Software Foundation
 
 ;; Author: J.D. Smith <[e-mail]>
 ;; Version: 5.7_22

--- a/lisp/progmodes/idlw-shell.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/idlw-shell.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,5 +1,6 @@
 ;; idlw-shell.el --- run IDL as an inferior process of Emacs.
-;; Copyright (c) 1999,2000,2001,2002,2003,2004,2005 Free Software Foundation
+;; Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+;; Free Software Foundation
 
 ;; Authors: J.D. Smith <[e-mail]>
 ;;          Carsten Dominik <[e-mail]>

--- a/lisp/progmodes/idlw-toolbar.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/idlw-toolbar.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,5 +1,6 @@
 ;;; idlw-toolbar.el --- a debugging toolbar for IDLWAVE
-;; Copyright (c) 1999, 2000, 2001,2002,2004 Free Software Foundation
+;; Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+;; Free Software Foundation
 
 ;; Author: Carsten Dominik <[e-mail]>
 ;; Maintainer: J.D. Smith <[e-mail]>

--- a/lisp/progmodes/inf-lisp.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/inf-lisp.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; inf-lisp.el --- an inferior-lisp mode
 
-;; Copyright (C) 1988, 1993, 1994 Free Software Foundation, Inc.
+;; Copyright (C) 1988, 1993, 1994, 2001, 2002, 2003, 2004, 2005
+;; Free Software Foundation, Inc.
 
 ;; Author: Olin Shivers <[e-mail]>
 ;; Keywords: processes, lisp

--- a/lisp/progmodes/ld-script.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/ld-script.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; ld-script.el --- GNU linker script editing mode for Emacs
 
-;; Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Masatake YAMATO<[e-mail]>
 ;; Keywords: languages, faces

--- a/lisp/progmodes/m4-mode.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/m4-mode.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; m4-mode.el --- m4 code editing commands for Emacs
 
-;;; Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, 2005
+;; Free Software Foundation, Inc.
 
 ;; Author: Andrew Csillag <[e-mail]>
 ;; Maintainer: Andrew Csillag <[e-mail]>

--- a/lisp/progmodes/make-mode.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/make-mode.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; make-mode.el --- makefile editing commands for Emacs
 
-;; Copyright (C) 1992,94,99,2000,2001, 2002, 2003  Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1994, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+;; Free Software Foundation, Inc.
 
 ;; Author: Thomas Neumann <[e-mail]>
 ;;	Eric S. Raymond <[e-mail]>

--- a/lisp/progmodes/mantemp.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/mantemp.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; mantemp.el --- create manual template instantiations from g++ 2.7.2 output
 
-;; Copyright (C) 1996 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005
+;; Free Software Foundation, Inc.
 
 ;; Author: Tom Houlder <[e-mail]>
 ;; Created: 10 Dec 1996

--- a/lisp/progmodes/meta-mode.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/meta-mode.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; meta-mode.el --- major mode for editing Metafont or MetaPost sources
 
-;; Copyright (C) 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005
+;; Free Software Foundation, Inc.
 
 ;; Author: Ulrik Vieth <[e-mail]>
 ;; Version: 1.0

--- a/lisp/progmodes/mixal-mode.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/mixal-mode.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; mixal-mode.el --- Major mode for the mix asm language.
 
-;; Copyright (C) 2003 Free Software Foundation
+;; Copyright (C) 2003, 2004, 2005 Free Software Foundation
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as

--- a/lisp/progmodes/octave-hlp.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/octave-hlp.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; octave-hlp.el --- getting help on Octave symbols using info
 
-;; Copyright (C) 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005
+;; Free Software Foundation, Inc.
 
 ;; Author: Kurt Hornik <[e-mail]>
 ;; Author: John Eaton <[e-mail]>

--- a/lisp/progmodes/octave-inf.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/octave-inf.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; octave-inf.el --- running Octave as an inferior Emacs process
 
-;; Copyright (C) 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005
+;; Free Software Foundation, Inc.
 
 ;; Author: Kurt Hornik <[e-mail]>
 ;; Author: John Eaton <[e-mail]>

--- a/lisp/progmodes/octave-mod.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/octave-mod.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; octave-mod.el --- editing Octave source files under Emacs
 
-;; Copyright (C) 1997, 2003 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005
+;; Free Software Foundation, Inc.
 
 ;; Author: Kurt Hornik <[e-mail]>
 ;; Author: John Eaton <[e-mail]>

--- a/lisp/progmodes/pascal.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/pascal.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; pascal.el --- major mode for editing pascal source in Emacs
 
-;; Copyright (C) 1993, 94, 95, 96, 97, 98, 1999, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+;;               2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Espen Skoglund <[e-mail]>
 ;; Keywords: languages

--- a/lisp/progmodes/perl-mode.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/perl-mode.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; perl-mode.el --- Perl code editing commands for GNU Emacs
 
-;; Copyright (C) 1990, 1994, 2003, 2005  Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1994, 2001, 2002, 2003, 2004, 2005
+;; Free Software Foundation, Inc.
 
 ;; Author: William F. Mann
 ;; Maintainer: FSF

--- a/lisp/progmodes/prolog.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/prolog.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; prolog.el --- major mode for editing and running Prolog under Emacs
 
-;; Copyright (C) 1986, 1987, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1986, 1987, 2001, 2002, 2003, 2004, 2005
+;; Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <[e-mail]>
 ;; Keywords: languages

--- a/lisp/progmodes/ps-mode.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/ps-mode.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; ps-mode.el --- PostScript mode for GNU Emacs
 
-;; Copyright (C) 1999, 2001, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005
+;; Free Software Foundation, Inc.
 
 ;; Author:     Peter Kleiweg <[e-mail]>
 ;; Maintainer: Peter Kleiweg <[e-mail]>

--- a/lisp/progmodes/scheme.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/scheme.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; scheme.el --- Scheme (and DSSSL) editing mode
 
-;; Copyright (C) 1986, 1987, 1988, 1997, 1998, 2005
+;; Copyright (C) 1986, 1987, 1988, 1997, 1998, 2001, 2002, 2003, 2004, 2005
 ;;           Free Software Foundation, Inc.
 
 ;; Author: Bill Rozas <[e-mail]>

--- a/lisp/progmodes/simula.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/simula.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; simula.el --- SIMULA 87 code editing commands for Emacs
 
-;; Copyright (C) 1992, 1994, 1996 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1994, 1996 2001, 2002, 2003, 2004, 2005
+;; Free Software Foundation, Inc.
 
 ;; Author: Hans Henrik Eriksen <[e-mail]>
 ;; Maintainer: [e-mail]

--- a/lisp/progmodes/sql.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/sql.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; sql.el --- specialized comint.el for SQL interpreters
 
-;; Copyright (C) 1998,99,2000,01,02,03,04  Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+;; Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <[e-mail]>
 ;; Maintainer: Michael Mauger <[e-mail]>

--- a/lisp/progmodes/vhdl-mode.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/vhdl-mode.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; vhdl-mode.el --- major mode for editing VHDL code
 
-;; Copyright (C) 1992-2003, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1992-2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Authors:     Reto Zimmermann <[e-mail]>
 ;;              Rodney J. Whitby <[e-mail]>

--- a/lisp/progmodes/which-func.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/which-func.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; which-func.el --- print current function in mode line
 
-;; Copyright (C) 1994, 1997, 1998, 2001, 2003, 2005
+;; Copyright (C) 1994, 1997, 1998, 2001, 2002, 2003, 2004, 2005
 ;;           Free Software Foundation, Inc.
 
 ;; Author:   Alex Rezinsky <[e-mail]>

--- a/lisp/progmodes/xscheme.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/progmodes/xscheme.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; xscheme.el --- run MIT Scheme under Emacs
 
-;; Copyright (C) 1986, 1987, 1989, 1990, 2001, 2004, 2005
+;; Copyright (C) 1986, 1987, 1989, 1990, 2001, 2002, 2003, 2004, 2005
 ;;  Free Software Foundation, Inc.
 
 ;; Maintainer: FSF

--- a/lisp/simple.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/simple.el	Fri Aug 05 10:57:36 2005 +0000
@@ -313,7 +313,7 @@
   (if (not next-error-follow-minor-mode)
       (remove-hook 'post-command-hook 'next-error-follow-mode-post-command-hook t)
     (add-hook 'post-command-hook 'next-error-follow-mode-post-command-hook nil t)
-    (make-variable-buffer-local 'next-error-follow-last-line)))
+    (make-local-variable 'next-error-follow-last-line)))
 
 ;;; Used as a `post-command-hook' by `next-error-follow-mode'
 ;;; for the *Compilation* *grep* and *Occur* buffers.

--- a/lisp/term/AT386.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/term/AT386.el	Fri Aug 05 10:57:36 2005 +0000
@@ -3,7 +3,7 @@
 ;; Author: Eric S. Raymond <[e-mail]>
 ;; Keywords: terminals
 
-;; Copyright (C) 1992 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 

--- a/lisp/term/bg-mouse.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/term/bg-mouse.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; bg-mouse.el --- GNU Emacs code for BBN Bitgraph mouse
 
-;; Copyright (C) 2001 Free Software Foundation, Inc. Oct 1985.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: John Robinson <[e-mail]>
 ;;	Stephen Gildea <[e-mail]>

--- a/lisp/term/internal.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/term/internal.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; internal.el --- support for PC internal terminal -*- coding: raw-text; no-byte-compile: t -*-
 
-;; Copyright (C) 1993, 1994, 1998, 1999, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 1998, 1999, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Morten Welinder <[e-mail]>
 

--- a/lisp/term/iris-ansi.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/term/iris-ansi.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; iris-ansi.el --- configure Emacs for SGI xwsh and winterm apps -*- no-byte-compile: t -*-
 
-;; Copyright (C) 1997, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Dan Nicolaescu <[e-mail]>
 
@@ -58,28 +58,28 @@
   (define-key function-key-map "\e[006q" [f6])
   (define-key function-key-map "\e[018q" [S-f6])
   (define-key function-key-map "\e[030q" [C-f6])
-  
+
 
   (define-key function-key-map "\e[007q" [f7])
   (define-key function-key-map "\e[019q" [S-f7])
   (define-key function-key-map "\e[031q" [C-f7])
-  
-  
+
+
   (define-key function-key-map "\e[008q" [f8])
   (define-key function-key-map "\e[020q" [S-f8])
   (define-key function-key-map "\e[032q" [C-f8])
-  
+
 
   (define-key function-key-map "\e[009q" [f9])
   (define-key function-key-map "\e[021q" [S-f9])
   (define-key function-key-map "\e[033q" [C-f9])
-  
-  
+
+
   (define-key function-key-map "\e[010q" [f10])
   (define-key function-key-map "\e[022q" [S-f10])
   (define-key function-key-map "\e[034q" [C-f10])
-  
-  
+
+
   (define-key function-key-map "\e[011q" [f11])
   (define-key function-key-map "\e[023q" [S-f11])
   (define-key function-key-map "\e[035q" [C-f11])
@@ -89,102 +89,102 @@
   (define-key function-key-map "\e[024q" [S-f12])
   (define-key function-key-map "\e[036q" [C-f12])
   (define-key function-key-map "\e[048q" [M-f12])
-  
-  
+
+
   (define-key function-key-map "\e[057q" [?\C-`])
   (define-key function-key-map "\e[115q" [?\M-`])
-  
+
   (define-key function-key-map "\e[049q" [?\C-1])
   (define-key function-key-map "\e[058q" [?\M-1])
-  
-  
+
+
   (define-key function-key-map "\e[059q" [?\M-2])
-  
+
   (define-key function-key-map "\e[050q" [?\C-3])
   (define-key function-key-map "\e[060q" [?\M-3])
-  
+
   (define-key function-key-map "\e[051q" [?\C-4])
   (define-key function-key-map "\e[061q" [?\M-4])
-  
+
   (define-key function-key-map "\e[052q" [?\C-5])
   (define-key function-key-map "\e[062q" [?\M-5])
-  
+
 
   (define-key function-key-map "\e[063q" [?\M-6])
-  
+
   (define-key function-key-map "\e[053q" [?\C-7])
   (define-key function-key-map "\e[064q" [?\M-7])
-  
+
   (define-key function-key-map "\e[054q" [?\C-8])
   (define-key function-key-map "\e[065q" [?\M-8])
-  
+
   (define-key function-key-map "\e[055q" [?\C-9])
   (define-key function-key-map "\e[066q" [?\M-9])
-  
+
   (define-key function-key-map "\e[056q" [?\C-0])
   (define-key function-key-map "\e[067q" [?\M-0])
-  
+
   (define-key function-key-map "\e[068q" [?\M--])
-  
+
   (define-key function-key-map "\e[069q" [?\C-=])
   (define-key function-key-map "\e[070q" [?\M-=])
-  
+
   ;; I don't know what to do with those.
   ;;(define-key function-key-map "^H" [<del>])
   ;;(define-key function-key-map "^H" [S-<del>])
   ;;(define-key function-key-map "\177" [C-<del>])
   ;;(define-key function-key-map "\e[071q" [M-<del>])
-  
+
   (define-key function-key-map "\e[Z" [?\S-\t])
   (define-key function-key-map "\e[072q" [?\C-\t])
   ;; This only works if you remove the M-TAB keybing from the system.4Dwmrc
   ;; our your ~/.4Dwmrc, if you use the 4Dwm window manager.
   (define-key function-key-map "\e[073q" [?\M-\t])
-  
+
   (define-key function-key-map "\e[074q" [?\M-q])
 
   (define-key function-key-map "\e[075q" [?\M-w])
-  
+
   (define-key function-key-map "\e[076q" [?\M-e])
 
   (define-key function-key-map "\e[077q" [?\M-r])
-  
+
   (define-key function-key-map "\e[078q" [?\M-t])
-  
+
   (define-key function-key-map "\e[079q" [?\M-y])
-  
+
   (define-key function-key-map "\e[080q" [?\M-u])
-  
+
   (define-key function-key-map "\e[081q" [?\M-i])
 
   (define-key function-key-map "\e[082q" [?\M-o])
-  
+
   (define-key function-key-map "\e[083q" [?\M-p])
-  
+
   (define-key function-key-map "\e[084q" [?\M-\[])
-  
+
   (define-key function-key-map "\e[085q" [?\M-\]])
-  
+
   (define-key function-key-map "\e[086q" [?\M-\\])
-  
+
   (define-key function-key-map "\e[087q" [?\M-a])
-  
+
   (define-key function-key-map "\e[088q" [?\M-s])
-  
+
   (define-key function-key-map "\e[089q" [?\M-d])
-  
+
   (define-key function-key-map "\e[090q" [?\M-f])
-  
+
   (define-key function-key-map "\e[091q" [?\M-g])
-  
+
   (define-key function-key-map "\e[092q" [?\M-h])
-  
+
   (define-key function-key-map "\e[093q" [?\M-j])
-  
+
   (define-key function-key-map "\e[094q" [?\M-k])
-  
+
   (define-key function-key-map "\e[095q" [?\M-l])
-  
+
   (define-key function-key-map "\e[096q" [?\C-\;])
   (define-key function-key-map "\e[097q" [?\M-:]) ;; we are cheating
 						  ;; here, this is
@@ -195,41 +195,41 @@
 
   (define-key function-key-map "\e[098q" [?\C-'])
   (define-key function-key-map "\e[099q" [?\M-'])
-  
+
   (define-key function-key-map "\e[100q" [?\M-\n])
-  
+
   (define-key function-key-map "\e[101q" [?\M-z])
-  
+
   (define-key function-key-map "\e[102q" [?\M-x])
-  
+
   (define-key function-key-map "\e[103q" [?\M-c])
-  
+
   (define-key function-key-map "\e[104q" [?\M-v])
-  
+
   (define-key function-key-map "\e[105q" [?\M-b])
-  
+
   (define-key function-key-map "\e[106q" [M-n])
-  
+
   (define-key function-key-map "\e[107q" [M-m])
-  
+
   (define-key function-key-map "\e[108q" [?\C-,])
   (define-key function-key-map "\e[109q" [?\M-,])
-  
+
   (define-key function-key-map "\e[110q" [?\C-.])
   (define-key function-key-map "\e[111q" [?\M-.])
-  
+
   (define-key function-key-map "\e[112q" [?\C-/])
   (define-key function-key-map "\e[113q" [?\M-/])
-  
+
   (define-key function-key-map "\e[139q" [insert])
   (define-key function-key-map "\e[139q" [S-insert])
   (define-key function-key-map "\e[140q" [C-insert])
   (define-key function-key-map "\e[141q" [M-insert])
-  
+
   (define-key function-key-map "\e[H" [home])
   (define-key function-key-map "\e[143q" [S-home])
   (define-key function-key-map "\e[144q" [C-home])
-  
+
 
   (define-key function-key-map "\e[150q" [prior])
   (define-key function-key-map "\e[151q" [S-prior]) ;; those don't
@@ -238,90 +238,90 @@
 						    ;; anything
   (define-key function-key-map "\e[152q" [C-prior])
 
-  
-  ;; (define-key function-key-map "^?" [delete]) 
+
+  ;; (define-key function-key-map "^?" [delete])
   (define-key function-key-map "\e[P" [S-delete])
   (define-key function-key-map "\e[142q" [C-delete])
   (define-key function-key-map "\e[M" [M-delete])
-  
+
   (define-key function-key-map "\e[146q" [end])
   (define-key function-key-map "\e[147q" [S-end]) ;; those don't seem
 						  ;; to generate
 						  ;; anything
   (define-key function-key-map "\e[148q" [C-end])
-  
+
   (define-key function-key-map "\e[154q" [next])
   (define-key function-key-map "\e[155q" [S-next])
   (define-key function-key-map "\e[156q" [C-next])
-  
+
 
   (define-key function-key-map "\e[161q" [S-up])
   (define-key function-key-map "\e[162q" [C-up])
   (define-key function-key-map "\e[163q" [M-up])
-  
+
   (define-key function-key-map "\e[158q" [S-left])
   (define-key function-key-map "\e[159q" [C-left])
   (define-key function-key-map "\e[160q" [M-left])
-  
+
   (define-key function-key-map "\e[164q" [S-down])
   (define-key function-key-map "\e[165q" [C-down])
   (define-key function-key-map "\e[166q" [M-down])
-  
+
   (define-key function-key-map "\e[167q" [S-right])
   (define-key function-key-map "\e[168q" [C-right])
   (define-key function-key-map "\e[169q" [M-right])
-  
+
   ;; Keypad functions, most of those are untested.
   (define-key function-key-map "\e[179q" [?\C-/])
   (define-key function-key-map "\e[180q" [?\M-/])
-  
+
   (define-key function-key-map "\e[187q" [?\C-*])
   (define-key function-key-map "\e[188q" [?\M-*])
-  
+
   (define-key function-key-map "\e[198q" [?\C--])
   (define-key function-key-map "\e[199q" [?\M--])
-  
+
   ;; Something else takes care of home, up, prior, down, left, right, next
   ;;(define-key function-key-map "\e[H" [home])
   (define-key function-key-map "\e[172q" [C-home])
-  
+
   ;;(define-key function-key-map "\e[A" [up])
   (define-key function-key-map "\e[182q" [C-up])
-  
-  
+
+
   ;;(define-key function-key-map "\e[150q" [prior])
   (define-key function-key-map "\e[190q" [C-prior])
-  
-  
+
+
   (define-key function-key-map "\e[200q" [?\C-+])
   (define-key function-key-map "\e[201q" [?\M-+])
-  
+
   ;;(define-key function-key-map "\e[D" [left])
   (define-key function-key-map "\e[174q" [C-left])
 
-  
+
   (define-key function-key-map "\e[000q" [begin])
   (define-key function-key-map "\e[184q" [C-begin])
 
-  
+
   ;;(define-key function-key-map "\e[C" [right])
   (define-key function-key-map "\e[192q" [C-right])
-  
+
   ;;(define-key function-key-map "\e[146q" [end])
   (define-key function-key-map "\e[176q" [C-end])
-  
+
   ;;(define-key function-key-map "\e[B" [down])
   (define-key function-key-map "\e[186q" [C-down])
-  
+
   ;;(define-key function-key-map "\e[154q" [next])
   (define-key function-key-map "\e[194q" [C-next])
-  
-  
+
+
   (define-key function-key-map "\e[100q" [M-enter])
-  
+
   (define-key function-key-map "\e[139q" [insert])
   (define-key function-key-map "\e[178q" [C-inset])
-  
+
   (define-key function-key-map "\e[P" [delete])
   (define-key function-key-map "\e[196q" [C-delete])
   (define-key function-key-map "\e[197q" [M-delete]))

--- a/lisp/term/mac-win.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/term/mac-win.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,7 +1,7 @@
 ;;; mac-win.el --- parse switches controlling interface with Mac window system -*-coding: utf-8
 
-;; Copyright (C) 1999, 2000, 2002, 2003, 2005
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Andrew Choi <[e-mail]>
 ;; Keywords: terminals

--- a/lisp/term/news.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/term/news.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; news.el --- keypad and function key bindings for the Sony NEWS keyboard -*- no-byte-compile: t -*-
 
-;; Copyright (C) 1989, 1993, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1989, 1993, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: FSF
 ;; Keywords: terminals
@@ -29,7 +30,7 @@
 ;;; Code:
 
 (defun terminal-init-news ()
-  "Terminal initialization function for news."  
+  "Terminal initialization function for news."
   (if (boundp 'news-fkey-prefix)
       nil
     ;; The terminal initialization should already have set up some keys

--- a/lisp/term/pc-win.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/term/pc-win.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; pc-win.el --- setup support for `PC windows' (whatever that is)
 
-;; Copyright (C) 1994, 1996, 1997, 1999, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1996, 1997, 1999, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Morten Welinder <[e-mail]>
 ;; Maintainer: FSF

--- a/lisp/term/rxvt.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/term/rxvt.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; rxvt.el --- define function key sequences and standard colors for rxvt
 
-;; Copyright (C) 2002, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Eli Zaretskii
 ;; Keywords: terminals
@@ -36,7 +36,7 @@
   ;; function-key-map. This substitution is needed because if a key
   ;; definition if found in function-key-map, there are no further
   ;; lookups in other keymaps.
-  (substitute-key-definition [f11] [S-f1] function-key-map) 
+  (substitute-key-definition [f11] [S-f1] function-key-map)
   (substitute-key-definition [f12] [S-f2] function-key-map)
   (substitute-key-definition [f13] [S-f3] function-key-map)
   (substitute-key-definition [f14] [S-f4] function-key-map)
@@ -47,7 +47,7 @@
   (substitute-key-definition [f19] [S-f9] function-key-map)
   (substitute-key-definition [f20] [S-f10] function-key-map)
 
-  (substitute-key-definition [f23] [C-f1] function-key-map) 
+  (substitute-key-definition [f23] [C-f1] function-key-map)
   (substitute-key-definition [f24] [C-f2] function-key-map)
   (substitute-key-definition [f25] [C-f3] function-key-map)
   (substitute-key-definition [f26] [C-f4] function-key-map)
@@ -58,7 +58,7 @@
   (substitute-key-definition [f31] [C-f9] function-key-map)
   (substitute-key-definition [f32] [C-f10] function-key-map)
 
-  (substitute-key-definition [f33] [C-S-f1] function-key-map) 
+  (substitute-key-definition [f33] [C-S-f1] function-key-map)
   (substitute-key-definition [f34] [C-S-f2] function-key-map)
   (substitute-key-definition [f35] [C-S-f3] function-key-map)
   (substitute-key-definition [f36] [C-S-f4] function-key-map)

--- a/lisp/term/sun-mouse.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/term/sun-mouse.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; sun-mouse.el --- mouse handling for Sun windows
 
-;; Copyright (C) 1987 Free Software Foundation, Inc.
+;; Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Jeff Peck
 ;; Maintainer: FSF

--- a/lisp/term/sun.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/term/sun.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; sun.el --- keybinding for standard default sunterm keys
 
-;; Copyright (C) 1987, 2001, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1987, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Jeff Peck <[e-mail]>
 ;; Keywords: terminals
@@ -253,7 +254,7 @@
       (while hooks
 	(eval (car hooks))
 	(setq hooks (cdr hooks)))))
-  
+
   (define-key ctl-x-map "\C-@" 'sun-mouse-once))
 
 (defun emacstool-init ()

--- a/lisp/term/sup-mouse.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/term/sup-mouse.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; sup-mouse.el --- supdup mouse support for lisp machines
 
-;; Copyright (C) Free Software Foundation 1985, 1986
+;; Copyright (C) 1985, 1986, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Wolfgang Rupprecht
 ;; Maintainer: FSF

--- a/lisp/term/tty-colors.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/term/tty-colors.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; tty-colors.el --- color support for character terminals
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Eli Zaretskii
 ;; Maintainer: FSF

--- a/lisp/term/tvi970.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/term/tvi970.el	Fri Aug 05 10:57:36 2005 +0000
@@ -3,7 +3,7 @@
 ;; Author: Jim Blandy <[e-mail]>, January 1992
 ;; Keywords: terminals
 
-;; Copyright (C) 1992, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 

--- a/lisp/term/vt100.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/term/vt100.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; vt100.el --- define VT100 function key sequences in function-key-map
 
-;; Copyright (C) 1989, 1993 Free Software Foundation, Inc.
+;; Copyright (C) 1989, 1993, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: FSF
 ;; Keywords: terminals
@@ -41,7 +42,7 @@
 (defun terminal-init-vt100 ()
   "Terminal initialization function for vt100."
   (load "term/lk201" nil t))
-  
+
 ;;; Controlling the screen width.
 (defvar vt100-wide-mode (= (frame-width) 132)
   "t if vt100 is in 132-column mode.")

--- a/lisp/term/w32-win.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/term/w32-win.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; w32-win.el --- parse switches controlling interface with W32 window system
 
-;; Copyright (C) 1993, 1994, 2003, 2005  Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Kevin Gallo
 ;; Keywords: terminals
@@ -108,8 +109,8 @@
 	   (y (cdr coords)))
       (if (and (> x 0) (> y 0))
 	  (set-frame-selected-window nil window))
-      (mapcar (lambda (file-name) 
-		(dnd-handle-one-url window 'private 
+      (mapcar (lambda (file-name)
+		(dnd-handle-one-url window 'private
 				    (concat "file:" file-name)))
 		(car (cdr (cdr event)))))
   (raise-frame)))

--- a/lisp/term/wyse50.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/term/wyse50.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; wyse50.el --- terminal support code for Wyse 50 -*- no-byte-compile: t -*-
 
-;; Copyright (C) 1989, 1993, 1994, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1989, 1993, 1994, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Daniel Pfeiffer <[e-mail]>,
 ;;	Jim Blandy <[e-mail]>

--- a/lisp/term/x-win.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/term/x-win.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; x-win.el --- parse relevant switches and set up for X  -*-coding: iso-2022-7bit;-*-
 
-;; Copyright (C) 1993, 1994, 2001, 2002, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: FSF
 ;; Keywords: terminals, i18n
@@ -2243,7 +2244,7 @@
     (if text
 	(remove-text-properties 0 (length text) '(foreign-selection nil) text))
     text))
-      
+
 ;;; Return the value of the current X selection.
 ;;; Consult the selection, and the cut buffer.  Treat empty strings
 ;;; as if they were unset.

--- a/lisp/term/xterm.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/term/xterm.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; xterm.el --- define function key sequences and standard colors for xterm
 
-;; Copyright (C) 1995, 2002, 2005  Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: FSF
 ;; Keywords: terminals
@@ -33,7 +33,7 @@
   ;; better in that case to use rxvt's initializion function.
   (if (and (getenv "COLORTERM")
 	   (string-match "\\`rxvt" (getenv "COLORTERM")))
-      (progn 
+      (progn
 	(load "term/rxvt")
 	(terminal-init-rxvt))
 
@@ -45,7 +45,7 @@
     ;; function-key-map. This substitution is needed because if a key
     ;; definition if found in function-key-map, there are no further
     ;; lookups in other keymaps.
-    (substitute-key-definition [f13] [S-f1] function-key-map) 
+    (substitute-key-definition [f13] [S-f1] function-key-map)
     (substitute-key-definition [f14] [S-f2] function-key-map)
     (substitute-key-definition [f15] [S-f3] function-key-map)
     (substitute-key-definition [f16] [S-f4] function-key-map)
@@ -58,7 +58,7 @@
     (substitute-key-definition [f23] [S-f11] function-key-map)
     (substitute-key-definition [f24] [S-f12] function-key-map)
 
-    (substitute-key-definition [f25] [C-f1] function-key-map) 
+    (substitute-key-definition [f25] [C-f1] function-key-map)
     (substitute-key-definition [f26] [C-f2] function-key-map)
     (substitute-key-definition [f27] [C-f3] function-key-map)
     (substitute-key-definition [f28] [C-f4] function-key-map)
@@ -71,7 +71,7 @@
     (substitute-key-definition [f35] [C-f11] function-key-map)
     (substitute-key-definition [f36] [C-f12] function-key-map)
 
-    (substitute-key-definition [f37] [C-S-f1] function-key-map) 
+    (substitute-key-definition [f37] [C-S-f1] function-key-map)
     (substitute-key-definition [f38] [C-S-f2] function-key-map)
     (substitute-key-definition [f39] [C-S-f3] function-key-map)
     (substitute-key-definition [f40] [C-S-f4] function-key-map)
@@ -84,7 +84,7 @@
     (substitute-key-definition [f47] [C-S-f11] function-key-map)
     (substitute-key-definition [f48] [C-S-f12] function-key-map)
 
-    (substitute-key-definition [f49] [A-f1] function-key-map) 
+    (substitute-key-definition [f49] [A-f1] function-key-map)
     (substitute-key-definition [f50] [A-f2] function-key-map)
     (substitute-key-definition [f51] [A-f3] function-key-map)
     (substitute-key-definition [f52] [A-f4] function-key-map)

--- a/lisp/textmodes/table.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/textmodes/table.el	Fri Aug 05 10:57:36 2005 +0000
@@ -843,9 +843,8 @@
   :type 'hook
   :group 'table-hooks)
 
-(defcustom table-yank-handler '(nil nil t nil)
-  "*yank-handler for table."
-  :group 'table)
+(defvar table-yank-handler '(nil nil t nil)
+  "Yank handler for tables.")
 
 (setplist 'table-disable-incompatibility-warning nil)
 

--- a/lisp/thumbs.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/thumbs.el	Fri Aug 05 10:57:36 2005 +0000
@@ -138,23 +138,25 @@
   :group 'thumbs)
 
 ;; Initialize some variable, for later use.
-(defvar thumbs-current-tmp-filename
-  nil
+(defvar thumbs-current-tmp-filename nil
   "Temporary filename of current image.")
-(defvar thumbs-current-image-filename
-  nil
+(make-variable-buffer-local 'thumbs-current-tmp-filename)
+
+(defvar thumbs-current-image-filename nil
   "Filename of current image.")
-(defvar thumbs-current-image-size
-  nil
+(make-variable-buffer-local 'thumbs-current-image-filename)
+
+(defvar thumbs-current-image-size nil
   "Size of current image.")
-(defvar thumbs-image-num
-  nil
+
+(defvar thumbs-image-num nil
   "Number of current image.")
-(defvar thumbs-current-dir
-  nil
+(make-variable-buffer-local 'thumbs-image-num)
+
+(defvar thumbs-current-dir nil
   "Current directory.")
-(defvar thumbs-markedL
-  nil
+
+(defvar thumbs-markedL nil
   "List of marked files.")
 
 (defalias 'thumbs-gensym
@@ -365,8 +367,8 @@
 		   :conversion ,(if marked 'disabled)
 		   :margin ,thumbs-margin)))
     (insert-image i)
-    (setq thumbs-current-image-size
-	  (image-size i t))))
+    (set (make-local-variable 'thumbs-current-image-size)
+         (image-size i t))))
 
 (defun thumbs-insert-thumb (img &optional marked)
   "Insert the thumbnail for IMG at point.
@@ -397,8 +399,7 @@
     (thumbs-mode)
     (thumbs-do-thumbs-insertion L)
     (goto-char (point-min))
-    (setq thumbs-current-dir default-directory)
-    (make-variable-buffer-local 'thumbs-current-dir)))
+    (set (make-local-variable 'thumbs-current-dir) default-directory)))
 
 ;;;###autoload
 (defun thumbs-show-all-from-dir (dir &optional reg same-window)
@@ -436,10 +437,6 @@
     (setq thumbs-current-image-filename img
 	  thumbs-current-tmp-filename nil
 	  thumbs-image-num (or num 0))
-    (make-variable-buffer-local 'thumbs-current-image-filename)
-    (make-variable-buffer-local 'thumbs-current-tmp-filename)
-    (make-variable-buffer-local 'thumbs-current-image-size)
-    (make-variable-buffer-local 'thumbs-image-num)
     (delete-region (point-min)(point-max))
     (thumbs-insert-image img (thumbs-image-type img) 0)))
 

--- a/lisp/toolbar/tool-bar.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/toolbar/tool-bar.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,7 @@
 ;;; tool-bar.el --- setting up the tool bar
 ;;
-;; Copyright (C) 2000, 2001, 2002, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 ;;
 ;; Author: Dave Love <[e-mail]>
 ;; Keywords: mouse frames

--- a/lisp/vmsproc.el	Fri Jul 29 11:44:50 2005 +0000
+++ b/lisp/vmsproc.el	Fri Aug 05 10:57:36 2005 +0000
@@ -1,6 +1,6 @@
 ;;; vmsproc.el --- run asynchronous VMS subprocesses under Emacs
 
-;; Copyright (C) 1986 Free Software Foundation, Inc.
+;; Copyright (C) 1986, 2005 Free Software Foundation, Inc.
 
 ;; Author: Mukesh Prasad
 ;; Maintainer: FSF
@@ -34,24 +34,21 @@
   "String to insert to distinguish commands entered by user.")
 
 (defvar subprocess-running nil)
-(defvar command-mode-map nil)
+(defvar subprocess-buf nil)
 
-(if command-mode-map
-    nil
-  (setq command-mode-map (make-sparse-keymap))
-  (define-key command-mode-map "\C-m" 'command-send-input)
-  (define-key command-mode-map "\C-u" 'command-kill-line))
+(defvar command-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "\C-m" 'command-send-input)
+    (define-key map "\C-u" 'command-kill-line)
+    map))
 
 (defun subprocess-input (name str)
   "Handles input from a subprocess.  Called by Emacs."
   (if display-subprocess-window
       (display-buffer subprocess-buf))
-  (let ((old-buffer (current-buffer)))
-    (set-buffer subprocess-buf)
+  (with-current-buffer subprocess-buf
     (goto-char (point-max))
-    (insert str)
-    (insert ?\n)
-    (set-buffer old-buffer)))
+    (insert str ?\n)))
 
 (defun subprocess-exit (name)
   "Called by Emacs upon subprocess exit."
@@ -65,8 +62,7 @@
   (if subprocess-running
       (return t))
   (setq subprocess-buf (get-buffer-create "*COMMAND*"))
-  (save-excursion
-    (set-buffer subprocess-buf)
+  (with-current-buffer subprocess-buf
     (use-local-map command-mode-map))
   (setq subprocess-running (spawn-subprocess 1 'subprocess-input
 					     'subprocess-exit))
@@ -81,25 +77,24 @@
     (setq cmd (substring command 0 (string-match " " command)))
     (setq args (substring command (string-match " " command)))
     (call-process cmd nil buffer nil "*dcl*" args)))
-;BUGS: only the output up to the end of the first image activation is trapped.
-;  (if (not subprocess-running)
-;      (start-subprocess))
-;  (save-excursion
-;    (set-buffer buffer)
-;    (let ((output-filename (concat "SYS$SCRATCH:OUTPUT-FOR-"
-;				   (getenv "USER") ".LISTING")))
-;      (while (file-exists-p output-filename)
-;	(delete-file output-filename))
-;      (define-logical-name "SYS$OUTPUT" (concat output-filename "-NEW"))
-;      (send-command-to-subprocess 1 command)
-;      (send-command-to-subprocess 1 (concat
-;				     "RENAME " output-filename
-;				     "-NEW " output-filename))
-;      (while (not (file-exists-p output-filename))
-;	(sleep-for 1))
-;      (define-logical-name "SYS$OUTPUT" nil)
-;      (insert-file output-filename)
-;      (delete-file output-filename))))
+  ;; BUGS: only the output up to the end of the first image activation is trapped.
+  ;; (if (not subprocess-running)
+  ;;     (start-subprocess))
+  ;; (with-current-buffer buffer
+  ;;   (let ((output-filename (concat "SYS$SCRATCH:OUTPUT-FOR-"
+  ;;       			   (getenv "USER") ".LISTING")))
+  ;;     (while (file-exists-p output-filename)
+  ;;       (delete-file output-filename))
+  ;;     (define-logical-name "SYS$OUTPUT" (concat output-filename "-NEW"))
+  ;;     (send-command-to-subprocess 1 command)
+  ;;     (send-command-to-subprocess 1 (concat
+  ;;       			     "RENAME " output-filename
+  ;;       			     "-NEW " output-filename))
+  ;;     (while (not (file-exists-p output-filename))
+  ;;       (sleep-for 1))
+  ;;     (define-logical-name "SYS$OUTPUT" nil)
+  ;;     (insert-file output-filename)
+  ;;     (delete-file output-filename))))
 
 (defun subprocess-command ()
   "Starts asynchronous subprocess if not running and switches to its window."
@@ -115,8 +110,7 @@
 line to the last line for resubmission."
   (interactive)
   (beginning-of-line)
-  (let ((current-line (buffer-substring (point)
-                                        (progn (end-of-line) (point)))))
+  (let ((current-line (buffer-substring (point) (line-end-position))))
     (if (eobp)
 	(progn
 	  (if (not subprocess-running)
@@ -129,15 +123,16 @@
 		    (progn (beginning-of-line) (insert command-prefix-string)))
 		(next-line 1))))
       ;; else -- if not at last line in buffer
-      (end-of-buffer)
+      (goto-char (point-max))
       (backward-char)
       (next-line 1)
-      (if (string-equal command-prefix-string
-			(substring current-line 0 (length command-prefix-string)))
-	  (insert (substring current-line (length command-prefix-string)))
-	(insert current-line)))))
+      (insert
+       (if (compare-strings command-prefix-string nil nil
+                            current-line 0 (length command-prefix-string))
+           (substring current-line (length command-prefix-string))
+         current-line)))))
 
-(defun command-kill-line()
+(defun command-kill-line ()
   "Kills the current line.  Used in command mode."
   (interactive)
   (beginning-of-line)
@@ -145,5 +140,5 @@
 
 (define-key esc-map "$" 'subprocess-command)
 
-;;; arch-tag: 600b2512-f903-4887-bcd2-e76b306f5b66
+;; arch-tag: 600b2512-f903-4887-bcd2-e76b306f5b66
 ;;; vmsproc.el ends here

--- a/lispintro/ChangeLog	Fri Jul 29 11:44:50 2005 +0000
+++ b/lispintro/ChangeLog	Fri Aug 05 10:57:36 2005 +0000
@@ -1,3 +1,8 @@
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* makefile.w32-in (info): Don't run install-info.
+	($(infodir)/dir): New target, produced by running install-info.
+
 2005-07-04  Lute Kamstra  <[e-mail]>
 
 	Update FSF's address in GPL notices.

--- a/lispintro/makefile.w32-in	Fri Jul 29 11:44:50 2005 +0000
+++ b/lispintro/makefile.w32-in	Fri Aug 05 10:57:36 2005 +0000
@@ -39,6 +39,8 @@
 .SUFFIXES: .dvi .ps .texi
 
 info: $(INFO_TARGETS)
+
+$(infodir)/dir:
 	$(INSTALL_INFO) --info-dir=$(infodir) $(INFO_TARGETS)
 
 dvi: $(DVI_TARGETS)

--- a/lispref/ChangeLog	Fri Jul 29 11:44:50 2005 +0000
+++ b/lispref/ChangeLog	Fri Aug 05 10:57:36 2005 +0000
@@ -1,3 +1,8 @@
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* makefile.w32-in (info): Don't run install-info.
+	($(infodir)/dir): New target, produced by running install-info.
+
 2005-07-27  Luc Teirlinck  <[e-mail]>
 
 	* modes.texi (Defining Minor Modes): The keyword for the initial

--- a/lispref/makefile.w32-in	Fri Jul 29 11:44:50 2005 +0000
+++ b/lispref/makefile.w32-in	Fri Aug 05 10:57:36 2005 +0000
@@ -99,7 +99,10 @@
 .PHONY: clean
 
 # The info file is named `elisp'.
+
 info: $(infodir)/elisp
+
+$(infodir)/dir:
 	$(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/elisp
 
 $(infodir)/elisp: $(srcs)

--- a/lispref/processes.texi	Fri Jul 29 11:44:50 2005 +0000
+++ b/lispref/processes.texi	Fri Aug 05 10:57:36 2005 +0000
@@ -1575,7 +1575,7 @@
 process, being stopped means not accepting new connections.  (Up to 5
 connection requests will be queued for when you resume the server; you
 can increase this limit, unless it is imposed by the operating
-systems.)  For a network stream connection, being stopped means not
+system.)  For a network stream connection, being stopped means not
 processing input (any arriving input waits until you resume the
 connection).  For a datagram connection, some number of packets may be
 queued but input may be lost.  You can use the function

--- a/lispref/sequences.texi	Fri Jul 29 11:44:50 2005 +0000
+++ b/lispref/sequences.texi	Fri Aug 05 10:57:36 2005 +0000
@@ -252,7 +252,7 @@
 change the length of an existing array.
 
 @item
-for purposes of evaluation, the array is a constant---in other words,
+For purposes of evaluation, the array is a constant---in other words,
 it evaluates to itself.
 
 @item

--- a/man/ChangeLog	Fri Jul 29 11:44:50 2005 +0000
+++ b/man/ChangeLog	Fri Aug 05 10:57:36 2005 +0000
@@ -1,3 +1,9 @@
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* makefile.w32-in (info): Don't run multi-install-info.bat.
+	($(infodir)/dir): New target, produced by running
+	multi-install-info.bat.
+
 2005-07-27  Reiner Steib  <[e-mail]>
 
 	* gnus.texi (Startup Files): Fix name of gnus-site-init-file.

--- a/man/makefile.w32-in	Fri Jul 29 11:44:50 2005 +0000
+++ b/man/makefile.w32-in	Fri Aug 05 10:57:36 2005 +0000
@@ -109,7 +109,6 @@
 	$(srcdir)/kmacro.texi
 
 info: $(INFO_TARGETS)
-	$(MULTI_INSTALL_INFO) --info-dir=$(infodir) $(INFO_TARGETS)
 
 dvi: $(DVI_TARGETS)
 
@@ -124,6 +123,9 @@
 # Some Windows ports of makeinfo seem to require -o to come before the
 # texi filename, contrary to GNU standards.
 
+$(infodir)/dir:
+	$(MULTI_INSTALL_INFO) --info-dir=$(infodir) $(INFO_TARGETS)
+
 $(infodir)/info: $(INFOSOURCES)
 	$(MAKEINFO) --no-split -o $@ info.texi
 

--- a/nt/ChangeLog	Fri Jul 29 11:44:50 2005 +0000
+++ b/nt/ChangeLog	Fri Aug 05 10:57:36 2005 +0000
@@ -1,3 +1,7 @@
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* config.nt: (HAVE_GETOPT_H, HAVE_GETOPT_LONG_ONLY): Undefine.
+
 2005-07-29  Juanma Barranquero  <[e-mail]>
 
 	* configure.bat: Don't create lisp/Makefile.unix.

--- a/nt/config.nt	Fri Jul 29 11:44:50 2005 +0000
+++ b/nt/config.nt	Fri Aug 05 10:57:36 2005 +0000
@@ -270,6 +270,12 @@
 /* Define if `struct timeval' is declared by <sys/time.h>.  */
 #undef HAVE_TIMEVAL
 
+/* Define to 1 if you have the <getopt.h> header file. */
+#undef HAVE_GETOPT_H
+
+/* Define to 1 if you have the `getopt_long_only' function. */
+#undef HAVE_GETOPT_LONG_ONLY
+
 /* If using GNU, then support inline function declarations. */
 #ifdef __GNUC__
 #define INLINE __inline__

--- a/src/ChangeLog	Fri Jul 29 11:44:50 2005 +0000
+++ b/src/ChangeLog	Fri Aug 05 10:57:36 2005 +0000
@@ -1,3 +1,12 @@
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* frame.c (Fframe_char_width): Doc fix.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* xdisp.c (syms_of_xdisp) <redisplay-end-trigger-functions>:
+	Defvar it.
+
 2005-07-28  Juanma Barranquero  <[e-mail]>
 
 	* w32fns.c (my_set_window_pos, my_show_window): Don't declare.
@@ -130,6 +139,11 @@
 	* w32fns.c (Vx_hand_shape): Variable removed.
 	(syms_of_w32fns): Intern and staticpro Qw32_charset_default.
 
[phone]  Kenichi Handa  <[e-mail]>
+
+	* fns.c (Fstring_as_multibyte): Escape backslashes in the
+	docstring.
+
 2005-07-18  Stefan Monnier  <[e-mail]>
 
 	* buffer.h (Fgenerate_new_buffer_name): Declare (for use in coding.c).

--- a/src/frame.c	Fri Jul 29 11:44:50 2005 +0000
+++ b/src/frame.c	Fri Aug 05 10:57:36 2005 +0000
@@ -2353,8 +2353,7 @@
        0, 1, 0,
        doc: /* Width in pixels of characters in the font in frame FRAME.
 If FRAME is omitted, the selected frame is used.
-The width is the same for all characters, because
-currently Emacs supports only fixed-width fonts.
+On a graphical screen, the width is the standard width of the default font.
 For a terminal screen, the value is always 1.  */)
      (frame)
      Lisp_Object frame;

--- a/src/xdisp.c	Fri Jul 29 11:44:50 2005 +0000
+++ b/src/xdisp.c	Fri Aug 05 10:57:36 2005 +0000
@@ -232,7 +232,7 @@
 
 Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map;
 Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions;
-Lisp_Object Qredisplay_end_trigger_functions;
+Lisp_Object Qredisplay_end_trigger_functions, Vredisplay_end_trigger_functions;
 Lisp_Object Qinhibit_point_motion_hooks;
 Lisp_Object QCeval, QCfile, QCdata, QCpropertize;
 Lisp_Object Qfontified;
@@ -23277,6 +23277,12 @@
 is not valid when these functions are called.  */);
   Vwindow_scroll_functions = Qnil;
 
+  DEFVAR_LISP ("redisplay-end-trigger-functions", &Vredisplay_end_trigger_functions,
+    doc: /* Functions called when redisplay of a window reaches the end trigger.
+Each function is called with two arguments, the window and the end trigger value.
+See `set-window-redisplay-end-trigger'.  */);
+  Vredisplay_end_trigger_functions = Qnil;
+
   DEFVAR_BOOL ("mouse-autoselect-window", &mouse_autoselect_window,
     doc: /* *Non-nil means autoselect window with mouse pointer.  */);
   mouse_autoselect_window = 0;